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 3360e8d739dc46a2890dfb063fa225fd3b3e7c26..6fa4e20388b02d7c6d03442ec0a790e557d6c26c 100644 (file)
--- a/src/language/data-io/placement-parser.c
+++ b/src/language/data-io/placement-parser.c
@@ -27,6 +27,7 @@
 #include "libpspp/pool.h"
 #include "libpspp/str.h"
 
+#include "gl/c-strcase.h"
 #include "gl/xalloc.h"
 #include "gl/xsize.h"
 
@@ -52,6 +53,13 @@ static bool fixed_parse_fortran (struct lexer *l, struct pool *, enum fmt_use,
    formats like those parsed by DATA LIST or PRINT.  Returns true
    only if successful.
 
+   The formats parsed are either input or output formats, according
+   to USE.
+
+   If USE is FMT_FOR_INPUT, then T, X, and / "formats" are parsed,
+   in addition to regular formats.  If USE is FMT_FOR_OUTPUT, then
+   T and X "formats" are parsed but not /.
+
    If successful, formats for VAR_CNT variables are stored in
    *FORMATS, and the number of formats required is stored in
    *FORMAT_CNT.  *FORMAT_CNT may be greater than VAR_CNT because
@@ -111,7 +119,7 @@ fixed_parse_columns (struct lexer *lexer, struct pool *pool, size_t var_cnt,
   int fc, lc;
   size_t i;
 
-  if ( !parse_column_range (lexer, 1, &fc, &lc, NULL) )
+  if (!parse_column_range (lexer, 1, &fc, &lc, NULL))
     return false;
 
   /* Divide columns evenly. */
@@ -159,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;
@@ -204,8 +212,8 @@ fixed_parse_fortran (struct lexer *lexer, struct pool *pool, enum fmt_use use,
         {
           new_formats = &f;
           new_format_cnt = 1;
-          if (lex_match (lexer, T_SLASH))
-            f.type = PRS_TYPE_NEW_REC;
+          if (use == FMT_FOR_INPUT && lex_match (lexer, T_SLASH))
+            f.type = (enum fmt_type) PRS_TYPE_NEW_REC;
           else
             {
               char type[FMT_TYPE_LEN_MAX + 1];
@@ -213,11 +221,11 @@ fixed_parse_fortran (struct lexer *lexer, struct pool *pool, enum fmt_use use,
               if (!parse_abstract_format_specifier (lexer, type, &f.w, &f.d))
                 return false;
 
-              if (!strcasecmp (type, "T"))
-                f.type = PRS_TYPE_T;
-              else if (!strcasecmp (type, "X"))
+              if (!c_strcasecmp (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;
                 }
@@ -291,11 +299,8 @@ execute_placement_format (const struct fmt_spec *format,
     }
 }
 
-/* Parses a BASE-based column using LEXER.  Returns true and
-   stores a 1-based column number into *COLUMN if successful,
-   otherwise emits an error message and returns false. */
 static bool
-parse_column (int value, int base, int *column)
+parse_column__ (int value, int base, int *column)
 {
   assert (base == 0 || base == 1);
   *column = value - base + 1;
@@ -310,6 +315,27 @@ parse_column (int value, int base, int *column)
   return true;
 }
 
+/* Parses a BASE-based column using LEXER.  Returns true and
+   stores a 1-based column number into *COLUMN if successful,
+   otherwise emits an error message and returns false.
+
+   If BASE is 0, zero-based column numbers are parsed; if BASE is
+   1, 1-based column numbers are parsed.  Regardless of BASE, the
+   values stored in *FIRST_COLUMN and *LAST_COLUMN are
+   1-based. */
+bool
+parse_column (struct lexer *lexer, int base, int *column)
+{
+  assert (base == 0 || base == 1);
+
+  if (!lex_force_int (lexer)
+      || !parse_column__ (lex_integer (lexer), base, column))
+    return false;
+
+  lex_get (lexer);
+  return true;
+}
+
 /* Parse a column or a range of columns, specified as a single
    integer or two integers delimited by a dash.  Stores the range
    in *FIRST_COLUMN and *LAST_COLUMN.  (If only a single integer
@@ -330,14 +356,14 @@ parse_column_range (struct lexer *lexer, int base,
 {
   /* First column. */
   if (!lex_force_int (lexer)
-      || !parse_column (lex_integer (lexer), base, first_column))
+      || !parse_column__ (lex_integer (lexer), base, first_column))
     return false;
   lex_get (lexer);
 
   /* Last column. */
   if (lex_is_integer (lexer) && lex_integer (lexer) < 0)
     {
-      if (!parse_column (-lex_integer (lexer), base, last_column))
+      if (!parse_column__ (-lex_integer (lexer), base, last_column))
         return false;
       lex_get (lexer);
 
@@ -373,17 +399,10 @@ parse_record_placement (struct lexer *lexer, int *record, int *column)
 {
   while (lex_match (lexer, T_SLASH))
     {
-      if (lex_is_integer (lexer))
+      if (lex_is_number (lexer))
         {
-          if (lex_integer (lexer) <= *record)
-            {
-              msg (SE, _("The record number specified, %ld, is at or "
-                         "before the previous record, %d.  Data "
-                         "fields must be listed in order of "
-                         "increasing record number."),
-                   lex_integer (lexer), *record);
-              return false;
-            }
+          if (!lex_force_int_range (lexer, NULL, *record + 1, INT_MAX))
+            return false;
           *record = lex_integer (lexer);
           lex_get (lexer);
         }