lexer: New function lex_force_int_range().

[pspp] / src / language / data-io / placement-parser.c

diff --git a/src/language/data-io/placement-parser.c b/src/language/data-io/placement-parser.c
index 66aefbff9d7d590f6a1b0df7df772f711d8af116..6fa4e20388b02d7c6d03442ec0a790e557d6c26c 100644 (file)
--- a/src/language/data-io/placement-parser.c
+++ b/src/language/data-io/placement-parser.c
@@ -167,7 +167,7 @@ fixed_parse_columns (struct lexer *lexer, struct pool *pool, size_t var_cnt,
 
   *formats = pool_nalloc (pool, var_cnt + 1, sizeof **formats);
   *format_cnt = var_cnt + 1;
-  (*formats)[0].type = PRS_TYPE_T;
+  (*formats)[0].type = (enum fmt_type) PRS_TYPE_T;
   (*formats)[0].w = fc;
   for (i = 1; i <= var_cnt; i++)
     (*formats)[i] = format;
@@ -213,7 +213,7 @@ fixed_parse_fortran (struct lexer *lexer, struct pool *pool, enum fmt_use use,
           new_formats = &f;
           new_format_cnt = 1;
           if (use == FMT_FOR_INPUT && lex_match (lexer, T_SLASH))
-            f.type = PRS_TYPE_NEW_REC;
+            f.type = (enum fmt_type) PRS_TYPE_NEW_REC;
           else
             {
               char type[FMT_TYPE_LEN_MAX + 1];
@@ -222,10 +222,10 @@ fixed_parse_fortran (struct lexer *lexer, struct pool *pool, enum fmt_use use,
                 return false;
 
               if (!c_strcasecmp (type, "T"))
-                f.type = PRS_TYPE_T;
+                f.type = (enum fmt_type) PRS_TYPE_T;
               else if (!c_strcasecmp (type, "X"))
                 {
-                  f.type = PRS_TYPE_X;
+                  f.type = (enum fmt_type) PRS_TYPE_X;
                   f.w = count;
                   count = 1;
                 }
@@ -401,19 +401,9 @@ parse_record_placement (struct lexer *lexer, int *record, int *column)
     {
       if (lex_is_number (lexer))
         {
-         double orignum = lex_number (lexer);
-         long n = (lex_is_integer (lexer)?lex_integer (lexer):*record);
-         bool out_of_range = orignum > INT_MAX || orignum < INT_MIN;
-          if (n <= *record || out_of_range)
-            {
-              msg (SE, _("The record number specified, %.0f, is at or "
-                         "before the previous record, %d.  Data "
-                         "fields must be listed in order of "
-                         "increasing record number."),
-                   orignum, *record);
-              return false;
-            }
-          *record = n;
+          if (!lex_force_int_range (lexer, NULL, *record + 1, INT_MAX))
+            return false;
+          *record = lex_integer (lexer);
           lex_get (lexer);
         }
       else