data-in: Make data_in() parameters more uniform.

[pspp] / src / language / lexer / value-parser.c

diff --git a/src/language/lexer/value-parser.c b/src/language/lexer/value-parser.c
index c492658e28753ba5e3a9fe7780abf9a2fc7ba12c..8cbbab4c82bfa3d0e262d865d8975c72794c9bee 100644 (file)
--- a/src/language/lexer/value-parser.c
+++ b/src/language/lexer/value-parser.c
@@ -100,12 +100,12 @@ 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);
+      data_in (ds_ss (lex_tokstr (lexer)), LEGACY_NATIVE, *format, 0, 0,
+               &v, 0, NULL);
       lex_get (lexer);
       *x = v.f;
       if (*x == SYSMIS)