t-test: Move 'mode' variable from file scope into cmd_t_test().

[pspp-builds.git] / src / language / stats / t-test.q

diff --git a/src/language/stats/t-test.q b/src/language/stats/t-test.q
index 466bf9e75129a9276f62587006e892532ce3dbcc..8446f8355e50afcf00c8d9826064f2ef317cd498 100644 (file)
--- a/src/language/stats/t-test.q
+++ b/src/language/stats/t-test.q
@@ -240,11 +240,6 @@ static void calculate (struct cmd_t_test *,
 
 static  int mode;
 
-static struct cmd_t_test cmd;
-
-static bool bad_weight_warn = false;
-
-
 static int compare_group_binary (const struct group_statistics *a,
                                const struct group_statistics *b,
                                const struct group_properties *p);
@@ -258,6 +253,7 @@ static unsigned  hash_group_binary (const struct group_statistics *g,
 int
 cmd_t_test (struct lexer *lexer, struct dataset *ds)
 {
+  struct cmd_t_test cmd;
   struct casegrouper *grouper;
   struct casereader *group;
   bool ok;
@@ -338,8 +334,6 @@ cmd_t_test (struct lexer *lexer, struct dataset *ds)
       return CMD_FAILURE;
     }
 
-  bad_weight_warn = true;
-
   /* Data pass. */
   grouper = casegrouper_create_splits (proc_open (ds), dataset_dict (ds));
   while (casegrouper_get_next_group (grouper, &group))
@@ -409,7 +403,7 @@ tts_custom_groups (struct lexer *lexer, struct dataset *ds, struct cmd_t_test *c
        }
     }
 
-  if (!parse_value (lexer, &gp.v.g_value[0], var_get_type (indep_var)))
+  if (!parse_value (lexer, &gp.v.g_value[0], var_get_width (indep_var)))
       return 0;
 
   lex_match (lexer, ',');
@@ -428,7 +422,7 @@ tts_custom_groups (struct lexer *lexer, struct dataset *ds, struct cmd_t_test *c
       return 1;
     }
 
-  if (!parse_value (lexer, &gp.v.g_value[1], var_get_type (indep_var)))
+  if (!parse_value (lexer, &gp.v.g_value[1], var_get_width (indep_var)))
     return 0;
 
   n_group_values = 2;