X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Flexer%2Fvalue-parser.c;h=23b4def274cc71191dd3d1018625766500b753eb;hb=8e36488dd7866df169de48322bdfb4f8b853f8e0;hp=65e34a348b86b41904b8eee9ac851c243666ae18;hpb=14f4522a17db23e67a6fa17876633cc6260cb42b;p=pspp

diff --git a/src/language/lexer/value-parser.c b/src/language/lexer/value-parser.c
index 65e34a348b..23b4def274 100644
--- a/src/language/lexer/value-parser.c
+++ b/src/language/lexer/value-parser.c
@@ -79,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;
@@ -96,19 +96,14 @@ 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_is_string (lexer) && format != NULL)
+  if (lex_is_string (lexer) && format != NULL)
     {
       union value v;
 
       assert (fmt_get_category (*format) != FMT_CAT_STRING);
 
-      if (!data_in_msg (lex_tokss (lexer), "UTF-8", *format, &v, 0, NULL))
+      if (!data_in_msg (lex_tokss (lexer), "UTF-8", *format,
+                        settings_get_fmt_settings (), &v, 0, NULL))
         return false;
 
       lex_get (lexer);
@@ -120,14 +115,15 @@ 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