}
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"))
}
if (end)
{
- msg (SE, _("The %s subcommand may only be specified once."), "END");
+ lex_sbc_only_once ("END");
goto error;
}
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));
}
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);
error:
data_parser_destroy (parser);
if (!in_input_program ())
- dict_destroy (dict);
+ dict_unref (dict);
fh_unref (fh);
free (encoding);
return CMD_CASCADING_FAILURE;
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
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
{
/* 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;