X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=src%2Fdata%2Fsubcase.h;h=027a6395420bf90e52999a496e0c0d4cb14f30f9;hb=baf2ebf28012684c83613a97b3ba3bf9392490b8;hp=050cf17dcd3477f4b236e7af58c1a1ca1595c036;hpb=5c3291dc396b795696e94f47780308fd7ace6fc4;p=pspp

diff --git a/src/data/subcase.h b/src/data/subcase.h
index 050cf17dcd..027a639542 100644
--- a/src/data/subcase.h
+++ b/src/data/subcase.h
@@ -47,24 +47,43 @@ 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 *,
                         const struct variable *const *, size_t n_vars);
 void subcase_init_var (struct subcase *,
                        const struct variable *, enum subcase_direction);
+void subcase_init (struct subcase *, int index, int width,
+		   enum subcase_direction);
+
 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 *);
 
+bool subcase_add (struct subcase *, int case_index, int width,
+		  enum subcase_direction direction);
 bool subcase_add_var (struct subcase *, const struct variable *,
                       enum subcase_direction);
 
+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 *);
 
 static inline bool subcase_is_empty (const struct subcase *);
 static inline size_t subcase_get_n_fields (const struct subcase *);
 
+static inline size_t subcase_get_case_index (const struct subcase *,
+                                             size_t idx);
 static inline enum subcase_direction subcase_get_direction (
   const struct subcase *, size_t idx);
 
@@ -94,6 +113,12 @@ bool subcase_equal_cx (const struct subcase *,
 bool subcase_equal_xx (const struct subcase *,
                        const union value *a, const union value *b);
 
+static inline size_t
+subcase_get_case_index (const struct subcase *sc, size_t idx)
+{
+  return sc->fields[idx].case_index;
+}
+
 static inline enum subcase_direction
 subcase_get_direction (const struct subcase *sc, size_t idx)
 {