projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make translation easier.
[pspp]
/
src
/
language
/
stats
/
crosstabs.q
diff --git
a/src/language/stats/crosstabs.q
b/src/language/stats/crosstabs.q
index f75e249e8fdd3bba0363a9a26240aedd30ad16e3..341a920116865dfae3d6f97766950597b4bcf29f 100644
(file)
--- a/
src/language/stats/crosstabs.q
+++ b/
src/language/stats/crosstabs.q
@@
-406,7
+406,7
@@
crs_custom_tables (struct lexer *lexer, struct dataset *ds,
{
if (n_by < 2)
{
{
if (n_by < 2)
{
-
lex_error (lexer, _("expecting BY")
);
+
lex_force_match (lexer, T_BY
);
goto done;
}
else
goto done;
}
else
@@
-482,12
+482,8
@@
crs_custom_variables (struct lexer *lexer, struct dataset *ds,
| PV_NO_DUPLICATE | PV_NO_SCRATCH)))
return 0;
| PV_NO_DUPLICATE | PV_NO_SCRATCH)))
return 0;
- if (lex_token (lexer) != '(')
- {
- lex_error (lexer, "expecting `('");
+ if (!lex_force_match (lexer, '('))
goto lossage;
goto lossage;
- }
- lex_get (lexer);
if (!lex_force_int (lexer))
goto lossage;
if (!lex_force_int (lexer))
goto lossage;
@@
-507,12
+503,8
@@
crs_custom_variables (struct lexer *lexer, struct dataset *ds,
}
lex_get (lexer);
}
lex_get (lexer);
- if (lex_token (lexer) != ')')
- {
- lex_error (lexer, "expecting `)'");
- goto lossage;
- }
- lex_get (lexer);
+ if (!lex_force_match (lexer, ')'))
+ goto lossage;
for (i = orig_nv; i < proc->n_variables; i++)
{
for (i = orig_nv; i < proc->n_variables; i++)
{