X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fdata%2Fvalue-labels.c;h=5a42ea3c9a8a99a3141cd0d1752f965a1a0c761d;hb=6999c6d125665923b52ae15cbad83d06c92a8875;hp=357ab4fcb2b5f7f06fc059e0748aeb00b275e374;hpb=6a856ba6fc06843fd02886087c769247de4d08f0;p=pspp-builds.git diff --git a/src/data/value-labels.c b/src/data/value-labels.c index 357ab4fc..5a42ea3c 100644 --- a/src/data/value-labels.c +++ b/src/data/value-labels.c @@ -1,21 +1,18 @@ -/* PSPP - computes sample statistics. +/* PSPP - a program for statistical analysis. Copyright (C) 1997-9, 2000 Free Software Foundation, Inc. - Written by Ben Pfaff . - 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 the Free Software Foundation; either version 2 of the - License, or (at your option) any later version. + 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 + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. - This program is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - 02110-1301, USA. */ + along with this program. If not, see . */ #include @@ -24,6 +21,8 @@ #include #include +#include +#include #include #include #include @@ -41,7 +40,7 @@ static void atom_destroy (struct atom *); static char *atom_to_string (const struct atom *); /* A set of value labels. */ -struct val_labs +struct val_labs { int width; /* 0=numeric, otherwise string width. */ struct hsh_table *labels; /* Hash table of `struct int_val_lab's. */ @@ -51,7 +50,7 @@ struct val_labs given WIDTH. To actually add any value labels, WIDTH must be a numeric or short string width. */ struct val_labs * -val_labs_create (int width) +val_labs_create (int width) { struct val_labs *vls; @@ -66,17 +65,18 @@ val_labs_create (int width) /* Creates and returns a new set of value labels identical to VLS. */ struct val_labs * -val_labs_copy (const struct val_labs *vls) +val_labs_copy (const struct val_labs *vls) { struct val_labs *copy; struct val_labs_iterator *i; struct val_lab *vl; - assert (vls != NULL); + if (vls == NULL) + return NULL; copy = val_labs_create (vls->width); for (vl = val_labs_first (vls, &i); vl != NULL; - vl = val_labs_next (vls, &i)) + vl = val_labs_next (vls, &i)) val_labs_add (copy, vl->value, vl->label); return copy; } @@ -86,9 +86,10 @@ val_labs_copy (const struct val_labs *vls) Strings can be widened. They can be shortened only if the characters that will be truncated are spaces. */ bool -val_labs_can_set_width (const struct val_labs *vls, int new_width) +val_labs_can_set_width (const struct val_labs *vls, int new_width) { - assert ((vls->width == 0) == (new_width == 0)); + if ( var_type_from_width (new_width) != var_type_from_width (vls->width )) + return false; if (vls->width == 0) return new_width == 0; @@ -105,7 +106,7 @@ val_labs_can_set_width (const struct val_labs *vls, int new_width) /* We can shorten the value labels only if all the truncated characters are blanks. */ for (j = vls->width; j < new_width; j++) - if (lab->value.s[j] != ' ') + if (lab->value.s[j] != ' ') { val_labs_done (&i); return false; @@ -121,7 +122,7 @@ val_labs_can_set_width (const struct val_labs *vls, int new_width) NEW_WIDTH must be 0, otherwise it must be within the range 1...MAX_SHORT_STRING inclusive. */ void -val_labs_set_width (struct val_labs *vls, int new_width) +val_labs_set_width (struct val_labs *vls, int new_width) { assert (val_labs_can_set_width (vls, new_width)); @@ -132,9 +133,9 @@ val_labs_set_width (struct val_labs *vls, int new_width) /* Destroys VLS. */ void -val_labs_destroy (struct val_labs *vls) +val_labs_destroy (struct val_labs *vls) { - if (vls != NULL) + if (vls != NULL) { hsh_destroy (vls->labels); free (vls); @@ -143,7 +144,7 @@ val_labs_destroy (struct val_labs *vls) /* Removes all the value labels from VLS. */ void -val_labs_clear (struct val_labs *vls) +val_labs_clear (struct val_labs *vls) { assert (vls != NULL); @@ -153,14 +154,9 @@ val_labs_clear (struct val_labs *vls) /* Returns the number of value labels in VLS. */ size_t -val_labs_count (const struct val_labs *vls) +val_labs_count (const struct val_labs *vls) { - assert (vls != NULL); - - if (vls->labels == NULL) - return 0; - else - return hsh_count (vls->labels); + return vls == NULL || vls->labels == NULL ? 0 : hsh_count (vls->labels); } /* One value label in internal format. */ @@ -173,13 +169,13 @@ struct int_val_lab /* Creates and returns an int_val_lab based on VALUE and LABEL. */ static struct int_val_lab * -create_int_val_lab (struct val_labs *vls, union value value, const char *label) +create_int_val_lab (struct val_labs *vls, union value value, const char *label) { struct int_val_lab *ivl; assert (label != NULL); assert (vls->width <= MAX_SHORT_STRING); - + ivl = xmalloc (sizeof *ivl); ivl->value = value; if (vls->width > 0) @@ -194,7 +190,7 @@ create_int_val_lab (struct val_labs *vls, union value value, const char *label) Behavior is undefined if VLS's width is greater than MAX_SHORT_STRING. */ bool -val_labs_add (struct val_labs *vls, union value value, const char *label) +val_labs_add (struct val_labs *vls, union value value, const char *label) { struct int_val_lab *ivl; void **vlpp; @@ -203,16 +199,16 @@ val_labs_add (struct val_labs *vls, union value value, const char *label) assert (vls->width <= MAX_SHORT_STRING); assert (label != NULL); - if (vls->labels == NULL) + if (vls->labels == NULL) vls->labels = hsh_create (8, compare_int_val_lab, hash_int_val_lab, free_int_val_lab, vls); ivl = create_int_val_lab (vls, value, label); vlpp = hsh_probe (vls->labels, ivl); - if (*vlpp == NULL) + if (*vlpp == NULL) { *vlpp = ivl; - return true; + return true; } free_int_val_lab (ivl, vls); return false; @@ -222,41 +218,31 @@ val_labs_add (struct val_labs *vls, union value value, const char *label) if there wasn't already a value label for VALUE, or true if there was. Behavior is undefined if VLS's width is greater than MAX_SHORT_STRING. */ -bool -val_labs_replace (struct val_labs *vls, union value value, const char *label) +void +val_labs_replace (struct val_labs *vls, union value value, const char *label) { - struct int_val_lab *ivl; - - assert (vls != NULL); assert (vls->width <= MAX_SHORT_STRING); - assert (label != NULL); - - if (vls->labels == NULL) - { - val_labs_add (vls, value, label); - return false; - } - - ivl = hsh_replace (vls->labels, create_int_val_lab (vls, value, label)); - if (ivl == NULL) - return false; - else + if (vls->labels != NULL) { - free_int_val_lab (ivl, vls); - return true; + struct int_val_lab *new = create_int_val_lab (vls, value, label); + struct int_val_lab *old = hsh_replace (vls->labels, new); + if (old != NULL) + free_int_val_lab (old, vls); } + else + val_labs_add (vls, value, label); } /* Removes any value label for VALUE within VLS. Returns true if a value label was removed. Behavior is undefined if VLS's width is greater than MAX_SHORT_STRING. */ bool -val_labs_remove (struct val_labs *vls, union value value) +val_labs_remove (struct val_labs *vls, union value value) { assert (vls != NULL); assert (vls->width <= MAX_SHORT_STRING); - if (vls->labels != NULL) + if (vls->labels != NULL) { struct int_val_lab *ivl = create_int_val_lab (vls, value, ""); int deleted = hsh_delete (vls->labels, ivl); @@ -272,14 +258,11 @@ val_labs_remove (struct val_labs *vls, union value value) VLS's width is greater than MAX_SHORT_STRING, always returns a null pointer. */ char * -val_labs_find (const struct val_labs *vls, union value value) +val_labs_find (const struct val_labs *vls, union value value) { - assert (vls != NULL); - - if (vls->width > MAX_SHORT_STRING) - return NULL; - - if (vls->labels != NULL) + if (vls != NULL + && vls->width <= MAX_SHORT_STRING + && vls->labels != NULL) { struct int_val_lab ivl, *vlp; @@ -292,7 +275,7 @@ val_labs_find (const struct val_labs *vls, union value value) } /* A value labels iterator. */ -struct val_labs_iterator +struct val_labs_iterator { void **labels; /* The labels, in order. */ void **lp; /* Current label. */ @@ -306,7 +289,7 @@ struct val_labs_iterator val_labs_done() to free up the iterator. Otherwise, neither function may be called for *IP. */ struct val_lab * -val_labs_first (const struct val_labs *vls, struct val_labs_iterator **ip) +val_labs_first (const struct val_labs *vls, struct val_labs_iterator **ip) { struct val_labs_iterator *i; @@ -355,7 +338,7 @@ val_labs_next (const struct val_labs *vls, struct val_labs_iterator **ip) { struct val_labs_iterator *i; struct int_val_lab *ivl; - + assert (vls != NULL); assert (vls->width <= MAX_SHORT_STRING); assert (ip != NULL); @@ -363,13 +346,13 @@ val_labs_next (const struct val_labs *vls, struct val_labs_iterator **ip) i = *ip; ivl = *i->lp++; - if (ivl != NULL) + if (ivl != NULL) { i->vl.value = ivl->value; i->vl.label = atom_to_string (ivl->label); return &i->vl; } - else + else { free (i->labels); free (i); @@ -380,14 +363,14 @@ val_labs_next (const struct val_labs *vls, struct val_labs_iterator **ip) /* Discards the state for an incomplete iteration begun by val_labs_first() or val_labs_first_sorted(). */ -void -val_labs_done (struct val_labs_iterator **ip) +void +val_labs_done (struct val_labs_iterator **ip) { struct val_labs_iterator *i; assert (ip != NULL); assert (*ip != NULL); - + i = *ip; free (i->labels); free (i); @@ -402,7 +385,7 @@ compare_int_val_lab (const void *a_, const void *b_, const void *vls_) const struct int_val_lab *b = b_; const struct val_labs *vls = vls_; - if (vls->width == 0) + if (vls->width == 0) return a->value.f < b->value.f ? -1 : a->value.f > b->value.f; else return memcmp (a->value.s, b->value.s, vls->width); @@ -418,12 +401,12 @@ hash_int_val_lab (const void *vl_, const void *vls_) if (vls->width == 0) return hsh_hash_double (vl->value.f); else - return hsh_hash_bytes (vl->value.s, sizeof vl->value.s); + return hsh_hash_bytes (vl->value.s, vls->width); } /* Free a value label. */ void -free_int_val_lab (void *vl_, const void *vls_ UNUSED) +free_int_val_lab (void *vl_, const void *vls_ UNUSED) { struct int_val_lab *vl = vl_; @@ -434,7 +417,7 @@ free_int_val_lab (void *vl_, const void *vls_ UNUSED) /* Atoms. */ /* An atom. */ -struct atom +struct atom { char *string; /* String value. */ unsigned ref_count; /* Number of references. */ @@ -455,14 +438,14 @@ destroy_atoms (void) /* Creates and returns an atom for STRING. */ static struct atom * -atom_create (const char *string) +atom_create (const char *string) { struct atom a; void **app; - + assert (string != NULL); - - if (atoms == NULL) + + if (atoms == NULL) { atoms = hsh_create (8, compare_atoms, hash_atom, free_atom, NULL); atexit (destroy_atoms); @@ -470,7 +453,7 @@ atom_create (const char *string) a.string = (char *) string; app = hsh_probe (atoms, &a); - if (*app != NULL) + if (*app != NULL) { struct atom *ap = *app; ap->ref_count++; @@ -487,30 +470,30 @@ atom_create (const char *string) } /* Destroys ATOM. */ -static void +static void atom_destroy (struct atom *atom) { - if (atom != NULL) + if (atom != NULL) { assert (atom->ref_count > 0); atom->ref_count--; - if (atom->ref_count == 0) + if (atom->ref_count == 0) hsh_force_delete (atoms, atom); } } /* Returns the string associated with ATOM. */ static char * -atom_to_string (const struct atom *atom) +atom_to_string (const struct atom *atom) { assert (atom != NULL); - + return atom->string; } /* A hsh_compare_func that compares A and B. */ static int -compare_atoms (const void *a_, const void *b_, const void *aux UNUSED) +compare_atoms (const void *a_, const void *b_, const void *aux UNUSED) { const struct atom *a = a_; const struct atom *b = b_; @@ -520,7 +503,7 @@ compare_atoms (const void *a_, const void *b_, const void *aux UNUSED) /* A hsh_hash_func that hashes ATOM. */ static unsigned -hash_atom (const void *atom_, const void *aux UNUSED) +hash_atom (const void *atom_, const void *aux UNUSED) { const struct atom *atom = atom_; @@ -529,37 +512,10 @@ hash_atom (const void *atom_, const void *aux UNUSED) /* A hsh_free_func that destroys ATOM. */ static void -free_atom (void *atom_, const void *aux UNUSED) +free_atom (void *atom_, const void *aux UNUSED) { struct atom *atom = atom_; free (atom->string); free (atom); } - - -/* Get a string representing the value. - That is, if it has a label, then return that label, - otherwise, if the value is alpha, then return the string for it, - else format it and return the formatted string -*/ -const char * -value_to_string (const union value *val, const struct variable *var) -{ - char *s; - - assert (val != NULL); - assert (var != NULL); - - s = val_labs_find (var->val_labs, *val); - if (s == NULL) - { - static char buf[MAX_STRING + 1]; - const struct fmt_spec *print = var_get_print_format (var); - data_out (val, print, buf); - buf[print->w] = '\0'; - s = buf; - } - - return s; -}