struct data_list_trns
{
struct data_parser *parser; /* Parser. */
+ struct dictionary *dict; /* Dictionary. */
struct dfm_reader *reader; /* Data file reader. */
struct variable *end; /* Variable specified on END subcommand. */
};
static bool parse_free (struct lexer *, struct dictionary *,
struct pool *, struct data_parser *);
-static trns_free_func data_list_trns_free;
-static trns_proc_func data_list_trns_proc;
+static const struct trns_class data_list_trns_class;
int
cmd_data_list (struct lexer *lexer, struct dataset *ds)
dict = (in_input_program ()
? dataset_dict (ds)
: dict_create (get_default_encoding ()));
- parser = data_parser_create (dict);
+ parser = data_parser_create ();
reader = NULL;
table = -1; /* Print table if nonzero, -1=undecided. */
}
else if (lex_match_id (lexer, "RECORDS"))
{
+ if (data_parser_get_records (parser) > 0)
+ {
+ lex_sbc_only_once (lexer, "RECORDS");
+ goto error;
+ }
lex_match (lexer, T_EQUALS);
lex_match (lexer, T_LPAREN);
if (!lex_force_int_range (lexer, "RECORDS", 0, INT_MAX))
{
if (!in_input_program ())
{
- msg (SE, _("The %s subcommand may only be used within %s."), "END", "INPUT PROGRAM");
+ lex_next_error (lexer, -1, -1,
+ _("The %s subcommand may only be used within %s."),
+ "END", "INPUT PROGRAM");
goto error;
}
if (end)
{
- msg (SE, _("The %s subcommand may only be specified once."), "END");
+ lex_sbc_only_once (lexer, "END");
goto error;
}
if (has_type)
{
- msg (SE, _("Only one of FIXED, FREE, or LIST may "
- "be specified."));
+ lex_next_error (lexer, -1, -1,
+ _("Only one of FIXED, FREE, or LIST may "
+ "be specified."));
goto error;
}
has_type = true;
{
struct data_list_trns *trns = xmalloc (sizeof *trns);
trns->parser = parser;
+ trns->dict = dict_ref (dict);
trns->reader = reader;
trns->end = end;
- add_transformation (ds, data_list_trns_proc, data_list_trns_free, trns);
+ add_transformation (ds, &data_list_trns_class, trns);
}
else
data_parser_make_active_file (parser, ds, reader, dict, NULL, NULL);
fh_unref (fh);
free (encoding);
- return CMD_DATA_LIST;
+ data_list_seen ();
+
+ return CMD_SUCCESS;
error:
data_parser_destroy (parser);
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;
column += f->w;
}
- assert (name_idx == name_cnt);
+ assert (name_idx == n_names);
}
return true;
{
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))
return NULL;
if (!fmt_from_name (type, &input.type))
{
- msg (SE, _("Unknown format type `%s'."), type);
+ lex_next_error (lexer, -1, -1,
+ _("Unknown format type `%s'."), type);
return NULL;
}
input.d = 0;
}
- if (!fmt_check_input (&input) || !lex_force_match (lexer, T_RPAREN))
+ char *error = fmt_check_input__ (&input);
+ if (error)
+ {
+ lex_next_error (lexer, -1, -1, "%s", error);
+ free (error);
+ return NULL;
+ }
+ if (!lex_force_match (lexer, T_RPAREN))
return NULL;
/* As a special case, N format is treated as F format
output = *settings_get_format ();
}
- for (i = 0; i < name_cnt; i++)
+ for (i = 0; i < n_names; i++)
{
struct variable *v;
struct data_list_trns *trns = trns_;
data_parser_destroy (trns->parser);
dfm_close_reader (trns->reader);
+ dict_unref (trns->dict);
free (trns);
return true;
}
/* Handle DATA LIST transformation TRNS, parsing data into *C. */
-static int
+static enum trns_result
data_list_trns_proc (void *trns_, struct ccase **c, casenumber case_num UNUSED)
{
struct data_list_trns *trns = trns_;
- int retval;
+ enum trns_result retval;
*c = case_unshare (*c);
- if (data_parser_parse (trns->parser, trns->reader, *c))
+ if (data_parser_parse (trns->parser, trns->reader, trns->dict, *c))
retval = TRNS_CONTINUE;
else if (dfm_reader_error (trns->reader) || dfm_eof (trns->reader) > 1)
{
return retval;
}
-\f
+
+static const struct trns_class data_list_trns_class = {
+ .name = "DATA LIST",
+ .execute = data_list_trns_proc,
+ .destroy = data_list_trns_free,
+};