treewide: Replace <name>_cnt by n_<name>s and <name>_cap by allocated_<name>.

[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 0b98f40a07e2a2e08d6e54ce0a944473f68c1738..02cabd8cde0ca3df01042945eec85299df164e2b 100644 (file)
--- a/src/language/data-io/data-list.c
+++ b/src/language/data-io/data-list.c
@@ -118,33 +118,25 @@ cmd_data_list (struct lexer *lexer, struct dataset *ds)
        }
       else if (lex_match_id (lexer, "RECORDS"))
        {
+          if (data_parser_get_records (parser) > 0)
+            {
+              lex_sbc_only_once ("RECORDS");
+              goto error;
+            }
          lex_match (lexer, T_EQUALS);
          lex_match (lexer, T_LPAREN);
-         if (!lex_force_int (lexer))
+         if (!lex_force_int_range (lexer, "RECORDS", 0, INT_MAX))
            goto error;
-
-         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);
+          data_parser_set_records (parser, lex_integer (lexer));
          lex_get (lexer);
          lex_match (lexer, T_RPAREN);
        }
       else if (lex_match_id (lexer, "SKIP"))
        {
          lex_match (lexer, T_EQUALS);
-         if (!lex_force_int (lexer))
+         if (!lex_force_int_range (lexer, "SKIP", 0, INT_MAX))
            goto error;
-         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);
+          data_parser_set_skip (parser, lex_integer (lexer));
          lex_get (lexer);
        }
       else if (lex_match_id (lexer, "END"))
@@ -156,7 +148,7 @@ cmd_data_list (struct lexer *lexer, struct dataset *ds)
             }
          if (end)
            {
-             msg (SE, _("The %s subcommand may only be specified once."), "END");
+              lex_sbc_only_once ("END");
              goto error;
            }
 
@@ -242,7 +234,7 @@ 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));
-                  const char decimal = settings_get_decimal_char (FMT_F);
+                  const char decimal = settings_get_fmt_settings ()->decimal;
                   data_parser_set_hard_delimiters (parser,
                                                    ss_buffer (",", (decimal == '.') ? 1 : 0));
                 }
@@ -316,7 +308,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;
@@ -339,21 +331,21 @@ parse_fixed (struct lexer *lexer, struct dictionary *dict,
   while (lex_token (lexer) != T_ENDCMD)
     {
       char **names;
-      size_t name_cnt, name_idx;
+      size_t n_names, name_idx;
       struct fmt_spec *formats, *f;
-      size_t format_cnt;
+      size_t n_formats;
 
       /* Parse everything. */
       if (!parse_record_placement (lexer, &record, &column)
           || !parse_DATA_LIST_vars_pool (lexer, dict, tmp_pool,
-                                        &names, &name_cnt, PV_NONE)
-          || !parse_var_placements (lexer, tmp_pool, name_cnt, FMT_FOR_INPUT,
-                                    &formats, &format_cnt))
+                                        &names, &n_names, PV_NONE)
+          || !parse_var_placements (lexer, tmp_pool, n_names, FMT_FOR_INPUT,
+                                    &formats, &n_formats))
         return false;
 
       /* Create variables and var specs. */
       name_idx = 0;
-      for (f = formats; f < &formats[format_cnt]; f++)
+      for (f = formats; f < &formats[n_formats]; f++)
         if (!execute_placement_format (f, &record, &column))
           {
             char *name;
@@ -368,7 +360,8 @@ parse_fixed (struct lexer *lexer, struct dictionary *dict,
             if (v != NULL)
               {
                 /* Success. */
-                struct fmt_spec output = fmt_for_output_from_input (f);
+                struct fmt_spec output = fmt_for_output_from_input (
+                  f, settings_get_fmt_settings ());
                 var_set_both_formats (v, &output);
               }
             else
@@ -414,7 +407,7 @@ parse_fixed (struct lexer *lexer, struct dictionary *dict,
 
             column += f->w;
           }
-      assert (name_idx == name_cnt);
+      assert (name_idx == n_names);
     }
 
   return true;
@@ -434,11 +427,11 @@ parse_free (struct lexer *lexer, struct dictionary *dict,
     {
       struct fmt_spec input, output;
       char **name;
-      size_t name_cnt;
+      size_t n_names;
       size_t i;
 
       if (!parse_DATA_LIST_vars_pool (lexer, dict, tmp_pool,
-                                     &name, &name_cnt, PV_NONE))
+                                     &name, &n_names, PV_NONE))
        return false;
 
       if (lex_match (lexer, T_LPAREN))
@@ -472,7 +465,8 @@ parse_free (struct lexer *lexer, struct dictionary *dict,
           if (input.type == FMT_N)
             input.type = FMT_F;
 
-         output = fmt_for_output_from_input (&input);
+         output = fmt_for_output_from_input (&input,
+                                              settings_get_fmt_settings ());
        }
       else
        {
@@ -481,7 +475,7 @@ parse_free (struct lexer *lexer, struct dictionary *dict,
          output = *settings_get_format ();
        }
 
-      for (i = 0; i < name_cnt; i++)
+      for (i = 0; i < n_names; i++)
        {
          struct variable *v;
 
@@ -538,7 +532,7 @@ data_list_trns_proc (void *trns_, struct ccase **c, casenumber case_num UNUSED)
   /* If there was an END subcommand handle it. */
   if (trns->end != NULL)
     {
-      double *end = &case_data_rw (*c, trns->end)->f;
+      double *end = case_num_rw (*c, trns->end);
       if (retval == TRNS_END_FILE)
         {
           *end = 1.0;