X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Flexer%2Fvariable-parser.c;h=84cf972563545becd34344a8b1b64a787c89ce0e;hb=01b8f463e64469622cfe56f123e23a45d36d5d52;hp=8a39dbf0b2d2d6b6684766d8352d4cbf02cfdd59;hpb=07db00919d6f067fd5dd6c6c1c2c2fba4f42cf21;p=pspp-builds.git diff --git a/src/language/lexer/variable-parser.c b/src/language/lexer/variable-parser.c index 8a39dbf0..84cf9725 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, 2009 Free Software Foundation, Inc. + Copyright (C) 1997-9, 2000, 2009, 2010, 2011 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,29 @@ #include -#include +#include "language/lexer/variable-parser.h" #include +#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/c-ctype.h" +#include "gl/xalloc.h" #include "gettext.h" #define _(msgid) gettext (msgid) @@ -63,14 +67,14 @@ parse_vs_variable_idx (struct lexer *lexer, const struct var_set *vs, lex_error (lexer, _("expecting variable name")); return false; } - else if (var_set_lookup_var_idx (vs, lex_tokid (lexer), idx)) + else if (var_set_lookup_var_idx (vs, lex_tokcstr (lexer), idx)) { lex_get (lexer); return true; } else { - msg (SE, _("%s is not a variable name."), lex_tokid (lexer)); + msg (SE, _("%s is not a variable name."), lex_tokcstr (lexer)); return false; } } @@ -334,10 +338,10 @@ parse_var_set_vars (struct lexer *lexer, const struct var_set *vs, if (pv_opts & PV_SINGLE) break; - lex_match (lexer, ','); + lex_match (lexer, T_COMMA); } while (lex_token (lexer) == T_ALL - || (lex_token (lexer) == T_ID && var_set_lookup_var (vs, lex_tokid (lexer)) != NULL)); + || (lex_token (lexer) == T_ID && var_set_lookup_var (vs, lex_tokcstr (lexer)) != NULL)); if (*nv == 0) goto fail; @@ -353,74 +357,98 @@ fail: return 0; } -/* Extracts a numeric suffix from variable name S, copying it - into string R. Sets *D to the length of R and *N to its - value. */ +/* Attempts to break UTF-8 encoded NAME into a root (whose contents are + arbitrary except that it does not end in a digit) followed by an integer + numeric suffix. On success, stores the value of the suffix into *NUMBERP, + the number of digits in the suffix into *N_DIGITSP, and returns the number + of bytes in the root. On failure, returns 0. */ static int -extract_num (char *s, char *r, int *n, int *d) +extract_numeric_suffix (const char *name, + unsigned long int *numberp, int *n_digitsp) { - char *cp; - - /* Find first digit. */ - cp = s + strlen (s) - 1; - while (isdigit ((unsigned char) *cp) && cp > s) - cp--; - cp++; + size_t root_len, n_digits; + size_t i; - /* Extract root. */ - strncpy (r, s, cp - s); - r[cp - s] = 0; + /* Count length of root. */ + root_len = 1; /* Valid identifier never starts with digit. */ + for (i = 1; name[i] != '\0'; i++) + if (!c_isdigit (name[i])) + root_len = i + 1; + n_digits = i - root_len; - /* Count initial zeros. */ - *n = *d = 0; - while (*cp == '0') + if (n_digits == 0) { - (*d)++; - cp++; + msg (SE, _("`%s' cannot be used with TO because it does not end in " + "a digit."), name); + return 0; } - /* Extract value. */ - while (isdigit ((unsigned char) *cp)) + *numberp = strtoull (name + root_len, NULL, 10); + if (*numberp == ULONG_MAX) { - (*d)++; - *n = (*n * 10) + (*cp - '0'); - cp++; + msg (SE, _("Numeric suffix on `%s' is larger than supported with TO."), + name); + return 0; } + *n_digitsp = n_digits; + return root_len; +} - /* Sanity check. */ - if (*n == 0 && *d == 0) +static bool +add_var_name (char *name, + char ***names, size_t *n_vars, size_t *allocated_vars, + struct stringi_set *set, int pv_opts) +{ + if (pv_opts & PV_NO_DUPLICATE && !stringi_set_insert (set, name)) { - msg (SE, _("incorrect use of TO convention")); - return 0; + msg (SE, _("Variable %s appears twice in variable list."), + name); + return false; } - return 1; + + if (*n_vars >= *allocated_vars) + *names = x2nrealloc (*names, allocated_vars, sizeof **names); + (*names)[(*n_vars)++] = name; + return true; } /* 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 ***namesp, + size_t *n_varsp, int pv_opts) { - int n1, n2; - int d1, d2; - int n; - size_t nvar, mvar; - char name1[VAR_NAME_LEN + 1], name2[VAR_NAME_LEN + 1]; - char root1[VAR_NAME_LEN + 1], root2[VAR_NAME_LEN + 1]; - int success = 0; + char **names; + size_t n_vars; + size_t allocated_vars; + + struct stringi_set set; + + char *name1 = NULL; + char *name2 = NULL; + bool ok = false; - 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; + { + n_vars = allocated_vars = *n_varsp; + names = *namesp; + + if (pv_opts & PV_NO_DUPLICATE) + { + size_t i; + + for (i = 0; i < n_vars; i++) + stringi_set_insert (&set, names[i]); + } + } else { - nvar = mvar = 0; - *names = NULL; + n_vars = allocated_vars = 0; + names = NULL; } do @@ -428,88 +456,105 @@ parse_DATA_LIST_vars (struct lexer *lexer, char ***names, size_t *nnames, int pv if (lex_token (lexer) != T_ID) { lex_error (lexer, "expecting variable name"); - goto fail; + goto exit; } - if (dict_class_from_id (lex_tokid (lexer)) == DC_SCRATCH + if (dict_class_from_id (lex_tokcstr (lexer)) == DC_SCRATCH && (pv_opts & PV_NO_SCRATCH)) { msg (SE, _("Scratch variables not allowed here.")); - goto fail; + goto exit; } - strcpy (name1, lex_tokid (lexer)); + name1 = xstrdup (lex_tokcstr (lexer)); lex_get (lexer); if (lex_token (lexer) == T_TO) { + unsigned long int num1, num2; + int n_digits1, n_digits2; + int root_len1, root_len2; + unsigned long int number; + lex_get (lexer); if (lex_token (lexer) != T_ID) { lex_error (lexer, "expecting variable name"); - goto fail; + goto exit; } - strcpy (name2, lex_tokid (lexer)); + name2 = xstrdup (lex_tokcstr (lexer)); lex_get (lexer); - if (!extract_num (name1, root1, &n1, &d1) - || !extract_num (name2, root2, &n2, &d2)) - goto fail; + root_len1 = extract_numeric_suffix (name1, &num1, &n_digits1); + if (root_len1 == 0) + goto exit; + + root_len2 = extract_numeric_suffix (name2, &num2, &n_digits2); + if (root_len2 == 0) + goto exit; - if (strcasecmp (root1, root2)) + if (root_len1 != root_len2 || memcasecmp (name1, name2, root_len1)) { msg (SE, _("Prefixes don't match in use of TO convention.")); - goto fail; + goto exit; } - if (n1 > n2) + if (num1 > num2) { msg (SE, _("Bad bounds in use of TO convention.")); - goto fail; + goto exit; } - if (d2 > d1) - d2 = d1; - if (mvar < nvar + (n2 - n1 + 1)) + for (number = num1; number <= num2; number++) { - mvar += ROUND_UP (n2 - n1 + 1, 16); - *names = xnrealloc (*names, mvar, sizeof **names); + char *name = xasprintf ("%.*s%0*lu", + root_len1, name1, + n_digits1, number); + if (!add_var_name (name, &names, &n_vars, &allocated_vars, + &set, pv_opts)) + { + free (name); + goto exit; + } } - for (n = n1; n <= n2; n++) - { - char name[VAR_NAME_LEN + 1]; - sprintf (name, "%s%0*d", root1, d1, n); - (*names)[nvar] = xstrdup (name); - nvar++; - } + free (name1); + name1 = NULL; + free (name2); + name2 = NULL; } else { - if (nvar >= mvar) - { - mvar += 16; - *names = xnrealloc (*names, mvar, sizeof **names); - } - (*names)[nvar++] = xstrdup (name1); + if (!add_var_name (name1, &names, &n_vars, &allocated_vars, + &set, pv_opts)) + goto exit; + name1 = NULL; } - lex_match (lexer, ','); + lex_match (lexer, T_COMMA); if (pv_opts & PV_SINGLE) break; } while (lex_token (lexer) == T_ID); - success = 1; + ok = true; -fail: - *nnames = nvar; - if (!success) +exit: + stringi_set_destroy (&set); + if (ok) + { + *namesp = names; + *n_varsp = n_vars; + } + else { int i; - for (i = 0; i < nvar; i++) - free ((*names)[i]); - free (*names); - *names = NULL; - *nnames = 0; + for (i = 0; i < n_vars; i++) + free (names[i]); + free (names); + *namesp = NULL; + *n_varsp = 0; + + free (name1); + free (name2); } - return success; + return ok; } /* Registers each of the NAMES[0...NNAMES - 1] in POOL, as well @@ -566,7 +611,7 @@ parse_mixed_vars (struct lexer *lexer, const struct dictionary *dict, } while (lex_token (lexer) == T_ID || lex_token (lexer) == T_ALL) { - if (lex_token (lexer) == T_ALL || dict_lookup_var (dict, lex_tokid (lexer)) != NULL) + if (lex_token (lexer) == T_ALL || dict_lookup_var (dict, lex_tokcstr (lexer)) != NULL) { struct variable **v; size_t nv; @@ -664,7 +709,6 @@ var_set_lookup_var_idx (const struct var_set *vs, const char *name, { assert (vs != NULL); assert (name != NULL); - assert (strlen (name) <= VAR_NAME_LEN); return vs->lookup_var_idx (vs, name, idx); } @@ -738,7 +782,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. */ @@ -767,19 +811,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 +831,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 +852,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; }