X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Flexer%2Fvariable-parser.c;h=942e2db56e087065ffd9c4b1abe9bf65f2050398;hb=89c05dfe33f9542e60e66dd383f7a514849b5947;hp=fbcc170d84b34b33f790a852a64853744f27e12c;hpb=9ade26c8349b4434008c46cf09bc7473ec743972;p=pspp diff --git a/src/language/lexer/variable-parser.c b/src/language/lexer/variable-parser.c index fbcc170d84..942e2db56e 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, 2010, 2011 Free Software Foundation, Inc. + Copyright (C) 1997-9, 2000, 2009, 2010, 2011, 2012, 2020 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 @@ -23,13 +23,14 @@ #include #include +#include "data/dataset.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/i18n.h" #include "libpspp/hmapx.h" #include "libpspp/message.h" #include "libpspp/misc.h" @@ -37,32 +38,50 @@ #include "libpspp/str.h" #include "libpspp/stringi-set.h" +#include "math/interaction.h" + #include "gl/c-ctype.h" #include "gl/xalloc.h" #include "gettext.h" #define _(msgid) gettext (msgid) -static struct variable * var_set_get_var (const struct var_set *, size_t ); - +static struct variable *var_set_get_var (const struct var_set *, size_t); static struct variable *var_set_lookup_var (const struct var_set *, const char *); - static bool var_set_lookup_var_idx (const struct var_set *, const char *, size_t *); +static bool var_set_get_names_must_be_ids (const struct var_set *); +static bool +is_name_token (const struct lexer *lexer, bool names_must_be_ids) +{ + return (lex_token (lexer) == T_ID + || (!names_must_be_ids && lex_token (lexer) == T_STRING)); +} +static bool +is_vs_name_token (const struct lexer *lexer, const struct var_set *vs) +{ + return is_name_token (lexer, var_set_get_names_must_be_ids (vs)); +} + +static bool +is_dict_name_token (const struct lexer *lexer, const struct dictionary *d) +{ + return is_name_token (lexer, dict_get_names_must_be_ids (d)); +} /* Parses a name as a variable within VS. Sets *IDX to the variable's index and returns true if successful. On failure emits an error message and returns false. */ static bool parse_vs_variable_idx (struct lexer *lexer, const struct var_set *vs, - size_t *idx) + size_t *idx) { assert (idx != NULL); - if (lex_token (lexer) != T_ID) + if (!is_vs_name_token (lexer, vs)) { lex_error (lexer, _("expecting variable name")); return false; @@ -104,7 +123,8 @@ parse_variable (struct lexer *lexer, const struct dictionary *d) /* Parses a set of variables from dictionary D given options OPTS. Resulting list of variables stored in *VAR and the number of variables into *CNT. Returns true only if - successful. */ + successful. The dictionary D must contain at least one + variable. */ bool parse_variables (struct lexer *lexer, const struct dictionary *d, struct variable ***var, @@ -118,6 +138,12 @@ parse_variables (struct lexer *lexer, const struct dictionary *d, assert (cnt != NULL); vs = var_set_create_from_dict (d); + if (var_set_get_n (vs) == 0) + { + *cnt = 0; + var_set_destroy (vs); + return false; + } success = parse_var_set_vars (lexer, vs, var, cnt, opts); var_set_destroy (vs); return success; @@ -125,13 +151,13 @@ parse_variables (struct lexer *lexer, const struct dictionary *d, /* Parses a set of variables from dictionary D given options OPTS. Resulting list of variables stored in *VARS and the - number of variables into *VAR_CNT. Returns true only if + number of variables into *N_VARS. Returns true only if successful. Same behavior as parse_variables, except that all allocations are taken from the given POOL. */ bool parse_variables_pool (struct lexer *lexer, struct pool *pool, const struct dictionary *dict, - struct variable ***vars, size_t *var_cnt, int opts) + struct variable ***vars, size_t *n_vars, int opts) { int retval; @@ -141,7 +167,7 @@ parse_variables_pool (struct lexer *lexer, struct pool *pool, later. */ assert (!(opts & PV_APPEND)); - retval = parse_variables (lexer, dict, vars, var_cnt, opts); + retval = parse_variables (lexer, dict, vars, n_vars, opts); if (retval) pool_register (pool, free, *vars); return retval; @@ -198,9 +224,9 @@ add_variable (struct variable ***v, size_t *nv, size_t *mv, "All variables in this variable list must have the " "same width. %s will be omitted from the list."), var_get_name ((*v)[0]), add_name, add_name); - else if ((pv_opts & PV_NO_DUPLICATE) && included[idx]) + else if ((pv_opts & PV_NO_DUPLICATE) && included && included[idx]) msg (SE, _("Variable %s appears twice in variable list."), add_name); - else if ((pv_opts & PV_DUPLICATE) || !included[idx]) + else if ((pv_opts & PV_DUPLICATE) || !included || !included[idx]) { if (*nv >= *mv) { @@ -269,7 +295,7 @@ parse_var_set_vars (struct lexer *lexer, const struct var_set *vs, { size_t i; - included = xcalloc (var_set_get_cnt (vs), sizeof *included); + included = xcalloc (var_set_get_n (vs), sizeof *included); for (i = 0; i < *nv; i++) { size_t index; @@ -285,7 +311,7 @@ parse_var_set_vars (struct lexer *lexer, const struct var_set *vs, { if (lex_match (lexer, T_ALL)) add_variables (v, nv, &mv, included, pv_opts, - vs, 0, var_set_get_cnt (vs) - 1, DC_ORDINARY); + vs, 0, var_set_get_n (vs) - 1, DC_ORDINARY); else { enum dict_class class; @@ -341,7 +367,8 @@ parse_var_set_vars (struct lexer *lexer, const struct var_set *vs, lex_match (lexer, T_COMMA); } while (lex_token (lexer) == T_ALL - || (lex_token (lexer) == T_ID && var_set_lookup_var (vs, lex_tokcstr (lexer)) != NULL)); + || (is_vs_name_token (lexer, vs) + && var_set_lookup_var (vs, lex_tokcstr (lexer)) != NULL)); if (*nv == 0) goto fail; @@ -357,6 +384,22 @@ fail: return 0; } +char * +parse_DATA_LIST_var (struct lexer *lexer, const struct dictionary *d) +{ + if (!is_dict_name_token (lexer, d)) + { + lex_error (lexer, "expecting variable name"); + return NULL; + } + if (!dict_id_is_valid (d, lex_tokcstr (lexer), true)) + return NULL; + + char *name = xstrdup (lex_tokcstr (lexer)); + lex_get (lexer); + return name; +} + /* 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, @@ -426,6 +469,7 @@ parse_DATA_LIST_vars (struct lexer *lexer, const struct dictionary *dict, char *name1 = NULL; char *name2 = NULL; + bool ok = false; assert ((pv_opts & ~(PV_APPEND | PV_SINGLE @@ -453,36 +497,24 @@ parse_DATA_LIST_vars (struct lexer *lexer, const struct dictionary *dict, do { - if (lex_token (lexer) != T_ID - || !dict_id_is_valid (dict, lex_tokcstr (lexer), true)) - { - lex_error (lexer, "expecting variable name"); - goto exit; - } - if (dict_class_from_id (lex_tokcstr (lexer)) == DC_SCRATCH - && (pv_opts & PV_NO_SCRATCH)) + name1 = parse_DATA_LIST_var (lexer, dict); + if (!name1) + goto exit; + if (dict_class_from_id (name1) == DC_SCRATCH && pv_opts & PV_NO_SCRATCH) { msg (SE, _("Scratch variables not allowed here.")); goto exit; } - name1 = xstrdup (lex_tokcstr (lexer)); - lex_get (lexer); - if (lex_token (lexer) == T_TO) + if (lex_match (lexer, T_TO)) { - unsigned long int num1, num2; + 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 - || !dict_id_is_valid (dict, lex_tokcstr (lexer), true)) - { - lex_error (lexer, "expecting variable name"); - goto exit; - } - name2 = xstrdup (lex_tokcstr (lexer)); - lex_get (lexer); + name2 = parse_DATA_LIST_var (lexer, dict); + if (!name2) + goto exit; root_len1 = extract_numeric_suffix (name1, &num1, &n_digits1); if (root_len1 == 0) @@ -605,21 +637,20 @@ parse_mixed_vars (struct lexer *lexer, const struct dictionary *dict, assert (names != NULL); assert (nnames != NULL); - assert ((pv_opts & ~PV_APPEND) == 0); if (!(pv_opts & PV_APPEND)) { *names = NULL; *nnames = 0; } - while (lex_token (lexer) == T_ID || lex_token (lexer) == T_ALL) + while (is_dict_name_token (lexer, dict) || lex_token (lexer) == T_ALL) { if (lex_token (lexer) == T_ALL || dict_lookup_var (dict, lex_tokcstr (lexer)) != NULL) { struct variable **v; size_t nv; - if (!parse_variables (lexer, dict, &v, &nv, PV_NONE)) + if (!parse_variables (lexer, dict, &v, &nv, pv_opts)) goto fail; *names = xnrealloc (*names, *nnames + nv, sizeof **names); for (i = 0; i < nv; i++) @@ -627,10 +658,13 @@ parse_mixed_vars (struct lexer *lexer, const struct dictionary *dict, free (v); *nnames += nv; } - else if (!parse_DATA_LIST_vars (lexer, dict, names, nnames, PV_APPEND)) + else if (!parse_DATA_LIST_vars (lexer, dict, names, nnames, PV_APPEND | pv_opts)) goto fail; } - return 1; + if (*nnames == 0) + goto fail; + + return true; fail: for (i = 0; i < *nnames; i++) @@ -638,7 +672,7 @@ fail: free (*names); *names = NULL; *nnames = 0; - return 0; + return false; } /* Parses a list of variables where some of the variables may be @@ -663,10 +697,140 @@ parse_mixed_vars_pool (struct lexer *lexer, const struct dictionary *dict, struc return retval; } +/* Frees the N var_syntax structures in VS, as well as VS itself. */ +void +var_syntax_destroy (struct var_syntax *vs, size_t n) +{ + for (size_t i = 0; i < n; i++) + { + free (vs[i].first); + free (vs[i].last); + } + free (vs); +} + +/* Parses syntax for variables and variable ranges from LEXER. If successful, + initializes *VS to the beginning of an array of var_syntax structs and *N_VS + to the number of elements in the array and returns true. On error, sets *VS + to NULL and *N_VS to 0 and returns false. */ +bool +var_syntax_parse (struct lexer *lexer, struct var_syntax **vs, size_t *n_vs) +{ + *vs = NULL; + *n_vs = 0; + + if (lex_token (lexer) != T_ID) + { + lex_error (lexer, _("expecting variable name")); + goto error; + } + + size_t allocated_vs = 0; + do + { + if (allocated_vs >= *n_vs) + *vs = x2nrealloc (*vs, &allocated_vs, sizeof **vs); + struct var_syntax *new = &(*vs)[(*n_vs)++]; + *new = (struct var_syntax) { .first = ss_xstrdup (lex_tokss (lexer)) }; + lex_get (lexer); + + if (lex_match (lexer, T_TO)) + { + if (lex_token (lexer) != T_ID) + { + lex_error (lexer, _("expecting variable name")); + goto error; + } + + new->last = ss_xstrdup (lex_tokss (lexer)); + lex_get (lexer); + } + } + while (lex_token (lexer) == T_ID); + return true; + +error: + var_syntax_destroy (*vs, *n_vs); + *vs = NULL; + *n_vs = 0; + return false; +} + +/* Looks up the N_VS var syntax structs in VS in DICT, translating them to an + array of variables. If successful, initializes *VARS to the beginning of an + array of pointers to variables and *N_VARS to the length of the array and + returns true. On error, sets *VARS to NULL and *N_VARS to 0. + + For the moment, only honors PV_NUMERIC in OPTS. */ +bool +var_syntax_evaluate (const struct var_syntax *vs, size_t n_vs, + const struct dictionary *dict, + struct variable ***vars, size_t *n_vars, int opts) +{ + assert (!(opts & ~PV_NUMERIC)); + + *vars = NULL; + *n_vars = 0; + + size_t allocated_vars = 0; + for (size_t i = 0; i < n_vs; i++) + { + struct variable *first = dict_lookup_var (dict, vs[i].first); + if (!first) + { + msg (SE, _("%s is not a variable name."), vs[i].first); + goto error; + } + + struct variable *last = (vs[i].last + ? dict_lookup_var (dict, vs[i].last) + : first); + if (!last) + { + msg (SE, _("%s is not a variable name."), vs[i].last); + goto error; + } + + size_t first_idx = var_get_dict_index (first); + size_t last_idx = var_get_dict_index (last); + if (last_idx < first_idx) + { + msg (SE, _("%s TO %s is not valid syntax since %s " + "precedes %s in the dictionary."), + vs[i].first, vs[i].last, + vs[i].first, vs[i].last); + goto error; + } + + for (size_t j = first_idx; j <= last_idx; j++) + { + struct variable *v = dict_get_var (dict, j); + if (opts & PV_NUMERIC && !var_is_numeric (v)) + { + msg (SW, _("%s is not a numeric variable."), var_get_name (v)); + goto error; + } + + if (*n_vars >= allocated_vars) + *vars = x2nrealloc (*vars, &allocated_vars, sizeof **vars); + (*vars)[(*n_vars)++] = v; + } + } + + return true; + +error: + free (*vars); + *vars = NULL; + *n_vars = 0; + return false; +} + /* A set of variables. */ struct var_set { - size_t (*get_cnt) (const struct var_set *); + bool names_must_be_ids; + size_t (*get_n) (const struct var_set *); struct variable *(*get_var) (const struct var_set *, size_t idx); bool (*lookup_var_idx) (const struct var_set *, const char *, size_t *); void (*destroy) (struct var_set *); @@ -675,11 +839,11 @@ struct var_set /* Returns the number of variables in VS. */ size_t -var_set_get_cnt (const struct var_set *vs) +var_set_get_n (const struct var_set *vs) { assert (vs != NULL); - return vs->get_cnt (vs); + return vs->get_n (vs); } /* Return variable with index IDX in VS. @@ -688,7 +852,7 @@ static struct variable * var_set_get_var (const struct var_set *vs, size_t idx) { assert (vs != NULL); - assert (idx < var_set_get_cnt (vs)); + assert (idx < var_set_get_n (vs)); return vs->get_var (vs, idx); } @@ -723,14 +887,20 @@ var_set_destroy (struct var_set *vs) if (vs != NULL) vs->destroy (vs); } + +static bool +var_set_get_names_must_be_ids (const struct var_set *vs) +{ + return vs->names_must_be_ids; +} /* Returns the number of variables in VS. */ static size_t -dict_var_set_get_cnt (const struct var_set *vs) +dict_var_set_get_n (const struct var_set *vs) { struct dictionary *d = vs->aux; - return dict_get_var_cnt (d); + return dict_get_n_vars (d); } /* Return variable with index IDX in VS. @@ -772,7 +942,8 @@ struct var_set * var_set_create_from_dict (const struct dictionary *d) { struct var_set *vs = xmalloc (sizeof *vs); - vs->get_cnt = dict_var_set_get_cnt; + vs->names_must_be_ids = dict_get_names_must_be_ids (d); + vs->get_n = dict_var_set_get_n; vs->get_var = dict_var_set_get_var; vs->lookup_var_idx = dict_var_set_lookup_var_idx; vs->destroy = dict_var_set_destroy; @@ -784,17 +955,17 @@ var_set_create_from_dict (const struct dictionary *d) struct array_var_set { struct variable *const *var;/* Array of variables. */ - size_t var_cnt; /* Number of elements in var. */ + size_t n_vars; /* Number of elements in var. */ struct hmapx vars_by_name; /* Variables hashed by name. */ }; /* Returns the number of variables in VS. */ static size_t -array_var_set_get_cnt (const struct var_set *vs) +array_var_set_get_n (const struct var_set *vs) { struct array_var_set *avs = vs->aux; - return avs->var_cnt; + return avs->n_vars; } /* Return variable with index IDX in VS. @@ -817,9 +988,9 @@ array_var_set_lookup_var_idx (const struct var_set *vs, const char *name, struct hmapx_node *node; struct variable **varp; - HMAPX_FOR_EACH_WITH_HASH (varp, node, hash_case_string (name, 0), + HMAPX_FOR_EACH_WITH_HASH (varp, node, utf8_hash_case_string (name, 0), &avs->vars_by_name) - if (!strcasecmp (name, var_get_name (*varp))) + if (!utf8_strcasecmp (name, var_get_name (*varp))) { *idx = varp - avs->var; return true; @@ -839,24 +1010,25 @@ array_var_set_destroy (struct var_set *vs) free (vs); } -/* Returns a variable set based on the VAR_CNT variables in VAR. */ +/* Returns a variable set based on the N_VARS variables in VAR. */ struct var_set * -var_set_create_from_array (struct variable *const *var, size_t var_cnt) +var_set_create_from_array (struct variable *const *var, size_t n_vars) { struct var_set *vs; struct array_var_set *avs; size_t i; vs = xmalloc (sizeof *vs); - vs->get_cnt = array_var_set_get_cnt; + vs->names_must_be_ids = true; + vs->get_n = array_var_set_get_n; vs->get_var = array_var_set_get_var; vs->lookup_var_idx = array_var_set_lookup_var_idx; vs->destroy = array_var_set_destroy; vs->aux = avs = xmalloc (sizeof *avs); avs->var = var; - avs->var_cnt = var_cnt; + avs->n_vars = n_vars; hmapx_init (&avs->vars_by_name); - for (i = 0; i < var_cnt; i++) + for (i = 0; i < n_vars; i++) { const char *name = var_get_name (var[i]); size_t idx; @@ -867,9 +1039,76 @@ var_set_create_from_array (struct variable *const *var, size_t var_cnt) return NULL; } hmapx_insert (&avs->vars_by_name, CONST_CAST (void *, &avs->var[i]), - hash_case_string (name, 0)); + utf8_hash_case_string (name, 0)); } return vs; } + +/* Match a variable. + If the match succeeds, the variable will be placed in VAR. + Returns true if successful */ +bool +lex_match_variable (struct lexer *lexer, const struct dictionary *dict, const struct variable **var) +{ + if (lex_token (lexer) != T_ID) + return false; + + *var = parse_variable_const (lexer, dict); + + if (*var == NULL) + return false; + return true; +} + +/* An interaction is a variable followed by {*, BY} followed by an interaction */ +static bool +parse_internal_interaction (struct lexer *lexer, const struct dictionary *dict, struct interaction **iact, struct interaction **it) +{ + const struct variable *v = NULL; + assert (iact); + + switch (lex_next_token (lexer, 1)) + { + case T_ENDCMD: + case T_SLASH: + case T_COMMA: + case T_ID: + case T_BY: + case T_ASTERISK: + break; + default: + return false; + break; + } + + if (! lex_match_variable (lexer, dict, &v)) + { + if (it) + interaction_destroy (*it); + *iact = NULL; + return false; + } + + assert (v); + + if (*iact == NULL) + *iact = interaction_create (v); + else + interaction_add_variable (*iact, v); + + if (lex_match (lexer, T_ASTERISK) || lex_match (lexer, T_BY)) + { + return parse_internal_interaction (lexer, dict, iact, iact); + } + + return true; +} + +bool +parse_design_interaction (struct lexer *lexer, const struct dictionary *dict, struct interaction **iact) +{ + return parse_internal_interaction (lexer, dict, iact, NULL); +} +