Parameter estimate matched with appropriate variable during estimation

[pspp] / src / var.h

diff --git a/src/var.h b/src/var.h
index 1d36467b09534ef7a30221cfcbb823534cda000f..a1059a20828a04c76d14184825a037643942e195 100644 (file)
--- a/src/var.h
+++ b/src/var.h
@@ -23,11 +23,10 @@
 
 #include <stddef.h>
 #include "config.h"
-#include "bool.h"
-#include "format.h"
-#include "val.h"
-
+#include <stdbool.h>
 
+#include "format.h"
+#include "missing-values.h"
 
 /* Script variables. */
 
@@ -39,27 +38,6 @@ enum
                                    (STRING is pre-empted by lexer.h.) */
   };
 
-/* Types of missing values.  Order is significant, see
-   mis-val.c:parse_numeric(), sfm-read.c, sfm-write.c,
-   sysfile-info.c:cmd_sysfile_info(), mis-val.c:copy_missing_values(),
-   pfm-read.c:read_variables(), pfm-write.c:write_variables(),
-   apply-dict.c:cmd_apply_dictionary(), and more (?). */
-enum
-  {
-    MISSING_NONE,              /* No user-missing values. */
-    MISSING_1,                 /* One user-missing value. */
-    MISSING_2,                 /* Two user-missing values. */
-    MISSING_3,                 /* Three user-missing values. */
-    MISSING_RANGE,             /* [a,b]. */
-    MISSING_LOW,               /* (-inf,a]. */
-    MISSING_HIGH,              /* (a,+inf]. */
-    MISSING_RANGE_1,           /* [a,b], c. */
-    MISSING_LOW_1,             /* (-inf,a], b. */
-    MISSING_HIGH_1,            /* (a,+inf), b. */
-    MISSING_COUNT
-  };
-
-
 /* A variable's dictionary entry.  */
 struct variable
   {
@@ -75,8 +53,7 @@ struct variable
     int index;                 /* Dictionary index. */
 
     /* Missing values. */
-    int miss_type;             /* One of the MISSING_* constants. */
-    union value missing[3];    /* User-missing value. */
+    struct missing_values miss; /* Missing values. */
 
     /* Display formats. */
     struct fmt_spec print;     /* Default format for PRINT. */
@@ -178,18 +155,8 @@ extern int FILTER_before_TEMPORARY;
 
 void cancel_temporary (void);
 \f
-/* Functions. */
-
 struct ccase;
 void dump_split_vars (const struct ccase *);
-typedef int (* is_missing_func )(const union value *, const struct variable *);
-
-int is_num_user_missing (double, const struct variable *);
-int is_str_user_missing (const unsigned char[], const struct variable *);
-int is_missing (const union value *, const struct variable *);
-int is_system_missing (const union value *, const struct variable *);
-int is_user_missing (const union value *, const struct variable *);
-void copy_missing_values (struct variable *dest, const struct variable *src);
 \f
 /* Transformations. */
 
@@ -228,7 +195,8 @@ size_t var_set_get_cnt (const struct var_set *vs);
 struct variable *var_set_get_var (const struct var_set *vs, size_t idx);
 struct variable *var_set_lookup_var (const struct var_set *vs,
                                      const char *name);
-int var_set_lookup_var_idx (const struct var_set *vs, const char *name);
+bool var_set_lookup_var_idx (const struct var_set *vs, const char *name,
+                             size_t *idx);
 void var_set_destroy (struct var_set *vs);
 \f
 /* Variable parsers. */
@@ -248,12 +216,12 @@ enum
 
 struct variable *parse_variable (void);
 struct variable *parse_dict_variable (const struct dictionary *);
-int parse_variables (const struct dictionary *, struct variable ***, int *,
+int parse_variables (const struct dictionary *, struct variable ***, size_t *,
                      int opts);
-int parse_var_set_vars (const struct var_set *, struct variable ***, int *,
+int parse_var_set_vars (const struct var_set *, struct variable ***, size_t *,
                         int opts);
-int parse_DATA_LIST_vars (char ***names, int *cnt, int opts);
-int parse_mixed_vars (char ***names, int *cnt, int opts);
+int parse_DATA_LIST_vars (char ***names, size_t *cnt, int opts);
+int parse_mixed_vars (char ***names, size_t *cnt, int opts);