(cmd_data_list): Don't allow END subcommand to be used with DATA LIST

[pspp-builds.git] / src / data / dictionary.h

diff --git a/src/data/dictionary.h b/src/data/dictionary.h
index 9dbd773370afaa2a60aa90f6ae63e778c44f7be7..581a49d827614a56277dd65cf7564addc9a0f49b 100644 (file)
--- a/src/data/dictionary.h
+++ b/src/data/dictionary.h
@@ -29,8 +29,9 @@ struct string;
 struct dict_callbacks
  {
   void (*var_added) (struct dictionary *, int, void *);
-  void (*var_deleted) (struct dictionary *, int, void *);
+  void (*var_deleted) (struct dictionary *, int, int, int, void *);
   void (*var_changed) (struct dictionary *, int, void *);
+  void (*var_resized) (struct dictionary *, int, int, void *);
   void (*weight_changed) (struct dictionary *, int, void *);
   void (*filter_changed) (struct dictionary *, int, void *);
   void (*split_changed) (struct dictionary *, void *);
@@ -101,16 +102,9 @@ void dict_set_case_limit (struct dictionary *, size_t);
 int dict_get_next_value_idx (const struct dictionary *);
 size_t dict_get_case_size (const struct dictionary *);
 
+size_t dict_count_values (const struct dictionary *,
+                          unsigned int exclude_classes);
 void dict_compact_values (struct dictionary *);
-size_t dict_get_compacted_value_cnt (const struct dictionary *);
-int *dict_get_compacted_dict_index_to_case_index (const struct dictionary *);
-bool dict_compacting_would_shrink (const struct dictionary *);
-bool dict_compacting_would_change (const struct dictionary *);
-
-struct dict_compactor *dict_make_compactor (const struct dictionary *);
-void dict_compactor_compact (const struct dict_compactor *,
-                             struct ccase *, const struct ccase *);
-void dict_compactor_destroy (struct dict_compactor *);
 
 const struct variable *const *dict_get_split_vars (const struct dictionary *);
 size_t dict_get_split_cnt (const struct dictionary *);
@@ -146,9 +140,6 @@ const struct vector *dict_lookup_vector (const struct dictionary *,
                                          const char *name);
 void dict_clear_vectors (struct dictionary *);
 
-void dict_assign_short_names (struct dictionary *);
-
-/* Called only from variable.c */
-void dict_var_changed (const struct variable *v);
+void dict_dump (const struct dictionary *);
 
 #endif /* dictionary.h */