X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Flexer%2Fvalue-parser.c;h=c492658e28753ba5e3a9fe7780abf9a2fc7ba12c;hb=d775f576e4ffc0973c5f183b57b2baa089f555dc;hp=c780d86f04e95429bad3ee1004bbf2021ab89884;hpb=cb72db62c20ecab427229110820c5b053d0663c4;p=pspp
diff --git a/src/language/lexer/value-parser.c b/src/language/lexer/value-parser.c
index c780d86f04..c492658e28 100644
--- a/src/language/lexer/value-parser.c
+++ b/src/language/lexer/value-parser.c
@@ -1,5 +1,5 @@
/* PSPP - a program for statistical analysis.
- Copyright (C) 2005, 2006, 2009 Free Software Foundation, Inc.
+ Copyright (C) 2005, 2006, 2009, 2010 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -15,14 +15,18 @@
along with this program. If not, see . */
#include
+
#include "value-parser.h"
+
#include
-#include
-#include
-#include "lexer.h"
-#include
-#include
-#include
+
+#include "data/data-in.h"
+#include "data/format.h"
+#include "data/value.h"
+#include "language/lexer/lexer.h"
+#include "libpspp/cast.h"
+#include "libpspp/message.h"
+#include "libpspp/str.h"
#include "gettext.h"
#define _(msgid) gettext (msgid)
@@ -133,12 +137,13 @@ parse_value (struct lexer *lexer, union value *v, int width)
return false;
v->f = lex_tokval (lexer);
}
- else
+ else if (lex_force_string (lexer))
{
- if (!lex_force_string (lexer))
- return false;
- value_copy_str_rpad (v, width, ds_cstr (lex_tokstr (lexer)), ' ');
+ const char *s = ds_cstr (lex_tokstr (lexer));
+ value_copy_str_rpad (v, width, CHAR_CAST_BUG (const uint8_t *, s), ' ');
}
+ else
+ return false;
lex_get (lexer);