dictionary: Fix invariant that no split file vars means SPLIT_NONE.

[pspp] / src / data / subcase.h

diff --git a/src/data/subcase.h b/src/data/subcase.h
index 71bf6fd7cc33d4227a4e3c4380f6773a1bfc599a..027a6395420bf90e52999a496e0c0d4cb14f30f9 100644 (file)
--- a/src/data/subcase.h
+++ b/src/data/subcase.h
@@ -47,6 +47,7 @@ struct subcase
 
     struct caseproto *proto;    /* Created lazily. */
   };
+#define SUBCASE_EMPTY_INITIALIZER { .fields = NULL }
 
 void subcase_init_empty (struct subcase *);
 void subcase_init_vars (struct subcase *,
@@ -58,7 +59,7 @@ void subcase_init (struct subcase *, int index, int width,
 
 void subcase_clone (struct subcase *, const struct subcase *);
 void subcase_clear (struct subcase *);
-void subcase_destroy (struct subcase *);
+void subcase_uninit (struct subcase *);
 
 bool subcase_contains (const struct subcase *, int case_index);
 bool subcase_contains_var (const struct subcase *, const struct variable *);
@@ -72,6 +73,8 @@ void subcase_add_always (struct subcase *sc, int case_index, int width,
                          enum subcase_direction direction);
 void subcase_add_var_always (struct subcase *, const struct variable *,
                              enum subcase_direction);
+void subcase_add_vars_always (struct subcase *,
+                              const struct variable *const *, size_t n_vars);
 void subcase_add_proto_always (struct subcase *, const struct caseproto *);
 
 const struct caseproto *subcase_get_proto (const struct subcase *);