projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
DO IF test: Correct expected outcome
[pspp]
/
src
/
language
/
stats
/
aggregate.c
diff --git
a/src/language/stats/aggregate.c
b/src/language/stats/aggregate.c
index fe6f5eed685993411f035856cc1a0204bf7b3a68..f4cbaac448b3acfbd67fa81c8775176fbb6b33e0 100644
(file)
--- a/
src/language/stats/aggregate.c
+++ b/
src/language/stats/aggregate.c
@@
-182,7
+182,7
@@
cmd_aggregate (struct lexer *lexer, struct dataset *ds)
lex_match (lexer, T_EQUALS);
if (!lex_match (lexer, T_ASTERISK))
{
lex_match (lexer, T_EQUALS);
if (!lex_match (lexer, T_ASTERISK))
{
- out_file = fh_parse (lexer, FH_REF_FILE
| FH_REF_SCRATCH
);
+ out_file = fh_parse (lexer, FH_REF_FILE
, dataset_session (ds)
);
if (out_file == NULL)
goto error;
}
if (out_file == NULL)
goto error;
}
@@
-223,7
+223,7
@@
cmd_aggregate (struct lexer *lexer, struct dataset *ds)
lex_match (lexer, T_EQUALS);
if (!lex_match_id (lexer, "COLUMNWISE"))
{
lex_match (lexer, T_EQUALS);
if (!lex_match_id (lexer, "COLUMNWISE"))
{
- lex_error
(lexer, _("expecting %s"), "COLUMNWISE"
);
+ lex_error
_expecting (lexer, "COLUMNWISE", NULL
);
goto error;
}
agr.missing = COLUMNWISE;
goto error;
}
agr.missing = COLUMNWISE;
@@
-638,8
+638,7
@@
parse_aggregate_functions (struct lexer *lexer, const struct dictionary *dict,
free (dest[i]);
if (dest_label[i])
free (dest[i]);
if (dest_label[i])
- var_set_label (destvar, dest_label[i],
- dict_get_encoding (agr->dict), true);
+ var_set_label (destvar, dest_label[i], true);
v->dest = destvar;
}
v->dest = destvar;
}