X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fdata-io%2Ftrim.c;h=9f76b10516b1b8d88dc2eba668b919020c784d58;hb=55e6e7ba37a30570f5a31e2d78c22dfa7b61a36f;hp=be637c403365be64ff788d3df6ae6fcc4b4ac698;hpb=740218f508466f16a79939cd97027b99f589d682;p=pspp-builds.git diff --git a/src/language/data-io/trim.c b/src/language/data-io/trim.c index be637c40..9f76b105 100644 --- a/src/language/data-io/trim.c +++ b/src/language/data-io/trim.c @@ -83,18 +83,18 @@ parse_dict_rename (struct lexer *lexer, struct dictionary *dict) if (!lex_force_match (lexer, T_EQUALS) || !lex_force_id (lexer)) return 0; - if (dict_lookup_var (dict, lex_tokid (lexer)) != NULL) + if (dict_lookup_var (dict, lex_tokcstr (lexer)) != NULL) { msg (SE, _("Cannot rename %s as %s because there already exists " "a variable named %s. To rename variables with " "overlapping names, use a single RENAME subcommand " "such as `/RENAME (A=B)(B=C)(C=A)', or equivalently, " "`/RENAME (A B C=B C A)'."), - var_get_name (v), lex_tokid (lexer), lex_tokid (lexer)); + var_get_name (v), lex_tokcstr (lexer), lex_tokcstr (lexer)); return 0; } - dict_rename_var (dict, v, lex_tokid (lexer)); + dict_rename_var (dict, v, lex_tokcstr (lexer)); lex_get (lexer); return 1; }