02111-1307, USA. */
#include <config.h>
+#include "var.h"
#include <assert.h>
#include <stdlib.h>
#include "alloc.h"
-#include "approx.h"
-#include "avl.h"
#include "command.h"
#include "do-ifP.h"
#include "expr.h"
#include "file-handle.h"
-#include "inpt-pgm.h"
+#include "hash.h"
#include "misc.h"
#include "str.h"
-#include "var.h"
-#include "vector.h"
+#include "value-labels.h"
#include "vfm.h"
#include "debug-print.h"
-#if DEBUGGING
-/* Dumps one variable to standard output. */
-void
-dump_one_var_node (void * pnode, void *param, int level)
+/* Compares A and B, which both have the given WIDTH, and returns
+ a strcmp()-type result. */
+int
+compare_values (const union value *a, const union value *b, int width)
{
- struct variable *node = pnode;
- int i;
-
- for (i = 0; i < level - 1; i++)
- printf (" ");
- if (node == NULL)
- printf ("NULL_TREE\n");
+ if (width == 0)
+ return a->f < b->f ? -1 : a->f > b->f;
else
- printf ("%p=>%s\n", node, node->name ? node->name : "<null>");
-}
-
-/* Dumps a tree of the variables to standard output. */
-void
-dump_var_tree (void)
-{
- printf (_("Vartree:\n"));
-/*
- avl_walk_inorder (default_dict.var_by_name, dump_one_var_node, NULL);
-*/
-}
-#endif
-
-/* Clear the default dictionary. Note: This is probably not what you
- want to do. Use discard_variables() instead. */
-void
-clear_default_dict (void)
-{
- int i;
-
- for (i = 0; i < default_dict.nvar; i++)
- {
- clear_variable (&default_dict, default_dict.var[i]);
- free (default_dict.var[i]);
- }
-
- assert (default_dict.splits == NULL);
-
- default_dict.nvar = 0;
- default_dict.N = 0;
- default_dict.nval = 0;
- default_handle = inline_file;
- stop_weighting (&default_dict);
+ return memcmp (a->s, b->s, width);
}
/* Discards all the current state in preparation for a data-input
void
discard_variables (void)
{
- clear_default_dict ();
-
+ dict_clear (default_dict);
+ default_handle = inline_file;
+
n_lag = 0;
- if (vfm_source)
+ if (vfm_source != NULL)
{
- vfm_source->destroy_source ();
+ if (vfm_source->class->destroy != NULL)
+ vfm_source->class->destroy (vfm_source);
+ free (vfm_source);
vfm_source = NULL;
}
ctl_stack = NULL;
- free (vec);
- vec = NULL;
- nvec = 0;
-
expr_free (process_if_expr);
process_if_expr = NULL;
pgm_state = STATE_INIT;
}
-/* Find and return the variable in default_dict having name NAME, or
- NULL if no such variable exists in default_dict. */
-struct variable *
-find_variable (const char *name)
-{
- return avl_find (default_dict.var_by_name, (struct variable *) name);
-}
-
-/* Find and return the variable in dictionary D having name NAME, or
- NULL if no such variable exists in D. */
-struct variable *
-find_dict_variable (const struct dictionary *d, const char *name)
-{
- return avl_find (d->var_by_name, (struct variable *) name);
-}
-
-/* Creates a variable named NAME in dictionary DICT having type TYPE
- (ALPHA or NUMERIC) and, if type==ALPHA, width WIDTH. Returns a
- pointer to the newly created variable if successful. On failure
- (which indicates that a variable having the specified name already
- exists), returns NULL. */
-struct variable *
-create_variable (struct dictionary *dict, const char *name,
- int type, int width)
-{
- if (find_dict_variable (dict, name))
- return NULL;
-
- {
- struct variable *new_var;
-
- dict->var = xrealloc (dict->var, (dict->nvar + 1) * sizeof *dict->var);
- new_var = dict->var[dict->nvar] = xmalloc (sizeof *new_var);
-
- new_var->index = dict->nvar;
- dict->nvar++;
-
- init_variable (dict, new_var, name, type, width);
-
- return new_var;
- }
-}
-
-#if GLOBAL_DEBUGGING
-/* For situations in which we know that there are no variables with an
- identical name in the dictionary. */
-struct variable *
-force_create_variable (struct dictionary *dict, const char *name,
- int type, int width)
-{
- struct variable *new_var = create_variable (dict, name, type, width);
- assert (new_var != NULL);
- return new_var;
-}
-
-/* For situations in which we know that there are no variables with an
- identical name in the dictionary. */
-struct variable *
-force_dup_variable (struct dictionary *dict, const struct variable *src,
- const char *name)
-{
- struct variable *new_var = dup_variable (dict, src, name);
- assert (new_var != NULL);
- return new_var;
-}
-#endif
-
-/* Delete variable V from DICT. It should only be used when there are
- guaranteed to be absolutely NO REFERENCES to it, for instance in
- the very same function that created it. */
-void
-delete_variable (struct dictionary *dict, struct variable *v)
-{
- int i;
-
- clear_variable (dict, v);
- dict->nvar--;
- for (i = v->index; i < dict->nvar; i++)
- {
- dict->var[i] = dict->var[i + 1];
- dict->var[i]->index = i;
- }
- free (v);
-}
-
-/* Initialize fields in variable V inside dictionary D with name NAME,
- type TYPE, and width WIDTH. Initializes some other fields too. */
-static inline void
-common_init_stuff (struct dictionary *dict, struct variable *v,
- const char *name, int type, int width)
-{
- if (v->name != name)
- /* Avoid problems with overlap. */
- strcpy (v->name, name);
-
- avl_force_insert (dict->var_by_name, v);
-
- v->type = type;
- v->left = name[0] == '#';
- v->width = type == NUMERIC ? 0 : width;
- v->miss_type = MISSING_NONE;
- if (v->type == NUMERIC)
- {
- v->print.type = FMT_F;
- v->print.w = 8;
- v->print.d = 2;
- }
- else
- {
- v->print.type = FMT_A;
- v->print.w = v->width;
- v->print.d = 0;
- }
- v->write = v->print;
-}
-
-/* Initialize (for the first time) a variable V in dictionary DICT
- with name NAME, type TYPE, and width WIDTH. */
-void
-init_variable (struct dictionary *dict, struct variable *v, const char *name,
- int type, int width)
-{
- common_init_stuff (dict, v, name, type, width);
- v->nv = type == NUMERIC ? 1 : DIV_RND_UP (width, 8);
- v->fv = dict->nval;
- dict->nval += v->nv;
- v->label = NULL;
- v->val_lab = NULL;
- v->get.fv = -1;
-
- if (vfm_source == &input_program_source
- || vfm_source == &file_type_source)
- {
- size_t nbytes = DIV_RND_UP (v->fv + 1, 4);
- unsigned val = 0;
-
- if (inp_init_size < nbytes)
- {
- inp_init = xrealloc (inp_init, nbytes);
- memset (&inp_init[inp_init_size], 0, nbytes - inp_init_size);
- inp_init_size = nbytes;
- }
-
- if (v->type == ALPHA)
- val |= INP_STRING;
- if (v->left)
- val |= INP_LEFT;
- inp_init[v->fv / 4] |= val << ((unsigned) (v->fv) % 4 * 2);
- }
-}
-
-/* Replace variable V in default_dict with a different variable having
- name NAME, type TYPE, and width WIDTH. */
-void
-replace_variable (struct variable *v, const char *name, int type, int width)
-{
- int nv;
-
- assert (v && name && (type == NUMERIC || type == ALPHA) && width >= 0
- && (type == ALPHA || width == 0));
- clear_variable (&default_dict, v);
- common_init_stuff (&default_dict, v, name, type, width);
-
- nv = (type == NUMERIC) ? 1 : DIV_RND_UP (width, 8);
- if (nv > v->nv)
- {
- v->fv = v->nv = 0;
- v->fv = default_dict.nval;
- default_dict.nval += nv;
- }
- v->nv = nv;
-}
-
-/* Changes the name of variable V in dictionary DICT to name NEW_NAME.
- NEW_NAME must be known not to already exist in dictionary DICT. */
-void
-rename_variable (struct dictionary * dict, struct variable *v,
- const char *new_name)
-{
- assert (dict && dict->var_by_name && v && new_name);
- avl_delete (dict->var_by_name, v);
- strncpy (v->name, new_name, 9);
- avl_force_insert (dict->var_by_name, v);
-}
-
-/* Delete the contents of variable V within dictionary DICT. Does not
- remove the variable from the vector of variables in the dictionary.
- Use with caution. */
-void
-clear_variable (struct dictionary *dict, struct variable *v)
-{
- assert (dict && v);
-
-#if DEBUGGING
- printf (_("clearing variable %d:%s %s\n"), v->index, v->name,
- (dict == &default_dict ? _("in default dictionary")
- : _("in auxiliary dictionary")));
- if (dict->var_by_name != NULL)
- dump_var_tree ();
-#endif
-
- if (dict->var_by_name != NULL)
- avl_force_delete (dict->var_by_name, v);
-
- if (v->val_lab)
- {
- avl_destroy (v->val_lab, free_val_lab);
- v->val_lab = NULL;
- }
-
- if (v->label)
- {
- free (v->label);
- v->label = NULL;
- }
-
- if (dict->splits)
- {
- struct variable **iter, **trailer;
-
- for (trailer = iter = dict->splits; *iter; iter++)
- if (*iter != v)
- *trailer++ = *iter;
- else
- dict->n_splits--;
-
- *trailer = NULL;
-
- if (dict->n_splits == 0)
- {
- free (dict->splits);
- dict->splits = NULL;
- }
- }
-
-#if DEBUGGING
- if (dict->var_by_name != NULL)
- dump_var_tree ();
-#endif
-}
-
-/* Creates a new variable in dictionary DICT, whose properties are
- copied from variable SRC, and returns a pointer to the new variable
- of name NAME, if successful. If unsuccessful (which only happens
- if a variable of the same name NAME exists in DICT), returns
- NULL. */
-struct variable *
-dup_variable (struct dictionary *dict, const struct variable *src,
- const char *name)
-{
- if (find_dict_variable (dict, name))
- return NULL;
-
- {
- struct variable *new_var;
-
- dict->var = xrealloc (dict->var, (dict->nvar + 1) * sizeof *dict->var);
- new_var = dict->var[dict->nvar] = xmalloc (sizeof *new_var);
-
- new_var->index = dict->nvar;
- new_var->foo = -1;
- new_var->get.fv = -1;
- new_var->get.nv = -1;
- dict->nvar++;
-
- copy_variable (new_var, src);
-
- assert (new_var->nv >= 0);
- new_var->fv = dict->nval;
- dict->nval += new_var->nv;
-
- strcpy (new_var->name, name);
- avl_force_insert (dict->var_by_name, new_var);
-
- return new_var;
- }
-}
-
-
-/* Decrements the reference count for value label V. Destroys the
- value label if the reference count reaches zero. */
-void
-free_value_label (struct value_label * v)
-{
- assert (v->ref_count >= 1);
- if (--v->ref_count == 0)
- {
- free (v->s);
- free (v);
- }
-}
-
-/* Frees value label P. PARAM is ignored. Used as a callback with
- avl_destroy(). */
-void
-free_val_lab (void *p, void *param unused)
-{
- free_value_label ((struct value_label *) p);
-}
-
-/* Returns a value label corresponding to VAL in variable V padded to
- length N. If N==0 then no padding is performed, and NULL is
- returned if no label exists. (Normally a string of spaces is
- returned in this case.) */
-char *
-get_val_lab (const struct variable *v, union value val, int n)
-{
- static char *buf;
- static int bufsize;
- struct value_label template, *find;
-
- if (bufsize < n)
- {
- buf = xrealloc (buf, n + 1);
- bufsize = n;
- }
- if (n)
- buf[0] = 0;
- template.v = val;
- find = NULL;
- if (v->val_lab)
- find = avl_find (v->val_lab, &template);
- if (find)
- {
- if (n)
- {
- st_pad_copy (buf, find->s, n + 1);
- return buf;
- }
- else
- return find->s;
- }
- else
- {
- if (n)
- {
- memset (buf, ' ', n);
- buf[n] = '\0';
- return buf;
- }
- else
- return NULL;
- }
-}
-
/* Return nonzero only if X is a user-missing value for numeric
variable V. */
inline int
case MISSING_NONE:
return 0;
case MISSING_1:
- return approx_eq (x, v->missing[0].f);
+ return x == v->missing[0].f;
case MISSING_2:
- return (approx_eq (x, v->missing[0].f)
- || approx_eq (x, v->missing[1].f));
+ return x == v->missing[0].f || x == v->missing[1].f;
case MISSING_3:
- return (approx_eq (x, v->missing[0].f)
- || approx_eq (x, v->missing[1].f)
- || approx_eq (x, v->missing[2].f));
+ return (x == v->missing[0].f || x == v->missing[1].f
+ || x == v->missing[2].f);
case MISSING_RANGE:
- return (approx_ge (x, v->missing[0].f)
- && approx_le (x, v->missing[1].f));
+ return x >= v->missing[0].f && x <= v->missing[1].f;
case MISSING_LOW:
- return approx_le (x, v->missing[0].f);
+ return x <= v->missing[0].f;
case MISSING_HIGH:
- return approx_ge (x, v->missing[0].f);
+ return x >= v->missing[0].f;
case MISSING_RANGE_1:
- return ((approx_ge (x, v->missing[0].f)
- && approx_le (x, v->missing[1].f))
- || approx_eq (x, v->missing[2].f));
+ return ((x >= v->missing[0].f && x <= v->missing[1].f)
+ || x == v->missing[2].f);
case MISSING_LOW_1:
- return (approx_le (x, v->missing[0].f)
- || approx_eq (x, v->missing[1].f));
+ return x <= v->missing[0].f || x == v->missing[1].f;
case MISSING_HIGH_1:
- return (approx_ge (x, v->missing[0].f)
- || approx_eq (x, v->missing[1].f));
+ return x >= v->missing[0].f || x == v->missing[1].f;
default:
assert (0);
}
}
abort ();
}
+\f
+/* A hsh_compare_func that orders variables A and B by their
+ names. */
+int
+compare_variables (const void *a_, const void *b_, void *foo UNUSED)
+{
+ const struct variable *a = a_;
+ const struct variable *b = b_;
+
+ return strcmp (a->name, b->name);
+}
+
+/* A hsh_hash_func that hashes variable V based on its name. */
+unsigned
+hash_variable (const void *v_, void *foo UNUSED)
+{
+ const struct variable *v = v_;
+
+ return hsh_hash_string (v->name);
+}
projects / pspp-builds.git / blobdiff