X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Flexer%2Fvariable-parser.c;h=e637940351af76439ea397dbf3c067cfddfef6a0;hb=ea75d9702346b57b13830e619e9c447b0b976f89;hp=b91c038ac9080f6404cddbfe08344c184394fd57;hpb=d4ff0e074d703dbeb8af5aa3ac470ddda5ebe301;p=pspp diff --git a/src/language/lexer/variable-parser.c b/src/language/lexer/variable-parser.c index b91c038ac9..e637940351 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, 2012 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 @@ -46,26 +46,42 @@ #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; @@ -107,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, @@ -121,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_cnt (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; @@ -344,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; @@ -360,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, @@ -428,6 +468,7 @@ parse_DATA_LIST_vars (struct lexer *lexer, const struct dictionary *dict, struct stringi_set set; char *name1 = NULL; + char *name2 = NULL; bool ok = false; @@ -456,37 +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)) { - char *name2 = NULL; 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) @@ -523,6 +551,7 @@ parse_DATA_LIST_vars (struct lexer *lexer, const struct dictionary *dict, free (name1); name1 = NULL; free (name2); + name2 = NULL; } else { @@ -557,6 +586,7 @@ exit: *n_varsp = 0; free (name1); + free (name2); } return ok; } @@ -613,7 +643,7 @@ parse_mixed_vars (struct lexer *lexer, const struct dictionary *dict, *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) { @@ -670,6 +700,7 @@ parse_mixed_vars_pool (struct lexer *lexer, const struct dictionary *dict, struc /* A set of variables. */ struct var_set { + bool names_must_be_ids; size_t (*get_cnt) (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 *); @@ -727,6 +758,12 @@ 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 @@ -776,6 +813,7 @@ struct var_set * var_set_create_from_dict (const struct dictionary *d) { struct var_set *vs = xmalloc (sizeof *vs); + vs->names_must_be_ids = dict_get_names_must_be_ids (d); vs->get_cnt = dict_var_set_get_cnt; vs->get_var = dict_var_set_get_var; vs->lookup_var_idx = dict_var_set_lookup_var_idx; @@ -852,6 +890,7 @@ var_set_create_from_array (struct variable *const *var, size_t var_cnt) size_t i; vs = xmalloc (sizeof *vs); + vs->names_must_be_ids = true; vs->get_cnt = array_var_set_get_cnt; vs->get_var = array_var_set_get_var; vs->lookup_var_idx = array_var_set_lookup_var_idx; @@ -889,7 +928,7 @@ lex_match_variable (struct lexer *lexer, const struct dictionary *dict, const st *var = parse_variable_const (lexer, dict); - if ( *var == NULL) + if (*var == NULL) return false; return true; } @@ -925,12 +964,12 @@ parse_internal_interaction (struct lexer *lexer, const struct dictionary *dict, assert (v); - if ( *iact == NULL) + if (*iact == NULL) *iact = interaction_create (v); else interaction_add_variable (*iact, v); - if ( lex_match (lexer, T_ASTERISK) || lex_match (lexer, T_BY)) + if (lex_match (lexer, T_ASTERISK) || lex_match (lexer, T_BY)) { return parse_internal_interaction (lexer, dict, iact, iact); }