X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fdata%2Fvariable.c;h=505ae79da395cac5f00de6e57bbcfa91b8fec80e;hb=2c411d651e22704f60f117d944b9380a07d247fe;hp=e39692a062bfe4952ef13f1cf9cbadfba5305c2b;hpb=5f8dc7ca9962b212d623566e287b0f1d365f6398;p=pspp diff --git a/src/data/variable.c b/src/data/variable.c index e39692a062..505ae79da3 100644 --- a/src/data/variable.c +++ b/src/data/variable.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 1997-9, 2000, 2006 Free Software Foundation, Inc. + Copyright (C) 1997-9, 2000, 2006, 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 @@ -19,14 +19,15 @@ #include -#include "category.h" -#include "data-out.h" -#include "format.h" -#include "dictionary.h" -#include "identifier.h" -#include "missing-values.h" -#include "value-labels.h" -#include "vardict.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include @@ -76,6 +77,9 @@ struct variable vectors with binary entries, so any variable of type ALPHA will have its values stored here. */ struct cat_vals *obs_vals; + + /* Custom attributes. */ + struct attrset attributes; }; /* Creates and returns a new variable with the given NAME and @@ -108,6 +112,7 @@ var_create (const char *name, int width) v->aux = NULL; v->aux_dtor = NULL; v->obs_vals = NULL; + attrset_init (&v->attributes); return v; } @@ -138,21 +143,26 @@ var_clone (const struct variable *old_var) var_set_display_width (new_var, var_get_display_width (old_var)); var_set_alignment (new_var, var_get_alignment (old_var)); var_set_leave (new_var, var_get_leave (old_var)); + var_set_attributes (new_var, var_get_attributes (old_var)); return new_var; } -/* Create a variable to be used for internal calculations only */ +/* Create a variable to be used for internal calculations only. + The variable is assigned a unique dictionary index and a case + index of CASE_IDX. */ struct variable * var_create_internal (int case_idx) { struct variable *v = var_create ("$internal", 0); - struct vardict_info vdi; + static int counter = INT_MAX / 2; vdi.dict = NULL; - vdi.dict_index = 0; vdi.case_index = case_idx; + vdi.dict_index = counter++; + if (counter == INT_MAX) + counter = INT_MAX / 2; var_set_vardict (v, &vdi); @@ -313,7 +323,7 @@ hash_var_by_name (const void *v_, const void *aux UNUSED) { const struct variable *v = v_; - return hsh_hash_case_string (v->name); + return hash_case_string (v->name, 0); } /* A hsh_compare_func that orders pointers to variables A and B @@ -328,6 +338,20 @@ compare_var_ptrs_by_name (const void *a_, const void *b_, return strcasecmp (var_get_name (*a), var_get_name (*b)); } +/* A hsh_compare_func that orders pointers to variables A and B + by their dictionary indexes. */ +int +compare_var_ptrs_by_dict_index (const void *a_, const void *b_, + const void *aux UNUSED) +{ + struct variable *const *a = a_; + struct variable *const *b = b_; + size_t a_index = var_get_dict_index (*a); + size_t b_index = var_get_dict_index (*b); + + return a_index < b_index ? -1 : a_index > b_index; +} + /* A hsh_hash_func that hashes pointer to variable V based on its name. */ unsigned @@ -335,7 +359,7 @@ hash_var_ptr_by_name (const void *v_, const void *aux UNUSED) { struct variable *const *v = v_; - return hsh_hash_case_string (var_get_name (*v)); + return hash_case_string (var_get_name (*v), 0); } /* Returns the type of variable V. */ @@ -599,7 +623,6 @@ var_append_value_name (const struct variable *v, const union value *value, ds_put_cstr (str, name); } - /* Print and write formats. */ /* Returns V's print format specification. */ @@ -697,8 +720,8 @@ var_set_label (struct variable *v, const char *label) ss_truncate (&s, 255); if (!ss_is_empty (s)) v->label = ss_xstrdup (s); - dict_var_changed (v); } + dict_var_changed (v); } /* Removes any variable label from V. */ @@ -759,9 +782,15 @@ var_get_display_width (const struct variable *v) /* Sets V's display width to DISPLAY_WIDTH. */ void -var_set_display_width (struct variable *v, int display_width) +var_set_display_width (struct variable *v, int new_width) { - v->display_width = display_width; + int old_width = v->display_width; + + v->display_width = new_width; + + if ( old_width != new_width) + dict_var_display_width_changed (v); + dict_var_changed (v); } @@ -1021,6 +1050,31 @@ var_has_obs_vals (const struct variable *v) return v->obs_vals != NULL; } +/* Returns variable V's attribute set. The caller may examine or + modify the attribute set, but must not destroy it. Destroying + V, or calling var_set_attributes() on V, will also destroy its + attribute set. */ +struct attrset * +var_get_attributes (const struct variable *v) +{ + return (struct attrset *) &v->attributes; +} + +/* Replaces variable V's attributes set by a copy of ATTRS. */ +void +var_set_attributes (struct variable *v, const struct attrset *attrs) +{ + attrset_destroy (&v->attributes); + attrset_clone (&v->attributes, attrs); +} + +/* Returns true if V has any custom attributes, false if it has none. */ +bool +var_has_attributes (const struct variable *v) +{ + return attrset_count (&v->attributes) > 0; +} + /* Returns V's vardict structure. */ const struct vardict_info * var_get_vardict (const struct variable *v)