X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=src%2Fdata%2Fvariable.c;h=ba216f4826eedb93b630375ff62cf7447033ab25;hb=19a9c720bb5cae2826e6983bdab72a9c4b74492d;hp=05edc57e2db85a3c02df4fbe3a16a6747d92c4bc;hpb=cb72db62c20ecab427229110820c5b053d0663c4;p=pspp diff --git a/src/data/variable.c b/src/data/variable.c index 05edc57e2d..ba216f4826 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, 2009 Free Software Foundation, Inc. + Copyright (C) 1997-9, 2000, 2006, 2009, 2010 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 @@ -63,7 +63,7 @@ struct variable bool leave; /* Leave value from case to case? */ /* Data for use by containing dictionary. */ - struct vardict_info vardict; + struct vardict_info *vardict; /* Used only for system and portable file input and output. See short-names.h. */ @@ -96,7 +96,7 @@ var_create (const char *name, int width) assert (width >= 0 && width <= MAX_STRING); v = xmalloc (sizeof *v); - v->vardict.dict_index = v->vardict.case_index = -1; + v->vardict = NULL; var_set_name (v, name); v->width = width; mv_init (&v->miss, width); @@ -149,27 +149,6 @@ var_clone (const struct variable *old_var) return new_var; } -/* Create a variable of the specified WIDTH 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, int width) -{ - struct variable *v = var_create ("$internal", width); - struct vardict_info vdi; - static int counter = INT_MAX / 2; - - vdi.dict = NULL; - vdi.case_index = case_idx; - vdi.dict_index = counter++; - if (counter == INT_MAX) - counter = INT_MAX / 2; - - var_set_vardict (v, &vdi); - - return v; -} - /* Destroys variable V. V must not belong to a dictionary. If it does, use dict_delete_var instead. */ @@ -178,11 +157,7 @@ var_destroy (struct variable *v) { if (v != NULL) { - if (var_has_vardict (v)) - { - const struct vardict_info *vdi = var_get_vardict (v); - assert (vdi->dict == NULL); - } + assert (!var_has_vardict (v)); mv_destroy (&v->miss); cat_stored_values_destroy (v->obs_vals); var_clear_short_names (v); @@ -208,7 +183,7 @@ var_get_name (const struct variable *v) void var_set_name (struct variable *v, const char *name) { - assert (v->vardict.dict_index == -1); + assert (!var_has_vardict (v)); assert (var_is_plausible_name (name, false)); str_copy_trunc (v->name, sizeof v->name, name); @@ -224,8 +199,6 @@ var_is_valid_name (const char *name, bool issue_error) bool plausible; size_t length, i; - assert (name != NULL); - /* Note that strlen returns number of BYTES, not the number of CHARACTERS */ length = strlen (name); @@ -271,8 +244,6 @@ var_is_plausible_name (const char *name, bool issue_error) { size_t length; - assert (name != NULL); - /* Note that strlen returns number of BYTES, not the number of CHARACTERS */ length = strlen (name); @@ -590,10 +561,9 @@ var_append_value_name (const struct variable *v, const union value *value, struct string *str) { const char *name = var_lookup_value_label (v, value); - const struct dictionary *dict = var_get_vardict (v)->dict; if (name == NULL) { - char *s = data_out (value, dict_get_encoding (dict), &v->print); + char *s = data_out (value, var_get_encoding (v), &v->print); ds_put_cstr (str, s); free (s); } @@ -875,7 +845,6 @@ var_get_short_name (const struct variable *var, size_t idx) void var_set_short_name (struct variable *var, size_t idx, const char *short_name) { - assert (var != NULL); assert (short_name == NULL || var_is_plausible_name (short_name, false)); /* Clear old short name numbered IDX, if any. */ @@ -926,8 +895,8 @@ var_clear_short_names (struct variable *v) size_t var_get_dict_index (const struct variable *v) { - assert (v->vardict.dict_index != -1); - return v->vardict.dict_index; + assert (var_has_vardict (v)); + return vardict_get_dict_index (v->vardict); } /* Returns V's index within the case represented by its @@ -937,8 +906,8 @@ var_get_dict_index (const struct variable *v) size_t var_get_case_index (const struct variable *v) { - assert (v->vardict.case_index != -1); - return v->vardict.case_index; + assert (var_has_vardict (v)); + return vardict_get_case_index (v->vardict); } /* Returns V's auxiliary data, or a null pointer if none has been @@ -981,7 +950,6 @@ var_detach_aux (struct variable *v) void var_clear_aux (struct variable *v) { - assert (v != NULL); if (v->aux != NULL) { if (v->aux_dtor != NULL) @@ -1053,33 +1021,41 @@ var_has_attributes (const struct variable *v) return attrset_count (&v->attributes) > 0; } +/* Returns the encoding of values of variable VAR. (This is actually a + property of the dictionary.) Returns null if no specific encoding has been + set. */ +const char * +var_get_encoding (const struct variable *var) +{ + return (var_has_vardict (var) + ? dict_get_encoding (vardict_get_dictionary (var->vardict)) + : NULL); +} + /* Returns V's vardict structure. */ -const struct vardict_info * +struct vardict_info * var_get_vardict (const struct variable *v) { - assert (var_has_vardict (v)); - return &v->vardict; + return CONST_CAST (struct vardict_info *, v->vardict); } /* Sets V's vardict data to VARDICT. */ void -var_set_vardict (struct variable *v, const struct vardict_info *vardict) +var_set_vardict (struct variable *v, struct vardict_info *vardict) { - assert (vardict->dict_index >= 0); - assert (vardict->case_index >= 0); - v->vardict = *vardict; + v->vardict = vardict; } /* Returns true if V has vardict data. */ bool var_has_vardict (const struct variable *v) { - return v->vardict.dict_index != -1; + return v->vardict != NULL; } /* Clears V's vardict data. */ void var_clear_vardict (struct variable *v) { - v->vardict.dict_index = v->vardict.case_index = -1; + v->vardict = NULL; }