X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Flexer%2Fvariable-parser.c;h=b9d67523eeda711ed52501425d8ff9fa99ed0c54;hb=c75794cffb05769b71a346af8513a3e8dde55f94;hp=3778156133d38daaadf13251ab568df32ab190fe;hpb=9f087e7aa4cdff1d5d46d5e188c0017a9d2d0029;p=pspp diff --git a/src/language/lexer/variable-parser.c b/src/language/lexer/variable-parser.c index 3778156133..b9d67523ee 100644 --- a/src/language/lexer/variable-parser.c +++ b/src/language/lexer/variable-parser.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 1997-9, 2000 Free Software Foundation, Inc. + Copyright (C) 1997-9, 2000, 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 @@ -16,25 +16,27 @@ #include -#include +#include "language/lexer/variable-parser.h" #include #include #include -#include "lexer.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "xalloc.h" +#include "data/dictionary.h" +#include "data/procedure.h" +#include "data/variable.h" +#include "language/lexer/lexer.h" +#include "libpspp/assertion.h" +#include "libpspp/cast.h" +#include "libpspp/hash-functions.h" +#include "libpspp/hmapx.h" +#include "libpspp/message.h" +#include "libpspp/misc.h" +#include "libpspp/pool.h" +#include "libpspp/str.h" +#include "libpspp/stringi-set.h" + +#include "gl/xalloc.h" #include "gettext.h" #define _(msgid) gettext (msgid) @@ -399,24 +401,36 @@ extract_num (char *s, char *r, int *n, int *d) /* Parses a list of variable names according to the DATA LIST version of the TO convention. */ bool -parse_DATA_LIST_vars (struct lexer *lexer, char ***names, size_t *nnames, int pv_opts) +parse_DATA_LIST_vars (struct lexer *lexer, char ***names, + size_t *nnames, int pv_opts) { int n1, n2; int d1, d2; int n; size_t nvar, mvar; - char name1[LONG_NAME_LEN + 1], name2[LONG_NAME_LEN + 1]; - char root1[LONG_NAME_LEN + 1], root2[LONG_NAME_LEN + 1]; + char name1[VAR_NAME_LEN + 1], name2[VAR_NAME_LEN + 1]; + char root1[VAR_NAME_LEN + 1], root2[VAR_NAME_LEN + 1]; + struct stringi_set set; int success = 0; assert (names != NULL); assert (nnames != NULL); assert ((pv_opts & ~(PV_APPEND | PV_SINGLE | PV_NO_SCRATCH | PV_NO_DUPLICATE)) == 0); - /* FIXME: PV_NO_DUPLICATE is not implemented. */ + stringi_set_init (&set); if (pv_opts & PV_APPEND) - nvar = mvar = *nnames; + { + nvar = mvar = *nnames; + + if (pv_opts & PV_NO_DUPLICATE) + { + size_t i; + + for (i = 0; i < nvar; i++) + stringi_set_insert (&set, (*names)[i]); + } + } else { nvar = mvar = 0; @@ -474,8 +488,15 @@ parse_DATA_LIST_vars (struct lexer *lexer, char ***names, size_t *nnames, int pv for (n = n1; n <= n2; n++) { - char name[LONG_NAME_LEN + 1]; + char name[VAR_NAME_LEN + 1]; sprintf (name, "%s%0*d", root1, d1, n); + + if (pv_opts & PV_NO_DUPLICATE && !stringi_set_insert (&set, name)) + { + msg (SE, _("Variable %s appears twice in variable list."), + name); + goto fail; + } (*names)[nvar] = xstrdup (name); nvar++; } @@ -500,6 +521,7 @@ parse_DATA_LIST_vars (struct lexer *lexer, char ***names, size_t *nnames, int pv fail: *nnames = nvar; + stringi_set_destroy (&set); if (!success) { int i; @@ -664,7 +686,7 @@ var_set_lookup_var_idx (const struct var_set *vs, const char *name, { assert (vs != NULL); assert (name != NULL); - assert (strlen (name) <= LONG_NAME_LEN); + assert (strlen (name) <= VAR_NAME_LEN); return vs->lookup_var_idx (vs, name, idx); } @@ -738,7 +760,7 @@ struct array_var_set { struct variable *const *var;/* Array of variables. */ size_t var_cnt; /* Number of elements in var. */ - struct hsh_table *name_tab; /* Hash from variable names to variables. */ + struct hmapx vars_by_name; /* Variables hashed by name. */ }; /* Returns the number of variables in VS. */ @@ -757,7 +779,7 @@ array_var_set_get_var (const struct var_set *vs, size_t idx) { struct array_var_set *avs = vs->aux; - return (struct variable *) avs->var[idx]; + return CONST_CAST (struct variable *, avs->var[idx]); } /* If VS contains a variable named NAME, sets *IDX to its index @@ -767,19 +789,18 @@ array_var_set_lookup_var_idx (const struct var_set *vs, const char *name, size_t *idx) { struct array_var_set *avs = vs->aux; - struct variable *v, *const *vpp; + struct hmapx_node *node; + struct variable **varp; - v = var_create (name, 0); - vpp = hsh_find (avs->name_tab, &v); - var_destroy (v); + HMAPX_FOR_EACH_WITH_HASH (varp, node, hash_case_string (name, 0), + &avs->vars_by_name) + if (!strcasecmp (name, var_get_name (*varp))) + { + *idx = varp - avs->var; + return true; + } - if (vpp != NULL) - { - *idx = vpp - avs->var; - return true; - } - else - return false; + return false; } /* Destroys VS. */ @@ -788,13 +809,12 @@ array_var_set_destroy (struct var_set *vs) { struct array_var_set *avs = vs->aux; - hsh_destroy (avs->name_tab); + hmapx_destroy (&avs->vars_by_name); free (avs); free (vs); } -/* Returns a variable set based on the VAR_CNT variables in - VAR. */ +/* Returns a variable set based on the VAR_CNT variables in VAR. */ struct var_set * var_set_create_from_array (struct variable *const *var, size_t var_cnt) { @@ -810,15 +830,20 @@ var_set_create_from_array (struct variable *const *var, size_t var_cnt) vs->aux = avs = xmalloc (sizeof *avs); avs->var = var; avs->var_cnt = var_cnt; - avs->name_tab = hsh_create (2 * var_cnt, - compare_var_ptrs_by_name, hash_var_ptr_by_name, - NULL, NULL); + hmapx_init (&avs->vars_by_name); for (i = 0; i < var_cnt; i++) - if (hsh_insert (avs->name_tab, (void *) &var[i]) != NULL) - { - var_set_destroy (vs); - return NULL; - } + { + const char *name = var_get_name (var[i]); + size_t idx; + + if (array_var_set_lookup_var_idx (vs, name, &idx)) + { + var_set_destroy (vs); + return NULL; + } + hmapx_insert (&avs->vars_by_name, CONST_CAST (void *, &avs->var[i]), + hash_case_string (name, 0)); + } return vs; }