projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cleanup
[pspp]
/
src
/
data
/
vardict.h
diff --git
a/src/data/vardict.h
b/src/data/vardict.h
index 63ec88cb8e24e687a1cb55aa2af263797f78047e..ae74b1cf5c755a190d2ffd6d931e26b1022d485b 100644
(file)
--- a/
src/data/vardict.h
+++ b/
src/data/vardict.h
@@
-23,12
+23,12
@@
struct dictionary ;
struct dictionary ;
-/*
Dictionary data associated with variable
. */
+/*
Binds a variable to a dictionary
. */
struct vardict_info
{
struct vardict_info
{
- int dict_index; /* Dictionary index containing the variable. */
- int case_index; /* Index into case of variable data. */
- struct
dictionary *dict; /* The dictionary containing the variable
*/
+ struct dictionary *dict;
+ struct variable *var;
+ struct
hmap_node name_node; /* In struct dictionary's name_map.
*/
};
/* Called by dictionary code, defined in variable.c. */
};
/* Called by dictionary code, defined in variable.c. */
@@
-38,21
+38,9
@@
bool var_has_vardict (const struct variable *);
void var_clear_vardict (struct variable *);
/* Called by variable.c, defined in dictionary.c. */
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 old_width);
-void dict_var_display_width_changed (const struct variable *v);
+void dict_var_changed (const struct variable *v, unsigned int what, struct variable *ov);
-static inline int
-vardict_get_dict_index (const struct vardict_info *vardict)
-{
- return vardict->dict_index;
-}
-
-static inline int
-vardict_get_case_index (const struct vardict_info *vardict)
-{
- return vardict->case_index;
-}
+int vardict_get_dict_index (const struct vardict_info *);
static inline struct dictionary *
vardict_get_dictionary (const struct vardict_info *vardict)
static inline struct dictionary *
vardict_get_dictionary (const struct vardict_info *vardict)