/* PSPP - a program for statistical analysis.
- Copyright (C) 1997-9, 2000, 2006, 2007, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
+ Copyright (C) 1997-9, 2000, 2006, 2007, 2009, 2010, 2011, 2012, 2013 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
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);
}
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"))
{
if (!in_input_program ())
{
- msg (SE, _("The END subcommand may only be used within "
- "INPUT PROGRAM."));
+ msg (SE, _("The %s subcommand may only be used within %s."), "END", "INPUT PROGRAM");
goto error;
}
if (end)
{
- msg (SE, _("The END subcommand may only be specified once."));
+ msg (SE, _("The %s subcommand may only be specified once."), "END");
goto error;
}
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));
}
}
}
if (type != DP_FIXED && end != NULL)
{
- msg (SE, _("The END subcommand may be used only with DATA LIST FIXED."));
+ msg (SE, _("The %s subcommand may be used only with %s."), "END", "DATA LIST FIXED");
goto error;
}
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);
- return CMD_SUCCESS;
+ return CMD_DATA_LIST;
error:
data_parser_destroy (parser);
if (!in_input_program ())
- dict_destroy (dict);
+ dict_unref (dict);
fh_unref (fh);
free (encoding);
return CMD_CASCADING_FAILURE;