projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote branch 'origin/master' into import-gui
[pspp]
/
src
/
language
/
stats
/
aggregate.c
diff --git
a/src/language/stats/aggregate.c
b/src/language/stats/aggregate.c
index fe6f5eed685993411f035856cc1a0204bf7b3a68..4d95e62e64f6ea098bad20b7e181927a6a0271a2 100644
(file)
--- a/
src/language/stats/aggregate.c
+++ b/
src/language/stats/aggregate.c
@@
-1,5
+1,5
@@
/* PSPP - a program for statistical analysis.
/* PSPP - a program for statistical analysis.
- Copyright (C) 1997-9, 2000, 2006, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+ Copyright (C) 1997-9, 2000, 2006, 2008, 2009, 2010, 2011
, 2012
Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@
-49,6
+49,7
@@
#include "math/sort.h"
#include "math/statistic.h"
#include "math/sort.h"
#include "math/statistic.h"
+#include "gl/c-strcase.h"
#include "gl/minmax.h"
#include "gl/xalloc.h"
#include "gl/minmax.h"
#include "gl/xalloc.h"
@@
-182,7
+183,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
+224,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;
@@
-332,8
+333,8
@@
cmd_aggregate (struct lexer *lexer, struct dataset *ds)
else
{
dump_aggregate_info (&agr, output, c);
else
{
dump_aggregate_info (&agr, output, c);
- case_unref (c);
}
}
+ case_unref (c);
}
if (!casegrouper_destroy (grouper))
goto error;
}
if (!casegrouper_destroy (grouper))
goto error;
@@
-452,7
+453,7
@@
parse_aggregate_functions (struct lexer *lexer, const struct dictionary *dict,
exclude = ds_chomp_byte (&function_name, '.') ? MV_SYSTEM : MV_ANY;
for (function = agr_func_tab; function->name; function++)
exclude = ds_chomp_byte (&function_name, '.') ? MV_SYSTEM : MV_ANY;
for (function = agr_func_tab; function->name; function++)
- if (!strcasecmp (function->name, ds_cstr (&function_name)))
+ if (!
c_
strcasecmp (function->name, ds_cstr (&function_name)))
break;
if (NULL == function->name)
{
break;
if (NULL == function->name)
{
@@
-638,8
+639,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;
}