X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Flexer%2Frange-parser.c;h=d6d352b8bfff5c56057267b9af71bbe89ebb353f;hb=b0ce74cb9ee2ac59e87bddb46122b63ae0b6cdf0;hp=1682935c5fb65591f5e43fdf111d5a8c9a2359c6;hpb=3a61659a8fc11c51ad5af02b20f5613dcde50382;p=pspp

diff --git a/src/language/lexer/range-parser.c b/src/language/lexer/range-parser.c
index 1682935c5f..d6d352b8bf 100644
--- a/src/language/lexer/range-parser.c
+++ b/src/language/lexer/range-parser.c
@@ -31,29 +31,30 @@
 #define _(msgid) gettext (msgid)
 #define N_(msgid) msgid
 
-static bool parse_number (double *, const struct fmt_spec *);
+static bool parse_number (struct lexer *, double *, const enum fmt_type *);
 
 /* Parses and stores a numeric value, or a range of the form "x
    THRU y".  Open-ended ranges may be specified as "LO(WEST) THRU
    y" or "x THRU HI(GHEST)".  Sets *X and *Y to the range or the
    value and returns success.
 
-   Numeric values are always accepted.  If F is nonnull, then
-   string values are also accepted, and converted to numeric
-   values using the specified format. */
+   Numeric values are always accepted.  If FORMAT is nonnull,
+   then string values are also accepted, and converted to numeric
+   values using *FORMAT. */
 bool
-parse_num_range (double *x, double *y, const struct fmt_spec *f) 
+parse_num_range (struct lexer *lexer,
+                 double *x, double *y, const enum fmt_type *format) 
 {
-  if (lex_match_id ("LO") || lex_match_id ("LOWEST"))
+  if (lex_match_id (lexer, "LO") || lex_match_id (lexer, "LOWEST"))
     *x = LOWEST;
-  else if (!parse_number (x, f))
+  else if (!parse_number (lexer, x, format))
     return false;
 
-  if (lex_match_id ("THRU")) 
+  if (lex_match_id (lexer, "THRU")) 
     {
-      if (lex_match_id ("HI") || lex_match_id ("HIGHEST"))
+      if (lex_match_id (lexer, "HI") || lex_match_id (lexer, "HIGHEST"))
         *y = HIGHEST;
-      else if (!parse_number (y, f))
+      else if (!parse_number (lexer, y, format))
         return false;
 
       if (*y < *x) 
@@ -86,31 +87,23 @@ parse_num_range (double *x, double *y, const struct fmt_spec *f)
 
 /* Parses a number and stores it in *X.  Returns success.
 
-   Numeric values are always accepted.  If F is nonnull, then
-   string values are also accepted, and converted to numeric
-   values using the specified format. */
+   Numeric values are always accepted.  If FORMAT is nonnull,
+   then string values are also accepted, and converted to numeric
+   values using *FORMAT. */
 static bool
-parse_number (double *x, const struct fmt_spec *f)
+parse_number (struct lexer *lexer, double *x, const enum fmt_type *format)
 {
-  if (lex_is_number ()) 
+  if (lex_is_number (lexer)) 
     {
-      *x = lex_number ();
-      lex_get ();
+      *x = lex_number (lexer);
+      lex_get (lexer);
       return true;
     }
-  else if (token == T_STRING && f != NULL) 
+  else if (lex_token (lexer) == T_STRING && format != NULL) 
     {
-      struct data_in di;
       union value v;
-      di.s = ds_data (&tokstr);
-      di.e = ds_end (&tokstr);
-      di.v = &v;
-      di.flags = 0;
-      di.f1 = 1;
-      di.f2 = ds_length (&tokstr);
-      di.format = *f;
-      data_in (&di);
-      lex_get ();
+      data_in (ds_ss (lex_tokstr (lexer)), *format, 0, 0, &v, 0);
+      lex_get (lexer);
       *x = v.f;
       if (*x == SYSMIS)
         {
@@ -121,10 +114,10 @@ parse_number (double *x, const struct fmt_spec *f)
     }
   else 
     {
-      if (f != NULL)
-        lex_error (_("expecting number or data string"));
+      if (format != NULL)
+        lex_error (lexer, _("expecting number or data string"));
       else
-        lex_force_num ();
+        lex_force_num (lexer);
       return false; 
     }
 }