Merge remote branch 'origin/master' into import-gui

[pspp] / src / language / data-io / list.c

diff --git a/src/language/data-io/list.c b/src/language/data-io/list.c
index c7f85f3917d780f564a1060ce1f8d639aee77b37..4a9424d2f90d6488fc3e9ce6dadb4f5e973611d9 100644 (file)
--- a/src/language/data-io/list.c
+++ b/src/language/data-io/list.c
@@ -59,7 +59,7 @@ struct lst_cmd
   int first;
   int last;
   int step;
-  struct variable **v_variables;
+  const struct variable **v_variables;
   size_t n_variables;
   enum numbering numbering;
 };
@@ -162,7 +162,7 @@ cmd_list (struct lexer *lexer, struct dataset *ds)
       if (lex_match_id (lexer, "VARIABLES") )
         {
           lex_match (lexer, T_EQUALS);
-          if (! parse_variables (lexer, dict, &cmd.v_variables, &cmd.n_variables, 0 ))
+          if (! parse_variables_const (lexer, dict, &cmd.v_variables, &cmd.n_variables, 0 ))
             {
               msg (SE, _("No variables specified."));
               return CMD_FAILURE;
@@ -193,7 +193,7 @@ cmd_list (struct lexer *lexer, struct dataset *ds)
 
           if (lex_force_int (lexer))
             {
-              lex_match_int (lexer, &cmd.first);
+             cmd.first = lex_integer (lexer);
               lex_get (lexer);
             }
 
@@ -213,7 +213,7 @@ cmd_list (struct lexer *lexer, struct dataset *ds)
               lex_get (lexer);
             }
         }
-      else if (! parse_variables (lexer, dict, &cmd.v_variables, &cmd.n_variables, 0 ))
+      else if (! parse_variables_const (lexer, dict, &cmd.v_variables, &cmd.n_variables, 0 ))
         {
           return CMD_FAILURE;
         }