X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Flexer%2Fvalue-parser.c;h=269d24bca48d04b13da5c7a054b08fcdb281d4fd;hb=3da49359c52cb783db907cc197847bbd5e721c97;hp=c780d86f04e95429bad3ee1004bbf2021ab89884;hpb=8f04b0ced35a66cfdebefbcb53c81979add36ca3;p=pspp
diff --git a/src/language/lexer/value-parser.c b/src/language/lexer/value-parser.c
index c780d86f04..269d24bca4 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)
@@ -96,12 +100,16 @@ parse_number (struct lexer *lexer, double *x, const enum fmt_type *format)
lex_get (lexer);
return true;
}
- else if (lex_token (lexer) == T_STRING && format != NULL)
+ else if (lex_is_string (lexer) && format != NULL)
{
union value v;
- assert (! (fmt_get_category (*format) & ( FMT_CAT_STRING )));
- data_in (ds_ss (lex_tokstr (lexer)), LEGACY_NATIVE,
- *format, 0, 0, 0, NULL, &v, 0);
+
+ assert (fmt_get_category (*format) != FMT_CAT_STRING);
+
+ if (!data_in_msg (ds_ss (lex_tokstr (lexer)), LEGACY_NATIVE,
+ *format, &v, 0, NULL))
+ return false;
+
lex_get (lexer);
*x = v.f;
if (*x == SYSMIS)
@@ -133,12 +141,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);