/* PSPP - a program for statistical analysis.
- Copyright (C) 2010, 2011, 2013 Free Software Foundation, Inc.
+ Copyright (C) 2010, 2011, 2013, 2016 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
type = 0;
dict = dict_clone (dataset_dict (ds));
+ dict_set_names_must_be_ids (dict, false);
stage = NULL;
map = NULL;
stage = case_map_stage_create (dict);
dict_delete_scratch_vars (dict);
- while (lex_match (lexer, T_SLASH))
+ while (lex_token (lexer) != T_ENDCMD)
{
+ if (!lex_force_match (lexer, T_SLASH))
+ goto error;
+
if (lex_match_id (lexer, "OUTFILE"))
{
if (handle != NULL)
type = TAB_FILE;
else
{
- lex_error_expecting (lexer, "CSV", "TAB", NULL_SENTINEL);
+ lex_error_expecting (lexer, "CSV", "TAB");
goto error;
}
}
recode_user_missing = true;
else
{
- lex_error_expecting (lexer, "IGNORE", "RECODE", NULL_SENTINEL);
+ lex_error_expecting (lexer, "IGNORE", "RECODE");
goto error;
}
}
use_value_labels = true;
else
{
- lex_error_expecting (lexer, "VALUES", "LABELS", NULL_SENTINEL);
+ lex_error_expecting (lexer, "VALUES", "LABELS");
goto error;
}
}
decimal = ',';
else
{
- lex_error_expecting (lexer, "DOT", "COMMA",
- NULL_SENTINEL);
+ lex_error_expecting (lexer, "DOT", "COMMA");
goto error;
}
}
use_print_formats = true;
else
{
- lex_error_expecting (lexer, "PLAIN", "VARIABLE",
- NULL_SENTINEL);
+ lex_error_expecting (lexer, "PLAIN", "VARIABLE");
goto error;
}
}
retain_unselected = false;
else
{
- lex_error_expecting (lexer, "RETAIN", "DELETE", NULL_SENTINEL);
+ lex_error_expecting (lexer, "RETAIN", "DELETE");
goto error;
}
}
- else if (!parse_dict_trim (lexer, dict))
+ else if (!parse_dict_trim (lexer, dict, true))
goto error;
}
- if (lex_end_of_command (lexer) != CMD_SUCCESS)
- goto error;
if (type == 0)
{
case_map_stage_destroy (stage);
if (map != NULL)
writer = case_map_create_output_translator (map, writer);
- dict_destroy (dict);
+ dict_unref (dict);
casereader_transfer (proc_open_filtering (ds, !retain_unselected), writer);
ok = casewriter_destroy (writer);
error:
case_map_stage_destroy (stage);
fh_unref (handle);
- dict_destroy (dict);
+ dict_unref (dict);
case_map_destroy (map);
return CMD_FAILURE;
}