X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fdata%2Fdictionary.c;h=413c974fb415223024a27a91347c94969433ca7e;hb=f790dbda9d498eef9c9c0a49078adbeecf768d56;hp=04c082fca7854a3513baa4553a43fbf788b4a75e;hpb=ff5e81803b409939e921211f1ffd46cb24df33e9;p=pspp diff --git a/src/data/dictionary.c b/src/data/dictionary.c index 04c082fca7..413c974fb4 100644 --- a/src/data/dictionary.c +++ b/src/data/dictionary.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 1997-9, 2000, 2006, 2007, 2009, 2010, 2011, 2012, 2013 Free Software Foundation, Inc. + Copyright (C) 1997-9, 2000, 2006, 2007, 2009, 2010, 2011, 2012, 2013, 2014, 2015 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 @@ -285,7 +285,7 @@ dict_destroy (struct dictionary *d) { if (d != NULL) { - /* In general, we don't want callbacks occuring, if the dictionary + /* In general, we don't want callbacks occurring, if the dictionary is being destroyed */ d->callbacks = NULL ; @@ -546,15 +546,21 @@ unindex_var (struct dictionary *d, struct vardict_info *vardict) static void reindex_var (struct dictionary *d, struct vardict_info *vardict) { - struct variable *var = vardict->var; + struct variable *old = (d->callbacks && d->callbacks->var_changed + ? var_clone (vardict->var) + : NULL); + struct variable *var = vardict->var; var_set_vardict (var, vardict); hmap_insert_fast (&d->name_map, &vardict->name_node, vardict->name_node.hash); if ( d->changed ) d->changed (d, d->changed_data); - if ( d->callbacks && d->callbacks->var_changed ) - d->callbacks->var_changed (d, var_get_dict_index (var), d->cb_data); + if (old) + { + d->callbacks->var_changed (d, var_get_dict_index (var), VAR_TRAIT_POSITION, old, d->cb_data); + var_destroy (old); + } } /* Sets the case_index in V's vardict to CASE_INDEX. */ @@ -757,6 +763,7 @@ void dict_rename_var (struct dictionary *d, struct variable *v, const char *new_name) { + struct variable *old = var_clone (v); assert (!utf8_strcasecmp (var_get_name (v), new_name) || dict_lookup_var (d, new_name) == NULL); @@ -769,7 +776,9 @@ dict_rename_var (struct dictionary *d, struct variable *v, if ( d->changed ) d->changed (d, d->changed_data); if ( d->callbacks && d->callbacks->var_changed ) - d->callbacks->var_changed (d, var_get_dict_index (v), d->cb_data); + d->callbacks->var_changed (d, var_get_dict_index (v), VAR_TRAIT_NAME, old, d->cb_data); + + var_destroy (old); } /* Renames COUNT variables specified in VARS to the names given @@ -902,7 +911,7 @@ make_hinted_name (const struct dictionary *dict, const char *hint) char *name; suffix[0] = '_'; - if (!str_format_26adic (i + 1, &suffix[1], sizeof suffix - 1)) + if (!str_format_26adic (i + 1, true, &suffix[1], sizeof suffix - 1)) NOT_REACHED (); name = utf8_encoding_concat (root, suffix, dict->encoding, 64); @@ -998,15 +1007,8 @@ dict_get_case_weight (const struct dictionary *d, const struct ccase *c, else { double w = case_num (c, d->weight); - if (w < 0.0 || var_is_num_missing (d->weight, w, MV_ANY)) - w = 0.0; - if ( w == 0.0 && warn_on_invalid != NULL && *warn_on_invalid ) { - *warn_on_invalid = false; - msg (SW, _("At least one case in the data file had a weight value " - "that was user-missing, system-missing, zero, or " - "negative. These case(s) were ignored.")); - } - return w; + + return var_force_valid_weight (d->weight, w, warn_on_invalid); } } @@ -1570,7 +1572,7 @@ dict_unset_mrset_var (struct dictionary *dict, struct variable *var) calling dict_set_attributes for D will also destroy D's attribute set. */ struct attrset * -dict_get_attributes (const struct dictionary *d) +dict_get_attributes (const struct dictionary *d) { return CONST_CAST (struct attrset *, &d->attributes); } @@ -1586,15 +1588,17 @@ dict_set_attributes (struct dictionary *d, const struct attrset *attrs) /* Returns true if D has at least one attribute in its attribute set, false if D's attribute set is empty. */ bool -dict_has_attributes (const struct dictionary *d) +dict_has_attributes (const struct dictionary *d) { return attrset_count (&d->attributes) > 0; } -/* Called from variable.c to notify the dictionary that some property of - the variable has changed */ +/* Called from variable.c to notify the dictionary that some property (indicated + by WHAT) of the variable has changed. OLDVAR is a copy of V as it existed + prior to the change. OLDVAR is destroyed by this function. +*/ void -dict_var_changed (const struct variable *v) +dict_var_changed (const struct variable *v, unsigned int what, struct variable *oldvar) { if ( var_has_vardict (v)) { @@ -1606,49 +1610,12 @@ dict_var_changed (const struct variable *v) if (d->changed ) d->changed (d, d->changed_data); if ( d->callbacks && d->callbacks->var_changed ) - d->callbacks->var_changed (d, var_get_dict_index (v), d->cb_data); - } -} - - -/* Called from variable.c to notify the dictionary that the variable's width - has changed */ -void -dict_var_resized (const struct variable *v, int old_width) -{ - if ( var_has_vardict (v)) - { - const struct vardict_info *vardict = var_get_vardict (v); - struct dictionary *d; - - d = vardict->dict; - - if (d->changed) d->changed (d, d->changed_data); - - invalidate_proto (d); - if ( d->callbacks && d->callbacks->var_resized ) - d->callbacks->var_resized (d, var_get_dict_index (v), old_width, - d->cb_data); + d->callbacks->var_changed (d, var_get_dict_index (v), what, oldvar, d->cb_data); } + var_destroy (oldvar); } -/* Called from variable.c to notify the dictionary that the variable's display width - has changed */ -void -dict_var_display_width_changed (const struct variable *v) -{ - if ( var_has_vardict (v)) - { - const struct vardict_info *vardict = var_get_vardict (v); - struct dictionary *d; - - d = vardict->dict; - if (d->changed) d->changed (d, d->changed_data); - if ( d->callbacks && d->callbacks->var_display_width_changed ) - d->callbacks->var_display_width_changed (d, var_get_dict_index (v), d->cb_data); - } -} /* Dictionary used to contain "internal variables". */ static struct dictionary *internal_dict;