projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
lexer: Make lex_error_expecting() easier to use.
[pspp]
/
src
/
language
/
data-io
/
save-translate.c
diff --git
a/src/language/data-io/save-translate.c
b/src/language/data-io/save-translate.c
index bc68e553e1ecb07d0587afdeed944b86af5a05a2..0da3c8b96f0f9a807972b1c2cb6e5ee9e586ef4e 100644
(file)
--- a/
src/language/data-io/save-translate.c
+++ b/
src/language/data-io/save-translate.c
@@
-1,5
+1,5
@@
/* PSPP - a program for statistical analysis.
/* PSPP - a program for statistical analysis.
- Copyright (C) 2010, 2011 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
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
@@
-45,6
+45,7
@@
cmd_save_translate (struct lexer *lexer, struct dataset *ds)
enum { CSV_FILE = 1, TAB_FILE } type;
struct dictionary *dict;
enum { CSV_FILE = 1, TAB_FILE } type;
struct dictionary *dict;
+ struct case_map_stage *stage;
struct case_map *map;
struct casewriter *writer;
struct file_handle *handle;
struct case_map *map;
struct casewriter *writer;
struct file_handle *handle;
@@
-67,6
+68,8
@@
cmd_save_translate (struct lexer *lexer, struct dataset *ds)
type = 0;
dict = dict_clone (dataset_dict (ds));
type = 0;
dict = dict_clone (dataset_dict (ds));
+ dict_set_names_must_be_ids (dict, false);
+ stage = NULL;
map = NULL;
handle = NULL;
map = NULL;
handle = NULL;
@@
-81,11
+84,14
@@
cmd_save_translate (struct lexer *lexer, struct dataset *ds)
delimiter = 0;
qualifier = '"';
delimiter = 0;
qualifier = '"';
-
case_map_prepare_dict
(dict);
+
stage = case_map_stage_create
(dict);
dict_delete_scratch_vars (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)
if (lex_match_id (lexer, "OUTFILE"))
{
if (handle != NULL)
@@
-115,7
+121,7
@@
cmd_save_translate (struct lexer *lexer, struct dataset *ds)
type = TAB_FILE;
else
{
type = TAB_FILE;
else
{
- lex_error_expecting (lexer, "CSV", "TAB"
, NULL_SENTINEL
);
+ lex_error_expecting (lexer, "CSV", "TAB");
goto error;
}
}
goto error;
}
}
@@
-132,7
+138,7
@@
cmd_save_translate (struct lexer *lexer, struct dataset *ds)
recode_user_missing = true;
else
{
recode_user_missing = true;
else
{
- lex_error_expecting (lexer, "IGNORE", "RECODE"
, NULL_SENTINEL
);
+ lex_error_expecting (lexer, "IGNORE", "RECODE");
goto error;
}
}
goto error;
}
}
@@
-145,7
+151,7
@@
cmd_save_translate (struct lexer *lexer, struct dataset *ds)
use_value_labels = true;
else
{
use_value_labels = true;
else
{
- lex_error_expecting (lexer, "VALUES", "LABELS"
, NULL_SENTINEL
);
+ lex_error_expecting (lexer, "VALUES", "LABELS");
goto error;
}
}
goto error;
}
}
@@
-193,8
+199,7
@@
cmd_save_translate (struct lexer *lexer, struct dataset *ds)
decimal = ',';
else
{
decimal = ',';
else
{
- lex_error_expecting (lexer, "DOT", "COMMA",
- NULL_SENTINEL);
+ lex_error_expecting (lexer, "DOT", "COMMA");
goto error;
}
}
goto error;
}
}
@@
-207,8
+212,7
@@
cmd_save_translate (struct lexer *lexer, struct dataset *ds)
use_print_formats = true;
else
{
use_print_formats = true;
else
{
- lex_error_expecting (lexer, "PLAIN", "VARIABLE",
- NULL_SENTINEL);
+ lex_error_expecting (lexer, "PLAIN", "VARIABLE");
goto error;
}
}
goto error;
}
}
@@
-225,15
+229,13
@@
cmd_save_translate (struct lexer *lexer, struct dataset *ds)
retain_unselected = false;
else
{
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))
goto error;
}
goto error;
}
}
else if (!parse_dict_trim (lexer, dict))
goto error;
}
- if (lex_end_of_command (lexer) != CMD_SUCCESS)
- goto error;
if (type == 0)
{
if (type == 0)
{
@@
-245,10
+247,10
@@
cmd_save_translate (struct lexer *lexer, struct dataset *ds)
lex_sbc_missing ("OUTFILE");
goto error;
}
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;
}
goto error;
}
@@
-271,10
+273,11
@@
cmd_save_translate (struct lexer *lexer, struct dataset *ds)
goto error;
fh_unref (handle);
goto error;
fh_unref (handle);
- map = case_map_from_dict (dict);
+ map = case_map_stage_get_case_map (stage);
+ case_map_stage_destroy (stage);
if (map != NULL)
writer = case_map_create_output_translator (map, writer);
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);
casereader_transfer (proc_open_filtering (ds, !retain_unselected), writer);
ok = casewriter_destroy (writer);
@@
-283,8
+286,9
@@
cmd_save_translate (struct lexer *lexer, struct dataset *ds)
return ok ? CMD_SUCCESS : CMD_CASCADING_FAILURE;
error:
return ok ? CMD_SUCCESS : CMD_CASCADING_FAILURE;
error:
+ case_map_stage_destroy (stage);
fh_unref (handle);
fh_unref (handle);
- dict_
destroy
(dict);
+ dict_
unref
(dict);
case_map_destroy (map);
return CMD_FAILURE;
}
case_map_destroy (map);
return CMD_FAILURE;
}