projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
NPAR TESTS: Accept .313 instead of .312 for point probability in SIGN test.
[pspp-builds.git]
/
src
/
language
/
stats
/
aggregate.c
diff --git
a/src/language/stats/aggregate.c
b/src/language/stats/aggregate.c
index 15376f62b88142c10fadbcba0720519df66a890c..a8e3f6d71d267545b1d1d85ef60490433149c0f8 100644
(file)
--- a/
src/language/stats/aggregate.c
+++ b/
src/language/stats/aggregate.c
@@
-222,7
+222,7
@@
cmd_aggregate (struct lexer *lexer, struct dataset *ds)
lex_match (lexer, '=');
if (!lex_match_id (lexer, "COLUMNWISE"))
{
lex_match (lexer, '=');
if (!lex_match_id (lexer, "COLUMNWISE"))
{
- lex_error (lexer, _("
while expecting COLUMNWISE")
);
+ lex_error (lexer, _("
expecting %s"), "COLUMNWISE"
);
goto error;
}
agr.missing = COLUMNWISE;
goto error;
}
agr.missing = COLUMNWISE;
@@
-231,7
+231,7
@@
cmd_aggregate (struct lexer *lexer, struct dataset *ds)
copy_documents = true;
else if (lex_match_id (lexer, "PRESORTED"))
presorted = true;
copy_documents = true;
else if (lex_match_id (lexer, "PRESORTED"))
presorted = true;
- else if (lex_match_id (lexer, "BREAK"))
+ else if (lex_
force_
match_id (lexer, "BREAK"))
{
int i;
{
int i;
@@
-249,10
+249,8
@@
cmd_aggregate (struct lexer *lexer, struct dataset *ds)
break;
}
else
break;
}
else
- {
- lex_error (lexer, _("expecting BREAK"));
- goto error;
- }
+ goto error;
+
}
if (presorted && saw_direction)
msg (SW, _("When PRESORTED is specified, specifying sorting directions "
}
if (presorted && saw_direction)
msg (SW, _("When PRESORTED is specified, specifying sorting directions "
@@
-434,7
+432,7
@@
parse_aggregate_functions (struct lexer *lexer, const struct dictionary *dict,
- if (lex_
token (lexer) == T_STRING
)
+ if (lex_
is_string (lexer)
)
{
struct string label;
ds_init_string (&label, lex_tokstr (lexer));
{
struct string label;
ds_init_string (&label, lex_tokstr (lexer));
@@
-474,7
+472,7
@@
parse_aggregate_functions (struct lexer *lexer, const struct dictionary *dict,
{
if (function->src_vars == AGR_SV_YES)
{
{
if (function->src_vars == AGR_SV_YES)
{
-
lex_error (lexer, _("expecting `('")
);
+
lex_force_match (lexer, '('
);
goto error;
}
}
goto error;
}
}
@@
-501,7
+499,7
@@
parse_aggregate_functions (struct lexer *lexer, const struct dictionary *dict,
int type;
lex_match (lexer, ',');
int type;
lex_match (lexer, ',');
- if (lex_
token (lexer) == T_STRING
)
+ if (lex_
is_string (lexer)
)
{
arg[i].c = ds_xstrdup (lex_tokstr (lexer));
type = VAL_STRING;
{
arg[i].c = ds_xstrdup (lex_tokstr (lexer));
type = VAL_STRING;
@@
-530,11
+528,8
@@
parse_aggregate_functions (struct lexer *lexer, const struct dictionary *dict,
}
/* Trailing rparen. */
}
/* Trailing rparen. */
- if (!lex_match (lexer, ')'))
- {
- lex_error (lexer, _("expecting `)'"));
- goto error;
- }
+ if (!lex_force_match (lexer, ')'))
+ goto error;
/* Now check that the number of source variables match
the number of target variables. If we check earlier
/* Now check that the number of source variables match
the number of target variables. If we check earlier