Reference count struct dictionary.

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

diff --git a/src/language/data-io/data-list.c b/src/language/data-io/data-list.c
index f68b2e1b4d058e2f71585b5742d8ad98e1baa8dc..87f100f823f9f7a998fe58e2002eb7eb08e7359d 100644 (file)
--- a/src/language/data-io/data-list.c
+++ b/src/language/data-io/data-list.c
@@ -122,7 +122,14 @@ cmd_data_list (struct lexer *lexer, struct dataset *ds)
          lex_match (lexer, T_LPAREN);
          if (!lex_force_int (lexer))
            goto error;
-          data_parser_set_records (parser, lex_integer (lexer));
+
+         int records = lex_integer (lexer);
+         if (records < 0)
+           {
+             msg (SE, _("The %s value must be nonnegative."), "RECORDS");
+             goto error;
+           }
+          data_parser_set_records (parser, records);
          lex_get (lexer);
          lex_match (lexer, T_RPAREN);
        }
@@ -131,7 +138,13 @@ cmd_data_list (struct lexer *lexer, struct dataset *ds)
          lex_match (lexer, T_EQUALS);
          if (!lex_force_int (lexer))
            goto error;
-          data_parser_set_skip (parser, lex_integer (lexer));
+         int skip = lex_integer (lexer);
+         if (skip < 0)
+           {
+             msg (SE, _("The %s value must be nonnegative."), "SKIP");
+             goto error;
+           }
+          data_parser_set_skip (parser, skip);
          lex_get (lexer);
        }
       else if (lex_match_id (lexer, "END"))
@@ -229,7 +242,9 @@ cmd_data_list (struct lexer *lexer, struct dataset *ds)
                   data_parser_set_quotes (parser, ss_cstr ("'\""));
                   data_parser_set_soft_delimiters (parser,
                                                    ss_cstr (CC_SPACES));
-                  data_parser_set_hard_delimiters (parser, ss_cstr (","));
+                  const char decimal = settings_get_decimal_char (FMT_F);
+                  data_parser_set_hard_delimiters (parser,
+                                                   ss_buffer (",", (decimal == '.') ? 1 : 0));
                 }
             }
         }
@@ -291,7 +306,7 @@ cmd_data_list (struct lexer *lexer, struct dataset *ds)
       add_transformation (ds, data_list_trns_proc, data_list_trns_free, trns);
     }
   else
-    data_parser_make_active_file (parser, ds, reader, dict);
+    data_parser_make_active_file (parser, ds, reader, dict, NULL, NULL);
 
   fh_unref (fh);
   free (encoding);
@@ -301,7 +316,7 @@ cmd_data_list (struct lexer *lexer, struct dataset *ds)
  error:
   data_parser_destroy (parser);
   if (!in_input_program ())
-    dict_destroy (dict);
+    dict_unref (dict);
   fh_unref (fh);
   free (encoding);
   return CMD_CASCADING_FAILURE;