projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
lexer: Change the functions for retrieving token strings.
[pspp]
/
src
/
language
/
xforms
/
count.c
diff --git
a/src/language/xforms/count.c
b/src/language/xforms/count.c
index 6d055f836974fcfab1554de48d18bf436c1faa24..550db8a5315e454fde88f775b19002c2cee77a92 100644
(file)
--- a/
src/language/xforms/count.c
+++ b/
src/language/xforms/count.c
@@
-114,7
+114,7
@@
cmd_count (struct lexer *lexer, struct dataset *ds)
/* Get destination variable, or at least its name. */
if (!lex_force_id (lexer))
goto fail;
/* Get destination variable, or at least its name. */
if (!lex_force_id (lexer))
goto fail;
- dv->var = dict_lookup_var (dataset_dict (ds), lex_tok
id
(lexer));
+ dv->var = dict_lookup_var (dataset_dict (ds), lex_tok
cstr
(lexer));
if (dv->var != NULL)
{
if (var_is_alpha (dv->var))
if (dv->var != NULL)
{
if (var_is_alpha (dv->var))
@@
-124,7
+124,7
@@
cmd_count (struct lexer *lexer, struct dataset *ds)
}
}
else
}
}
else
- dv->name = pool_strdup (trns->pool, lex_tok
id
(lexer));
+ dv->name = pool_strdup (trns->pool, lex_tok
cstr
(lexer));
lex_get (lexer);
if (!lex_force_match (lexer, T_EQUALS))
lex_get (lexer);
if (!lex_force_match (lexer, T_EQUALS))
@@
-253,7
+253,7
@@
parse_string_criteria (struct lexer *lexer, struct pool *pool, struct criteria *
return false;
cur = &crit->values.str[crit->value_cnt++];
*cur = pool_alloc (pool, len + 1);
return false;
cur = &crit->values.str[crit->value_cnt++];
*cur = pool_alloc (pool, len + 1);
- str_copy_rpad (*cur, len + 1,
ds_cstr (lex_tokstr (lexer)
));
+ str_copy_rpad (*cur, len + 1,
lex_tokcstr (lexer
));
lex_get (lexer);
lex_match (lexer, T_COMMA);
lex_get (lexer);
lex_match (lexer, T_COMMA);