Change how checking for missing values works.

[pspp] / src / data / missing-values.h

diff --git a/src/data/missing-values.h b/src/data/missing-values.h
index 4d046faec3a1be411c4b5be5b2f0e93881b0e182..8123beeda158cb8a5ab0d0b6a009155843cdd5ca 100644 (file)
--- a/src/data/missing-values.h
+++ b/src/data/missing-values.h
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2005, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2009, 2013 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -51,21 +51,26 @@ struct missing_values
     union value values[3];      /* Missing values.  [1], [2] are the range. */
   };
 
-/* Classes of missing values. */
+/* Classes of missing values.
+
+   These are useful as individual values and as masks, and they are used both
+   ways. */
 enum mv_class
   {
-    MV_NEVER = 0,               /* Never considered missing. */
-    MV_USER = 1,                /* Missing if value is user-missing. */
-    MV_SYSTEM = 2,              /* Missing if value is system-missing. */
-    MV_ANY = MV_USER | MV_SYSTEM /* Missing if it is user or system-missing. */
+    MV_USER = 1,                /* User-missing. */
+    MV_SYSTEM = 2               /* System-missing. */
+#define MV_ANY (MV_USER | MV_SYSTEM)
   };
 
 /* Is a value missing? */
-bool mv_is_value_missing (const struct missing_values *, const union value *,
-                          enum mv_class);
-bool mv_is_num_missing (const struct missing_values *, double, enum mv_class);
-bool mv_is_str_missing (const struct missing_values *, const uint8_t[],
-                        enum mv_class);
+enum mv_class mv_is_value_missing (const struct missing_values *,
+                                   const union value *);
+enum mv_class mv_is_num_missing (const struct missing_values *, double);
+enum mv_class mv_is_str_missing (const struct missing_values *,
+                                 const uint8_t[]);
+enum mv_class mv_is_value_missing_varwidth (const struct missing_values *,
+                                            const union value *,
+                                            int value_width);
 
 /* Initializing missing value sets. */
 void mv_init (struct missing_values *, int width);
@@ -94,7 +99,7 @@ void mv_get_range (const struct missing_values *, double *low, double *high);
 
 /* Adding and modifying discrete values. */
 bool mv_add_value (struct missing_values *, const union value *);
-bool mv_add_str (struct missing_values *, const uint8_t[]);
+bool mv_add_str (struct missing_values *, const uint8_t[], size_t len);
 bool mv_add_num (struct missing_values *, double);
 void mv_pop_value (struct missing_values *, union value *);
 bool mv_replace_value (struct missing_values *, const union value *, int idx);
@@ -103,4 +108,7 @@ bool mv_replace_value (struct missing_values *, const union value *, int idx);
 bool mv_add_range (struct missing_values *, double low, double high);
 void mv_pop_range (struct missing_values *, double *low, double *high);
 
+/* Formatting. */
+char *mv_to_string (const struct missing_values *, const char *encoding);
+
 #endif /* data/missing-values.h */