dictionary: Use hmap instead of older hsh_table.

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

diff --git a/src/data/vardict.h b/src/data/vardict.h
index 8bb8b825297b920a6d66dbf09db738df851ca1ae..809c564c86bbdf5e5c9375215a22a19a19feb636 100644 (file)
--- a/src/data/vardict.h
+++ b/src/data/vardict.h
@@ -23,12 +23,13 @@
 
 struct dictionary ;
 
-/* Dictionary data associated with variable. */
+/* Binds a variable to a dictionary. */
 struct vardict_info
   {
-    int dict_index;     /* Dictionary index containing the variable. */
+    struct dictionary *dict;
+    struct variable *var;
+    struct hmap_node name_node; /* In struct dictionary's name_map. */
     int case_index;     /* Index into case of variable data. */
-    struct dictionary *dict;  /* The dictionary containing the variable */
   };
 
 /* Called by dictionary code, defined in variable.c. */
@@ -42,4 +43,18 @@ void dict_var_changed (const struct variable *v);
 void dict_var_resized (const struct variable *v, int old_width);
 void dict_var_display_width_changed (const struct variable *v);
 
+int vardict_get_dict_index (const struct vardict_info *);
+
+static inline int
+vardict_get_case_index (const struct vardict_info *vardict)
+{
+  return vardict->case_index;
+}
+
+static inline struct dictionary *
+vardict_get_dictionary (const struct vardict_info *vardict)
+{
+  return vardict->dict;
+}
+
 #endif /* data/vardict.h */