X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fdata%2Fsubcase.h;h=ba4119b346bda76a5aa674ebdd2d35fccca9c595;hb=60482369abb7fa5b624e99bebf7d8a549b3a3718;hp=6e59da1d3679ac5b4c89f8a1b6a6ca6bc910627c;hpb=b40baf410822471fbdeeec553693619d60d7c7b6;p=pspp

diff --git a/src/data/subcase.h b/src/data/subcase.h
index 6e59da1d36..ba4119b346 100644
--- a/src/data/subcase.h
+++ b/src/data/subcase.h
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2008, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2008, 2009, 2010 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
@@ -60,17 +60,36 @@ void subcase_clone (struct subcase *, const struct subcase *);
 void subcase_clear (struct subcase *);
 void subcase_destroy (struct subcase *);
 
-bool subcase_add (struct subcase *sc, int index, int width,
-		  enum subcase_direction direction);
+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);
+bool subcase_add_vars (struct subcase *, const struct variable *const *,
+                       size_t n_vars, 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);
+bool subcase_add_vars_always (struct subcase *, const struct variable *const *,
+                              size_t n_vars, enum subcase_direction);
+void subcase_add_proto_always (struct subcase *, const struct caseproto *);
+
+void subcase_concat (struct subcase *, const struct subcase *);
+void subcase_concat_always (struct subcase *, const struct subcase *);
+
+void subcase_project (struct subcase *);
 
 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);
 
@@ -100,6 +119,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)
 {