Fix on_quote_combo_change callback

[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 549ac7501e73d3f804d82f97de5c4797d3de612e..8a08208b8a0d68a41d544a859be1be8dc3619f80 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"
 
@@ -118,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. */
@@ -166,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;
@@ -212,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];
@@ -220,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;
                 }
@@ -298,7 +299,7 @@ execute_placement_format (const struct fmt_spec *format,
     }
 }
 
-bool
+static bool
 parse_column__ (int value, int base, int *column)
 {
   assert (base == 0 || base == 1);
@@ -398,18 +399,21 @@ 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)
+         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, %ld, is at or "
+              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."),
-                   lex_integer (lexer), *record);
+                   orignum, *record);
               return false;
             }
-          *record = lex_integer (lexer);
+          *record = n;
           lex_get (lexer);
         }
       else