projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
INPUT PROGRAM: Avoid infinite loop for trivially empty input program.
[pspp]
/
src
/
language
/
stats
/
sort-criteria.c
diff --git
a/src/language/stats/sort-criteria.c
b/src/language/stats/sort-criteria.c
index b8bdbd06f85b658808e7cfd6126a9350b845ab00..a8c1ff13d221424119a348320ba7b0549e804165 100644
(file)
--- a/
src/language/stats/sort-criteria.c
+++ b/
src/language/stats/sort-criteria.c
@@
-71,14
+71,11
@@
parse_sort_criteria (struct lexer *lexer, const struct dictionary *dict,
direction = SC_ASCEND;
else
{
direction = SC_ASCEND;
else
{
- msg (SE, _("`A' or `D' expected inside parentheses."));
- goto error;
- }
- if (!lex_match (lexer, T_RPAREN))
- {
- msg (SE, _("`)' expected."));
+ lex_error_expecting (lexer, "A", "D", NULL_SENTINEL);
goto error;
}
goto error;
}
+ if (!lex_force_match (lexer, T_RPAREN))
+ goto error;
if (saw_direction != NULL)
*saw_direction = true;
}
if (saw_direction != NULL)
*saw_direction = true;
}