DO REPEAT: Order PRINT output correctly.

[pspp] / src / data / dictionary.h

diff --git a/src/data/dictionary.h b/src/data/dictionary.h
index 3e874d87071349bad38e253aaeb65b9b7a81f966..9a4e8bf1c9c8f8f881dc1acf4864d328ee60a7c2 100644 (file)
--- a/src/data/dictionary.h
+++ b/src/data/dictionary.h
@@ -102,7 +102,7 @@ double dict_get_rounded_case_weight (const struct dictionary *,
                                      const struct ccase *, bool *);
 struct variable *dict_get_weight (const struct dictionary *);
 void dict_set_weight (struct dictionary *, struct variable *);
-const struct fmt_spec *dict_get_weight_format (const struct dictionary *);
+struct fmt_spec dict_get_weight_format (const struct dictionary *);
 
 /* Filter variable. */
 struct variable *dict_get_filter (const struct dictionary *);
@@ -181,6 +181,16 @@ bool dict_add_mrset (struct dictionary *, struct mrset *);
 bool dict_delete_mrset (struct dictionary *, const char *name);
 void dict_clear_mrsets (struct dictionary *);
 
+/* Variable sets. */
+const struct varset *dict_get_varset (const struct dictionary *, size_t idx);
+size_t dict_get_n_varsets (const struct dictionary *);
+const struct varset *dict_lookup_varset (const struct dictionary *,
+                                         const char *name);
+
+bool dict_add_varset (struct dictionary *, struct varset *);
+bool dict_delete_varset (struct dictionary *, const char *name);
+void dict_clear_varsets (struct dictionary *);
+
 /* Attributes. */
 struct attrset *dict_get_attributes (const struct dictionary *);
 void dict_set_attributes (struct dictionary *, const struct attrset *);
@@ -189,8 +199,9 @@ bool dict_has_attributes (const struct dictionary *);
 /* Data encoding. */
 const char *dict_get_encoding (const struct dictionary *d);
 
-bool dict_id_is_valid (const struct dictionary *, const char *id,
-                       bool issue_error);
+char *dict_id_is_valid__ (const struct dictionary *, const char *id)
+  WARN_UNUSED_RESULT;
+bool dict_id_is_valid (const struct dictionary *, const char *id);
 
 /* Internal variables. */
 struct variable *dict_create_internal_var (int case_idx, int width);