Fixed the parsing of subcommands, such that the (n) setting is optional

[pspp] / src / var.h

diff --git a/src/var.h b/src/var.h
index cade9d3eecc241e898fcc46113b0be8df0c3a2e2..c1ad04c5ef2803560c8ce02bc27b681078b193ad 100644 (file)
--- a/src/var.h
+++ b/src/var.h
@@ -22,8 +22,7 @@
 
 #include <stddef.h>
 #include "format.h"
-#include "t-test.h"
-#include "oneway.h"
+#include "group_proc.h"
 #include "val.h"
 
 /* Frequency tables. */
@@ -220,8 +219,7 @@ struct variable
        struct means_proc mns;
        struct matrix_data_proc mxd;
        struct match_files_proc mtf;
-       struct t_test_proc t_t;
-       struct oneway_proc ww;
+       struct group_proc grp_data;
       }
     p;
   };
@@ -435,4 +433,13 @@ int parse_var_set_vars (const struct var_set *, struct variable ***, int *,
 int parse_DATA_LIST_vars (char ***names, int *cnt, int opts);
 int parse_mixed_vars (char ***names, int *cnt, int opts);
 
+
+
+/* Return a string representing this variable, in the form most 
+   appropriate from a human factors perspective.
+   (IE: the label if it has one, otherwise the name )
+*/
+const char * var_to_string(const struct variable *var);
+
+
 #endif /* !var_h */