/* PSPP - a program for statistical analysis.
- Copyright (C) 2010 Free Software Foundation, Inc.
+ Copyright (C) 2010, 2011 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
#include "data/casereader.h"
#include "data/casewriter.h"
#include "data/csv-file-writer.h"
+#include "data/dataset.h"
#include "data/dictionary.h"
#include "data/file-name.h"
#include "data/format.h"
-#include "data/procedure.h"
#include "data/settings.h"
#include "language/command.h"
#include "language/data-io/file-handle.h"
lex_match (lexer, T_EQUALS);
- handle = fh_parse (lexer, FH_REF_FILE);
+ handle = fh_parse (lexer, FH_REF_FILE, NULL);
if (handle == NULL)
goto error;
}
type = TAB_FILE;
else
{
- lex_error (lexer, _("expecting %s or %s"), "CSV", "TAB");
+ lex_error_expecting (lexer, "CSV", "TAB", NULL_SENTINEL);
goto error;
}
}
recode_user_missing = true;
else
{
- lex_error (lexer, _("expecting %s or %s"), "IGNORE", "RECODE");
+ lex_error_expecting (lexer, "IGNORE", "RECODE", NULL_SENTINEL);
goto error;
}
}
use_value_labels = true;
else
{
- lex_error (lexer, _("expecting %s or %s"), "VALUES", "LABELS");
+ lex_error_expecting (lexer, "VALUES", "LABELS", NULL_SENTINEL);
goto error;
}
}
decimal = ',';
else
{
- lex_error (lexer, _("expecting %s or %s"),
- "DOT", "COMMA");
+ lex_error_expecting (lexer, "DOT", "COMMA",
+ NULL_SENTINEL);
goto error;
}
}
use_print_formats = true;
else
{
- lex_error (lexer, _("expecting %s or %s"),
- "PLAIN", "VARIABLE");
+ lex_error_expecting (lexer, "PLAIN", "VARIABLE",
+ NULL_SENTINEL);
goto error;
}
}
retain_unselected = false;
else
{
- lex_error (lexer, _("expecting %s or %s"), "RETAIN", "DELETE");
+ lex_error_expecting (lexer, "RETAIN", "DELETE", NULL_SENTINEL);
goto error;
}
}
if (type == 0)
{
- lex_sbc_missing (lexer, "TYPE");
+ lex_sbc_missing ("TYPE");
goto error;
}
else if (handle == NULL)
{
- lex_sbc_missing (lexer, "OUTFILE");
+ lex_sbc_missing ("OUTFILE");
goto error;
}
else if (!replace && fn_exists (fh_get_file_name (handle)))