X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fstats%2Fmeans.q;h=fc01c07ae1645c0e553aade4f45bfe97cb2c3369;hb=e070d7ddf78446b9852c61c9af84ad3659bac3b3;hp=a1aa7229ebaa87d0feabe9a27d5cb51df0411bc7;hpb=81fff61a96bece351e381ad3fef8ab1248a952ba;p=pspp-builds.git

diff --git a/src/language/stats/means.q b/src/language/stats/means.q
index a1aa7229..fc01c07a 100644
--- a/src/language/stats/means.q
+++ b/src/language/stats/means.q
@@ -44,7 +44,7 @@
             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.
 */
@@ -52,17 +52,16 @@
 /* (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 dataset *ds)
 {
   struct cmd_means cmd;
   int success = CMD_FAILURE;
@@ -72,7 +71,7 @@ cmd_means (void)
   v_dim = NULL;
   v_var = NULL;
 
-  if (!parse_means (&cmd))
+  if (!parse_means (ds, &cmd, NULL))
     goto free;
 
   if (cmd.sbc_cells)
@@ -123,12 +122,12 @@ free:
 
 /* Parses the TABLES subcommand. */
 static int
-mns_custom_tables (struct cmd_means *cmd)
+mns_custom_tables (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_ID || dict_lookup_var (dataset_dict (ds), tokid) == NULL)
       && token != T_ALL)
     return 2;
   lex_match ('=');
@@ -140,7 +139,7 @@ mns_custom_tables (struct cmd_means *cmd)
       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