projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Suppress GCC 4.7 warnings by changes to code that make it less clear.
[pspp]
/
src
/
language
/
data-io
/
trim.c
diff --git
a/src/language/data-io/trim.c
b/src/language/data-io/trim.c
index ac8bf272f8528f2ebc5878e0ce0c64d8e4a1c9e3..947a7524a84eaa9d00773d9ff8af440b49910351 100644
(file)
--- a/
src/language/data-io/trim.c
+++ b/
src/language/data-io/trim.c
@@
-81,7
+81,8
@@
parse_dict_rename (struct lexer *lexer, struct dictionary *dict)
if (v == NULL)
return 0;
if (!lex_force_match (lexer, T_EQUALS)
if (v == NULL)
return 0;
if (!lex_force_match (lexer, T_EQUALS)
- || !lex_force_id (lexer))
+ || !lex_force_id (lexer)
+ || !dict_id_is_valid (dict, lex_tokcstr (lexer), true))
return 0;
if (dict_lookup_var (dict, lex_tokcstr (lexer)) != NULL)
{
return 0;
if (dict_lookup_var (dict, lex_tokcstr (lexer)) != NULL)
{
@@
-111,10
+112,10
@@
parse_dict_rename (struct lexer *lexer, struct dictionary *dict)
goto done;
if (!lex_match (lexer, T_EQUALS))
{
goto done;
if (!lex_match (lexer, T_EQUALS))
{
-
msg (SE, _("`=' expected after variable list.")
);
+
lex_error_expecting (lexer, "`='", NULL_SENTINEL
);
goto done;
}
goto done;
}
- if (!parse_DATA_LIST_vars (lexer, &new_names, &nn,
+ if (!parse_DATA_LIST_vars (lexer,
dict,
&new_names, &nn,
PV_APPEND | PV_NO_SCRATCH | PV_NO_DUPLICATE))
goto done;
if (nn != nv)
PV_APPEND | PV_NO_SCRATCH | PV_NO_DUPLICATE))
goto done;
if (nn != nv)