/* PSPP - a program for statistical analysis.
- Copyright (C) 1997-9, 2000 Free Software Foundation, Inc.
+ Copyright (C) 1997-9, 2000, 2009 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
struct dictionary ;
-/* Dictionary data stored in 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. */
-const struct vardict_info *var_get_vardict (const struct variable *);
-void var_set_vardict (struct variable *, const struct vardict_info *);
+struct vardict_info *var_get_vardict (const struct variable *);
+void var_set_vardict (struct variable *, struct vardict_info *);
bool var_has_vardict (const struct variable *);
void var_clear_vardict (struct variable *);
-
/* Called by variable.c, defined in dictionary.c. */
-void dict_var_changed (const struct variable *v);
-void dict_var_resized (const struct variable *v, int delta);
+void dict_var_changed (const struct variable *v, unsigned int what, struct variable *ov);
+
+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 */