output: Make global variables less global.

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

diff --git a/src/language/stats/t-test.q b/src/language/stats/t-test.q
index a3f4cf8f522516d810ae29948a8402becd01c636..500e18ffb422dfa1b5f22076f5b21160d86dbc37 100644 (file)
--- a/src/language/stats/t-test.q
+++ b/src/language/stats/t-test.q
@@ -32,6 +32,7 @@
 #include <language/command.h>
 #include <language/dictionary/split-file.h>
 #include <language/lexer/lexer.h>
+#include <language/lexer/value-parser.h>
 #include <libpspp/array.h>
 #include <libpspp/assertion.h>
 #include <libpspp/compiler.h>
@@ -126,8 +127,6 @@ struct t_test_proc
     union value g_value[2];     /* CMP_EQ only: Per-group indep var values. */
   };
 
-static int parse_value (struct lexer *, union value *, int width);
-
 /* Statistics Summary Box */
 struct ssbox
   {
@@ -421,29 +420,6 @@ tts_custom_pairs (struct lexer *lexer, struct dataset *ds,
   free (vars2);
   return 1;
 }
-
-/* Parses the current token (numeric or string, depending on type)
-   value v and returns success. */
-static int
-parse_value (struct lexer *lexer, union value *v, int width)
-{
-  if (width == 0)
-    {
-      if (!lex_force_num (lexer))
-       return 0;
-      v->f = lex_tokval (lexer);
-    }
-  else
-    {
-      if (!lex_force_string (lexer))
-       return 0;
-      value_copy_str_rpad (v, width, ds_cstr (lex_tokstr (lexer)), ' ');
-    }
-
-  lex_get (lexer);
-
-  return 1;
-}
 \f
 /* Implementation of the SSBOX object. */
 
@@ -505,7 +481,7 @@ ssbox_base_init (struct ssbox *this, int cols, int rows)
   tab_headers (this->t, 0, 0, 1, 0);
   tab_box (this->t, TAL_2, TAL_2, TAL_0, TAL_1, 0, 0, cols - 1, rows - 1);
   tab_hline (this->t, TAL_2, 0, cols- 1, 1);
-  tab_dim (this->t, tab_natural_dimensions, NULL);
+  tab_dim (this->t, tab_natural_dimensions, NULL, NULL);
 }
 \f
 /* ssbox implementations. */
@@ -1095,7 +1071,7 @@ trbox_base_init (struct trbox *self, size_t data_rows, int cols)
   tab_headers (self->t, 0, 0, 3, 0);
   tab_box (self->t, TAL_2, TAL_2, TAL_0, TAL_0, 0, 0, cols - 1, rows - 1);
   tab_hline (self->t, TAL_2, 0, cols- 1, 3);
-  tab_dim (self->t, tab_natural_dimensions, NULL);
+  tab_dim (self->t, tab_natural_dimensions, NULL, NULL);
 }
 
 /* Base finalizer for the trbox */
@@ -1122,7 +1098,7 @@ pscbox (struct t_test_proc *proc)
   tab_box (table, TAL_2, TAL_2, TAL_0, TAL_1, 0, 0, cols - 1, rows - 1);
   tab_hline (table, TAL_2, 0, cols - 1, 1);
   tab_vline (table, TAL_2, 2, 0, rows - 1);
-  tab_dim (table, tab_natural_dimensions, NULL);
+  tab_dim (table, tab_natural_dimensions, NULL, NULL);
   tab_title (table, _("Paired Samples Correlations"));
 
   /* column headings */