X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fdata%2Fvariable.c;h=4859b1303faa3b31e737909c18003b59bbb81fd7;hb=ed109bf498216cef15a3cbf180827dc8b20eff0b;hp=42a07ee8bb5d3481bec1a4656f13bba1dd61a393;hpb=48b5d1d1f17f8059c7e91246b3d47ff3122a8f9f;p=pspp diff --git a/src/data/variable.c b/src/data/variable.c index 42a07ee8bb..4859b1303f 100644 --- a/src/data/variable.c +++ b/src/data/variable.c @@ -1,5 +1,6 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 1997-9, 2000, 2006, 2009, 2010, 2011, 2012, 2013, 2014, 2016 Free Software Foundation, Inc. + Copyright (C) 1997-9, 2000, 2006, 2009, 2010, 2011, 2012, 2013, + 2014, 2016, 2020 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 @@ -82,6 +83,7 @@ const GEnumValue role[] = /* A variable. */ struct variable { + int ref_cnt; /* Dictionary information. */ char *name; /* Variable name. Mixed case. */ int width; /* 0 for numeric, otherwise string width. */ @@ -145,28 +147,43 @@ var_create (const char *name, int width) attrset_init (&v->attributes); ds_init_empty (&v->name_and_label); + v->ref_cnt = 1; + return v; } /* Destroys variable V. V must not belong to a dictionary. If it does, use dict_delete_var instead. */ +static void +var_destroy__ (struct variable *v) +{ + assert (!var_has_vardict (v)); + mv_destroy (&v->miss); + var_clear_short_names (v); + val_labs_destroy (v->val_labs); + var_set_label_quiet (v, NULL); + attrset_destroy (var_get_attributes (v)); + free (v->name); + ds_destroy (&v->name_and_label); + free (v); +} + +struct variable * +var_ref (struct variable *v) +{ + v->ref_cnt++; + return v; +} + void -var_destroy (struct variable *v) +var_unref (struct variable *v) { - if (v != NULL) - { - assert (!var_has_vardict (v)); - mv_destroy (&v->miss); - var_clear_short_names (v); - val_labs_destroy (v->val_labs); - var_set_label_quiet (v, NULL); - attrset_destroy (var_get_attributes (v)); - free (v->name); - ds_destroy (&v->name_and_label); - free (v); - } + if (--v->ref_cnt == 0) + var_destroy__ (v); } + + /* Variable names. */ @@ -186,7 +203,6 @@ static void var_set_name_quiet (struct variable *v, const char *name) { assert (!var_has_vardict (v)); - assert (id_is_plausible (name, false)); free (v->name); v->name = xstrdup (name); @@ -291,17 +307,15 @@ var_set_width_and_formats (struct variable *v, int new_width, ov = var_clone (v); - if (var_has_missing_values (v)) + if (mv_is_resizable (&v->miss, new_width)) + mv_resize (&v->miss, new_width); + else { - if (mv_is_resizable (&v->miss, new_width)) - mv_resize (&v->miss, new_width); - else - { - mv_destroy (&v->miss); - mv_init (&v->miss, new_width); - } - traits |= VAR_TRAIT_MISSING_VALUES; + mv_destroy (&v->miss); + mv_init (&v->miss, new_width); } + if (new_width != var_get_width (v)) + traits |= VAR_TRAIT_MISSING_VALUES; if (v->val_labs != NULL) { @@ -497,7 +511,7 @@ var_set_value_labels (struct variable *v, const struct val_labs *vls) { struct variable *ov = var_clone (v); var_set_value_labels_quiet (v, vls); - dict_var_changed (v, VAR_TRAIT_LABEL, ov); + dict_var_changed (v, VAR_TRAIT_LABEL, ov); } @@ -558,47 +572,52 @@ static void append_value (const struct variable *v, const union value *value, struct string *str) { - char *s = data_out (value, var_get_encoding (v), &v->print); - ds_put_cstr (str, s); + char *s = data_out (value, var_get_encoding (v), &v->print, + settings_get_fmt_settings ()); + struct substring ss = ss_cstr (s); + ss_rtrim (&ss, ss_cstr (" ")); + ds_put_substring (str, ss); free (s); } -/* Append STR with a string representing VALUE for variable V. - That is, if VALUE has a label, append that label, - otherwise format VALUE and append the formatted string. - STR must be a pointer to an initialised struct string. -*/ void -var_append_value_name (const struct variable *v, const union value *value, - struct string *str) +var_append_value_name__ (const struct variable *v, const union value *value, + enum settings_value_show show, struct string *str) { - enum settings_value_style style = settings_get_value_style (); - const char *name = var_lookup_value_label (v, value); + const char *label = var_lookup_value_label (v, value); - switch (style) + switch (show) { - case SETTINGS_VAL_STYLE_VALUES: + case SETTINGS_VALUE_SHOW_VALUE: append_value (v, value, str); break; - - case SETTINGS_VAL_STYLE_LABELS: - if (name == NULL) - append_value (v, value, str); + + default: + case SETTINGS_VALUE_SHOW_LABEL: + if (label) + ds_put_cstr (str, label); else - ds_put_cstr (str, name); + append_value (v, value, str); break; - case SETTINGS_VAL_STYLE_BOTH: - default: + case SETTINGS_VALUE_SHOW_BOTH: append_value (v, value, str); - if (name != NULL) - { - ds_put_cstr (str, " ("); - ds_put_cstr (str, name); - ds_put_cstr (str, ")"); - } + if (label != NULL) + ds_put_format (str, " %s", label); break; - }; + } +} + +/* Append STR with a string representing VALUE for variable V. + That is, if VALUE has a label, append that label, + otherwise format VALUE and append the formatted string. + STR must be a pointer to an initialised struct string. +*/ +void +var_append_value_name (const struct variable *v, const union value *value, + struct string *str) +{ + var_append_value_name__ (v, value, settings_get_show_values (), str); } /* Print and write formats. */ @@ -721,24 +740,19 @@ update_vl_string (const struct variable *v) const char * var_to_string (const struct variable *v) { - enum settings_var_style style = settings_get_var_style (); - - switch (style) - { - case SETTINGS_VAR_STYLE_NAMES: + switch (settings_get_show_variables ()) + { + case SETTINGS_VALUE_SHOW_VALUE: return v->name; - break; - case SETTINGS_VAR_STYLE_LABELS: + + case SETTINGS_VALUE_SHOW_LABEL: + default: return v->label != NULL ? v->label : v->name; - break; - case SETTINGS_VAR_STYLE_BOTH: + + case SETTINGS_VALUE_SHOW_BOTH: update_vl_string (v); return ds_cstr (&v->name_and_label); - break; - default: - NOT_REACHED (); - break; - }; + } } /* Returns V's variable label, or a null pointer if it has none. */ @@ -803,12 +817,13 @@ measure_is_valid (enum measure m) return m == MEASURE_NOMINAL || m == MEASURE_ORDINAL || m == MEASURE_SCALE; } -/* Returns a string version of measurement level M, for display to a user. */ +/* Returns a string version of measurement level M, for display to a user. + The caller may translate the string by passing it to gettext(). */ const char * measure_to_string (enum measure m) { assert (m == measure[m].value); - return gettext (measure[m].label); + return measure[m].label; } /* Returns a string version of measurement level M, for use in PSPP command @@ -888,12 +903,13 @@ var_role_is_valid (enum var_role role) } } -/* Returns a string version of ROLE, for display to a user. */ +/* Returns a string version of ROLE, for display to a user. + The caller may translate the string by passing it to gettext(). */ const char * var_role_to_string (enum var_role r) { assert (r == role[r].value); - return gettext (role[r].label); + return role[r].label; } /* Returns a string version of ROLE, for use in PSPP comamnd syntax. */ @@ -995,12 +1011,13 @@ alignment_is_valid (enum alignment a) return a == ALIGN_LEFT || a == ALIGN_RIGHT || a == ALIGN_CENTRE; } -/* Returns a string version of alignment A, for display to a user. */ +/* Returns a string version of alignment A, for display to a user. + The caller may translate the string by passing it to gettext(). */ const char * alignment_to_string (enum alignment a) { assert (a == align[a].value); - return gettext (align[a].label); + return align[a].label; } /* Returns a string version of alignment A, for use in PSPP command syntax. */ @@ -1106,7 +1123,7 @@ var_must_leave (const struct variable *v) all if it hasn't been saved to or read from a system or portable file. */ size_t -var_get_short_name_cnt (const struct variable *var) +var_get_short_name_cnt (const struct variable *var) { return var->short_name_cnt; } @@ -1132,17 +1149,15 @@ var_set_short_name (struct variable *var, size_t idx, const char *short_name) { struct variable *ov = var_clone (var); - assert (short_name == NULL || id_is_plausible (short_name, false)); - /* Clear old short name numbered IDX, if any. */ - if (idx < var->short_name_cnt) + if (idx < var->short_name_cnt) { free (var->short_names[idx]); - var->short_names[idx] = NULL; + var->short_names[idx] = NULL; } /* Install new short name for IDX. */ - if (short_name != NULL) + if (short_name != NULL) { if (idx >= var->short_name_cnt) { @@ -1201,14 +1216,14 @@ var_get_case_index (const struct variable *v) V, or calling var_set_attributes() on V, will also destroy its attribute set. */ struct attrset * -var_get_attributes (const struct variable *v) +var_get_attributes (const struct variable *v) { return CONST_CAST (struct attrset *, &v->attributes); } /* Replaces variable V's attributes set by a copy of ATTRS. */ static void -var_set_attributes_quiet (struct variable *v, const struct attrset *attrs) +var_set_attributes_quiet (struct variable *v, const struct attrset *attrs) { attrset_destroy (&v->attributes); attrset_clone (&v->attributes, attrs); @@ -1216,7 +1231,7 @@ var_set_attributes_quiet (struct variable *v, const struct attrset *attrs) /* Replaces variable V's attributes set by a copy of ATTRS. */ void -var_set_attributes (struct variable *v, const struct attrset *attrs) +var_set_attributes (struct variable *v, const struct attrset *attrs) { struct variable *ov = var_clone (v); var_set_attributes_quiet (v, attrs); @@ -1308,8 +1323,8 @@ var_clear_vardict (struct variable *v) /* Returns zero, if W is a missing value for WV or if it is less than zero. Typically used to force a numerical value into a valid weight. - - As a side effect, this function will emit a warning if the value + + As a side effect, this function will emit a warning if the value WARN_ON_INVALID points to a bool which is TRUE. That bool will be then set to FALSE. */ @@ -1318,7 +1333,7 @@ var_force_valid_weight (const struct variable *wv, double w, bool *warn_on_inval { if (w < 0.0 || (wv && var_is_num_missing (wv, w, MV_ANY))) w = 0.0; - + if (w == 0.0 && warn_on_invalid != NULL && *warn_on_invalid) { *warn_on_invalid = false;