-/* PSPP - computes sample statistics.
+/* PSPP - a program for statistical analysis.
Copyright (C) 1997-9, 2000 Free Software Foundation, Inc.
- Written by Ben Pfaff <blp@gnu.org>.
- 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 the Free Software Foundation; either version 2 of the
- License, or (at your option) any later version.
+ 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
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
- This program is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- General Public License for more details.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- 02110-1301, USA. */
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
#include <config.h>
+
#include <stdlib.h>
#include <stdio.h>
+
#include <data/dictionary.h>
-#include <libpspp/message.h>
-#include <libpspp/alloc.h>
+#include <data/procedure.h>
+#include <data/variable.h>
#include <language/command.h>
-#include <libpspp/hash.h>
#include <language/lexer/lexer.h>
+#include <libpspp/hash.h>
#include <libpspp/message.h>
-#include <libpspp/magic.h>
-#include <data/variable.h>
+
+#include "xalloc.h"
#include "gettext.h"
#define _(msgid) gettext (msgid)
/* (headers) */
-#include <libpspp/debug-print.h>
-
/* (specification)
means (mns_):
*tables=custom;
name:!names/nonames,
val:!values/novalues,
fmt:!table/tree;
- +missing=miss:!table/include/dependent;
+ missing=miss:!table/include/dependent;
+cells[cl_]=default,count,sum,mean,stddev,variance,all;
+statistics[st_]=anova,linearity,all,none.
*/
/* (functions) */
/* TABLES: Variable lists for each dimension. */
-int n_dim; /* Number of dimensions. */
-size_t *nv_dim; /* Number of variables in each dimension. */
-struct variable ***v_dim; /* Variables in each dimension. */
+static int n_dim; /* Number of dimensions. */
+static size_t *nv_dim; /* Number of variables in each dimension. */
+static const struct variable ***v_dim; /* Variables in each dimension. */
/* VARIABLES: List of variables. */
-int n_var;
-struct variable **v_var;
+static struct variable **v_var;
/* Parses and executes the T-TEST procedure. */
int
-cmd_means (void)
+cmd_means (struct lexer *lexer, struct dataset *ds)
{
struct cmd_means cmd;
int success = CMD_FAILURE;
-
+
n_dim = 0;
nv_dim = NULL;
v_dim = NULL;
v_var = NULL;
- if (!parse_means (&cmd))
+ if (!parse_means (lexer, ds, &cmd, NULL))
goto free;
if (cmd.sbc_cells)
free:
{
int i;
-
+
for (i = 0; i < n_dim; i++)
free (v_dim[i]);
free (nv_dim);
free (v_dim);
free (v_var);
}
-
+
return success;
}
/* Parses the TABLES subcommand. */
static int
-mns_custom_tables (struct cmd_means *cmd)
+mns_custom_tables (struct lexer *lexer, struct dataset *ds, struct cmd_means *cmd, void *aux UNUSED)
{
- struct var_set *var_set;
-
- if (!lex_match_id ("TABLES")
- && (token != T_ID || dict_lookup_var (default_dict, tokid) == NULL)
- && token != T_ALL)
+ struct const_var_set *var_set;
+
+ if (!lex_match_id (lexer, "TABLES")
+ && (lex_token (lexer) != T_ID || dict_lookup_var (dataset_dict (ds), lex_tokid (lexer)) == NULL)
+ && lex_token (lexer) != T_ALL)
return 2;
- lex_match ('=');
+ lex_match (lexer, '=');
if (cmd->sbc_tables)
{
return 0;
}
- var_set = var_set_create_from_dict (default_dict);
+ var_set = const_var_set_create_from_dict (dataset_dict (ds));
assert (var_set != NULL);
do
{
size_t nvl;
- struct variable **vl;
+ const struct variable **vl;
- if (!parse_var_set_vars (var_set, &vl, &nvl,
- PV_NO_DUPLICATE | PV_NO_SCRATCH))
+ if (!parse_const_var_set_vars (lexer, var_set, &vl, &nvl,
+ PV_NO_DUPLICATE | PV_NO_SCRATCH))
goto lossage;
-
+
n_dim++;
nv_dim = xnrealloc (nv_dim, n_dim, sizeof *nv_dim);
v_dim = xnrealloc (v_dim, n_dim, sizeof *v_dim);
nv_dim[n_dim - 1] = nvl;
v_dim[n_dim - 1] = vl;
}
- while (lex_match (T_BY));
+ while (lex_match (lexer, T_BY));
- var_set_destroy (var_set);
+ const_var_set_destroy (var_set);
return 1;
lossage:
- var_set_destroy (var_set);
+ const_var_set_destroy (var_set);
return 0;
}
-/*
+/*
Local Variables:
mode: c
End: