data-in: Get rid of first_column, last_column arguments.

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

diff --git a/src/language/lexer/value-parser.c b/src/language/lexer/value-parser.c
index 8cbbab4c82bfa3d0e262d865d8975c72794c9bee..269d24bca48d04b13da5c7a054b08fcdb281d4fd 100644 (file)
--- a/src/language/lexer/value-parser.c
+++ b/src/language/lexer/value-parser.c
@@ -103,9 +103,13 @@ parse_number (struct lexer *lexer, double *x, const enum fmt_type *format)
   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,
-               &v, 0, NULL);
+
+      assert (fmt_get_category (*format) != FMT_CAT_STRING);
+
+      if (!data_in_msg (ds_ss (lex_tokstr (lexer)), LEGACY_NATIVE,
+                        *format, &v, 0, NULL))
+        return false;
+
       lex_get (lexer);
       *x = v.f;
       if (*x == SYSMIS)