projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
LOOP: Improve error messages and coding style.
[pspp]
/
src
/
language
/
control
/
loop.c
diff --git
a/src/language/control/loop.c
b/src/language/control/loop.c
index 4dbc7c90bd7ff0c3f62bf444177d50efed3974f8..0db3a491d391dc152aaeebc2f997e22198602b65 100644
(file)
--- a/
src/language/control/loop.c
+++ b/
src/language/control/loop.c
@@
-180,15
+180,12
@@
parse_index_clause (struct dataset *ds, struct lexer *lexer,
{
if (loop->index_var != NULL)
{
{
if (loop->index_var != NULL)
{
-
msg (SE
, _("Only one index clause may be specified."));
+
lex_error (lexer
, _("Only one index clause may be specified."));
return false;
}
return false;
}
- if (lex_token (lexer) != T_ID)
- {
- lex_error (lexer, NULL);
- return false;
- }
+ if (!lex_force_id (lexer))
+ return false;
loop->index_var = dict_lookup_var (dataset_dict (ds), lex_tokcstr (lexer));
if (!loop->index_var)
loop->index_var = dict_lookup_var (dataset_dict (ds), lex_tokcstr (lexer));
if (!loop->index_var)