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
/
dictionary
/
vector.c
diff --git
a/src/language/dictionary/vector.c
b/src/language/dictionary/vector.c
index a884331ce30ba33eb3a7a3c01be318f9ea9a32d5..3be0723f705d0da04534011c2a2e884d7728755a 100644
(file)
--- a/
src/language/dictionary/vector.c
+++ b/
src/language/dictionary/vector.c
@@
-59,25
+59,25
@@
cmd_vector (struct lexer *lexer, struct dataset *ds)
{
size_t i;
{
size_t i;
- if (dict_lookup_vector (dict, lex_tok
id
(lexer)))
+ if (dict_lookup_vector (dict, lex_tok
cstr
(lexer)))
{
msg (SE, _("A vector named %s already exists."),
{
msg (SE, _("A vector named %s already exists."),
- lex_tok
id
(lexer));
+ lex_tok
cstr
(lexer));
goto fail;
}
for (i = 0; i < vector_cnt; i++)
goto fail;
}
for (i = 0; i < vector_cnt; i++)
- if (!strcasecmp (vectors[i], lex_tok
id
(lexer)))
+ if (!strcasecmp (vectors[i], lex_tok
cstr
(lexer)))
{
msg (SE, _("Vector name %s is given twice."),
{
msg (SE, _("Vector name %s is given twice."),
- lex_tok
id
(lexer));
+ lex_tok
cstr
(lexer));
goto fail;
}
if (vector_cnt == vector_cap)
vectors = pool_2nrealloc (pool,
vectors, &vector_cap, sizeof *vectors);
goto fail;
}
if (vector_cnt == vector_cap)
vectors = pool_2nrealloc (pool,
vectors, &vector_cap, sizeof *vectors);
- vectors[vector_cnt++] = pool_strdup (pool, lex_tok
id
(lexer));
+ vectors[vector_cnt++] = pool_strdup (pool, lex_tok
cstr
(lexer));
lex_get (lexer);
lex_match (lexer, T_COMMA);
lex_get (lexer);
lex_match (lexer, T_COMMA);