X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Flexer%2Fvalue-parser.c;h=55707f6ac576f9f82aba8b390f4b58a34947c3dc;hb=3b54533821614d17afc61f1cd3b87d3a06fbf4da;hp=2cf9cf2bb9ad71f91d6ad301c4625d6b2a7cd012;hpb=e588208caf725f595d63a07ddd2116331173e81d;p=pspp
diff --git a/src/language/lexer/value-parser.c b/src/language/lexer/value-parser.c
index 2cf9cf2bb9..55707f6ac5 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, 2014 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,20 @@
along with this program. If not, see . */
#include
+
#include "value-parser.h"
+
+#include
#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)
@@ -57,15 +63,15 @@ parse_num_range (struct lexer *lexer,
if (*y < *x)
{
double t;
- msg (SW, _("Low end of range (%g) is below high end (%g). "
- "The range will be treated as reversed."),
- *x, *y);
+ msg (SW, _("The high end of the range (%.*g) is below the low end "
+ "(%.*g). The range will be treated as if reversed."),
+ DBL_DIG + 1, *y, DBL_DIG + 1, *x);
t = *x;
*x = *y;
*y = t;
}
else if (*x == *y)
- msg (SW, _("Ends of range are equal (%g)."), *x);
+ msg (SW, _("Ends of range are equal (%.*g)."), DBL_DIG + 1, *x);
return true;
}
@@ -73,7 +79,7 @@ parse_num_range (struct lexer *lexer,
{
if (*x == LOWEST)
{
- msg (SE, _("LO or LOWEST must be part of a range."));
+ msg (SE, _("%s or %s must be part of a range."), "LO", "LOWEST");
return false;
}
*y = *x;
@@ -90,17 +96,15 @@ parse_num_range (struct lexer *lexer,
static bool
parse_number (struct lexer *lexer, double *x, const enum fmt_type *format)
{
- if (lex_is_number (lexer))
- {
- *x = lex_number (lexer);
- lex_get (lexer);
- return true;
- }
- else if (lex_token (lexer) == T_STRING && format != NULL)
+ if (lex_is_string (lexer) && format != NULL)
{
union value v;
- data_in (ds_ss (lex_tokstr (lexer)), LEGACY_NATIVE,
- *format, 0, 0, 0, &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)
@@ -110,34 +114,33 @@ parse_number (struct lexer *lexer, double *x, const enum fmt_type *format)
}
return true;
}
- else
+
+ if (lex_force_num (lexer))
{
- if (format != NULL)
- lex_error (lexer, _("expecting number or data string"));
- else
- lex_force_num (lexer);
- return false;
+ *x = lex_number (lexer);
+ lex_get (lexer);
+ return true;
}
+
+ return false;
}
-/* 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);