projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
command: Don't allow SORT as an abbreviation for SORT CASES.
[pspp]
/
src
/
language
/
dictionary
/
vector.c
diff --git
a/src/language/dictionary/vector.c
b/src/language/dictionary/vector.c
index 1a616ab27ad858170f96ae7e99af12a91fe79c31..3be0723f705d0da04534011c2a2e884d7728755a 100644
(file)
--- a/
src/language/dictionary/vector.c
+++ b/
src/language/dictionary/vector.c
@@
-1,5
+1,5
@@
/* PSPP - a program for statistical analysis.
/* PSPP - a program for statistical analysis.
- Copyright (C) 1997-9, 2000 Free Software Foundation, Inc.
+ Copyright (C) 1997-9, 2000
, 2010
Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@
-59,33
+59,33
@@
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_get (lexer);
- lex_match (lexer,
','
);
+ lex_match (lexer,
T_COMMA
);
}
/* Now that we have the names it's time to check for the short
or long forms. */
}
/* Now that we have the names it's time to check for the short
or long forms. */
- if (lex_match (lexer,
'='
))
+ if (lex_match (lexer,
T_EQUALS
))
{
/* Long form. */
struct variable **v;
{
/* Long form. */
struct variable **v;
@@
-104,7
+104,7
@@
cmd_vector (struct lexer *lexer, struct dataset *ds)
dict_create_vector (dict, vectors[0], v, nv);
}
dict_create_vector (dict, vectors[0], v, nv);
}
- else if (lex_match (lexer,
'('
))
+ else if (lex_match (lexer,
T_LPAREN
))
{
/* Short form. */
struct fmt_spec format;
{
/* Short form. */
struct fmt_spec format;
@@
-118,7
+118,7
@@
cmd_vector (struct lexer *lexer, struct dataset *ds)
var_cnt = 0;
format = fmt_for_output (FMT_F, 8, 2);
seen_format = false;
var_cnt = 0;
format = fmt_for_output (FMT_F, 8, 2);
seen_format = false;
- while (!lex_match (lexer,
')'
))
+ while (!lex_match (lexer,
T_RPAREN
))
{
if (lex_is_integer (lexer) && var_cnt == 0)
{
{
if (lex_is_integer (lexer) && var_cnt == 0)
{
@@
-143,7
+143,7
@@
cmd_vector (struct lexer *lexer, struct dataset *ds)
lex_error (lexer, NULL);
goto fail;
}
lex_error (lexer, NULL);
goto fail;
}
- lex_match (lexer,
','
);
+ lex_match (lexer,
T_COMMA
);
}
if (var_cnt == 0)
{
}
if (var_cnt == 0)
{
@@
-195,7
+195,7
@@
cmd_vector (struct lexer *lexer, struct dataset *ds)
goto fail;
}
}
goto fail;
}
}
- while (lex_match (lexer,
'/'
));
+ while (lex_match (lexer,
T_SLASH
));
pool_destroy (pool);
return lex_end_of_command (lexer);
pool_destroy (pool);
return lex_end_of_command (lexer);