projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
/RENAME subcommand: Allow quoted strings in destination variables.
[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 26941329f35ad378426ad441654031e9ab586791..72b6e3ae7226e0441ef7d75a4e15a5c5b450bb07 100644
(file)
--- a/
src/language/data-io/save-translate.c
+++ b/
src/language/data-io/save-translate.c
@@
-68,6
+68,7
@@
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;
stage = NULL;
map = NULL;
@@
-120,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;
}
}
@@
-137,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;
}
}
@@
-150,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;
}
}
@@
-198,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;
}
}
@@
-212,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;
}
}
@@
-230,11
+229,11
@@
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;
}
}
goto error;
}
}
- else if (!parse_dict_trim (lexer, dict))
+ else if (!parse_dict_trim (lexer, dict
, true
))
goto error;
}
goto error;
}
@@
-278,7
+277,7
@@
cmd_save_translate (struct lexer *lexer, struct dataset *ds)
case_map_stage_destroy (stage);
if (map != NULL)
writer = case_map_create_output_translator (map, writer);
case_map_stage_destroy (stage);
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);
@@
-289,7
+288,7
@@
cmd_save_translate (struct lexer *lexer, struct dataset *ds)
error:
case_map_stage_destroy (stage);
fh_unref (handle);
error:
case_map_stage_destroy (stage);
fh_unref (handle);
- dict_
destroy
(dict);
+ dict_
unref
(dict);
case_map_destroy (map);
return CMD_FAILURE;
}
case_map_destroy (map);
return CMD_FAILURE;
}