/* PSPP - computes sample statistics.
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
02110-1301, USA. */
#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/message.h>
+#include <libpspp/alloc.h>
+#include <libpspp/hash.h>
#include <libpspp/magic.h>
-#include <data/variable.h>
+#include <libpspp/message.h>
#include "gettext.h"
#define _(msgid) gettext (msgid)
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 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;
v_dim = NULL;
v_var = NULL;
- if (!parse_means (&cmd))
+ if (!parse_means (lexer, ds, &cmd, NULL))
goto free;
if (cmd.sbc_cells)
/* 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)
+ 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 = var_set_create_from_dict (dataset_dict (ds));
assert (var_set != NULL);
do
size_t nvl;
struct variable **vl;
- if (!parse_var_set_vars (var_set, &vl, &nvl,
+ if (!parse_var_set_vars (lexer, var_set, &vl, &nvl,
PV_NO_DUPLICATE | PV_NO_SCRATCH))
goto lossage;
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);
return 1;