X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=src%2Flanguage%2Flexer%2Fvalue-parser.c;h=74478cfa60ac7bce5249792e38fc6f77a0504062;hb=422dcc73035463644b3a5e746808dc7bbbbbc45f;hp=c780d86f04e95429bad3ee1004bbf2021ab89884;hpb=a5097a183f00ab2d2dc538ba7094a4696e2fea04;p=pspp-builds.git
diff --git a/src/language/lexer/value-parser.c b/src/language/lexer/value-parser.c
index c780d86f..74478cfa 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, 2011 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,19 @@
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/i18n.h"
+#include "libpspp/message.h"
+#include "libpspp/str.h"
#include "gettext.h"
#define _(msgid) gettext (msgid)
@@ -96,12 +101,15 @@ 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 (lex_tokss (lexer), "UTF-8", *format, &v, 0, NULL))
+ return false;
+
lex_get (lexer);
*x = v.f;
if (*x == SYSMIS)
@@ -121,24 +129,22 @@ parse_number (struct lexer *lexer, double *x, const enum fmt_type *format)
}
}
-/* Parses the current token from LEXER into value V, which must
- already have been initialized with the specified WIDTH.
- Returns true if successful, false otherwise. */
+/* Parses the current token from LEXER into value V, which must already have
+ been initialized with the specified VAR's WIDTH. Returns true if
+ successful, false otherwise. */
bool
-parse_value (struct lexer *lexer, union value *v, int width)
+parse_value (struct lexer *lexer, union value *v, const struct variable *var)
{
+ int width = var_get_width (var);
if (width == 0)
+ return parse_number (lexer, &v->f, &var_get_print_format (var)->type);
+ else if (lex_force_string (lexer))
{
- if (!lex_force_num (lexer))
- return false;
- v->f = lex_tokval (lexer);
+ const char *s = lex_tokcstr (lexer);
+ value_copy_str_rpad (v, width, CHAR_CAST_BUG (const uint8_t *, s), ' ');
}
else
- {
- if (!lex_force_string (lexer))
- return false;
- value_copy_str_rpad (v, width, ds_cstr (lex_tokstr (lexer)), ' ');
- }
+ return false;
lex_get (lexer);