/* 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
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)
else if (!parse_dict_trim (lexer, dict))
goto error;
}
- if (lex_end_of_command (lexer) != CMD_SUCCESS)
- goto error;
if (type == 0)
{
lex_sbc_missing ("OUTFILE");
goto error;
}
- else if (!replace && fn_exists (fh_get_file_name (handle)))
+ else if (!replace && fn_exists (handle))
{
- msg (SE, _("Output file `%s' exists but REPLACE was not specified."),
- fh_get_file_name (handle));
+ msg (SE, _("Output file `%s' exists but %s was not specified."),
+ fh_get_file_name (handle), "REPLACE");
goto error;
}