#include "language/lexer/lexer.h"
#include "libpspp/message.h"
-#include "xalloc.h"
#include "gettext.h"
#define _(msgid) gettext (msgid)
struct casewriter *writer;
struct file_handle *handle;
- struct csv_writer_options csv_opts;
-
bool replace;
bool retain_unselected;
include_var_names = false;
use_value_labels = false;
use_print_formats = false;
- decimal = settings_get_decimal_char (FMT_F);
+ decimal = settings_get_fmt_settings ()->decimal;
delimiter = 0;
qualifier = '"';
{
if (handle != NULL)
{
- lex_sbc_only_once ("OUTFILE");
+ lex_sbc_only_once (lexer, "OUTFILE");
goto error;
}
{
if (type != 0)
{
- lex_sbc_only_once ("TYPE");
+ lex_sbc_only_once (lexer, "TYPE");
goto error;
}
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;
}
}
/* XXX should support multibyte UTF-8 delimiters */
if (ss_length (lex_tokss (lexer)) != 1)
{
- msg (SE, _("The %s string must contain exactly one "
- "character."), "DELIMITER");
+ lex_error (lexer, _("The %s string must contain exactly "
+ "one character."), "DELIMITER");
goto error;
}
delimiter = ss_first (lex_tokss (lexer));
/* XXX should support multibyte UTF-8 qualifiers */
if (ss_length (lex_tokss (lexer)) != 1)
{
- msg (SE, _("The %s string must contain exactly one "
- "character."), "QUALIFIER");
+ lex_error (lexer, _("The %s string must contain exactly "
+ "one character."), "QUALIFIER");
goto error;
}
qualifier = ss_first (lex_tokss (lexer));
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 (type == 0)
{
- lex_sbc_missing ("TYPE");
+ lex_sbc_missing (lexer, "TYPE");
goto error;
}
else if (handle == NULL)
{
- lex_sbc_missing ("OUTFILE");
+ lex_sbc_missing (lexer, "OUTFILE");
goto error;
}
else if (!replace && fn_exists (handle))
dict_delete_scratch_vars (dict);
dict_compact_values (dict);
- csv_opts.recode_user_missing = recode_user_missing;
- csv_opts.include_var_names = include_var_names;
- csv_opts.use_value_labels = use_value_labels;
- csv_opts.use_print_formats = use_print_formats;
- csv_opts.decimal = decimal;
- csv_opts.delimiter = (delimiter ? delimiter
- : type == TAB_FILE ? '\t'
- : decimal == '.' ? ','
- : ';');
- csv_opts.qualifier = qualifier;
-
+ struct csv_writer_options csv_opts = {
+ .recode_user_missing = recode_user_missing,
+ .include_var_names = include_var_names,
+ .use_value_labels = use_value_labels,
+ .use_print_formats = use_print_formats,
+ .decimal = decimal,
+ .delimiter = (delimiter ? delimiter
+ : type == TAB_FILE ? '\t'
+ : decimal == '.' ? ','
+ : ';'),
+ .qualifier = qualifier,
+ };
writer = csv_writer_open (handle, dict, &csv_opts);
if (writer == NULL)
goto error;