/* PSPP - a program for statistical analysis.
- Copyright (C) 1997-9, 2000, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+ Copyright (C) 1997-9, 2000, 2006, 2007, 2008, 2009, 2010, 2011, 2012 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/case.h"
#include "data/casereader.h"
#include "data/casewriter.h"
+#include "data/dataset.h"
#include "data/dictionary.h"
#include "data/por-file-writer.h"
-#include "data/procedure.h"
#include "data/sys-file-writer.h"
#include "data/transformations.h"
#include "data/variable.h"
struct case_map *map; /* Map from input data to data for writer. */
/* Common options. */
- bool print_map; /* Print map? TODO. */
- bool print_short_names; /* Print long-to-short name map. TODO. */
struct sfm_write_options sysfile_opts;
struct pfm_write_options porfile_opts;
dict = dict_clone (dataset_dict (ds));
writer = NULL;
map = NULL;
- print_map = false;
- print_short_names = false;
sysfile_opts = sfm_writer_default_options ();
porfile_opts = pfm_writer_default_options ();
lex_match (lexer, T_EQUALS);
- handle = fh_parse (lexer, FH_REF_FILE | FH_REF_SCRATCH);
+ handle = fh_parse (lexer, FH_REF_FILE, NULL);
if (handle == NULL)
goto error;
}
else if (lex_match_id (lexer, "NAMES"))
- print_short_names = true;
+ {
+ /* Not yet implemented. */
+ }
else if (lex_match_id (lexer, "PERMISSIONS"))
{
bool cw;
cw = true;
else
{
- lex_error (lexer, _("expecting %s or %s"),
- "READONLY", "WRITEABLE");
+ lex_error_expecting (lexer, "READONLY", "WRITEABLE",
+ NULL_SENTINEL);
goto error;
}
sysfile_opts.create_writeable = porfile_opts.create_writeable = cw;
*retain_unselected = false;
else
{
- lex_error (lexer, _("expecting %s or %s"), "RETAIN", "DELETE");
+ lex_error_expecting (lexer, "RETAIN", "DELETE", NULL_SENTINEL);
goto error;
}
}
porfile_opts.type = PFM_TAPE;
else
{
- lex_error (lexer, _("expecting %s or %s"), "COMM", "TAPE");
+ lex_error_expecting (lexer, "COMM", "TAPE", NULL_SENTINEL);
goto error;
}
}
if (handle == NULL)
{
- lex_sbc_missing (lexer, "OUTFILE");
+ lex_sbc_missing ("OUTFILE");
goto error;
}