X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fdata-io%2Ftrim.c;h=63041f25f10465dde398a80b863a9d46bf186340;hb=9ade26c8349b4434008c46cf09bc7473ec743972;hp=ac8bf272f8528f2ebc5878e0ce0c64d8e4a1c9e3;hpb=afdf3096926b561f4e6511c10fcf73fc6796b9d2;p=pspp-builds.git diff --git a/src/language/data-io/trim.c b/src/language/data-io/trim.c index ac8bf272..63041f25 100644 --- 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) - || !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) { @@ -114,7 +115,7 @@ parse_dict_rename (struct lexer *lexer, struct dictionary *dict) msg (SE, _("`=' expected after variable list.")); 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)