X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Flexer%2Fvariable-parser.c;h=44be48b9dd6459297ab1b904e20ea8f4f125ba89;hb=b0ce74cb9ee2ac59e87bddb46122b63ae0b6cdf0;hp=64792aaaec56ced30eadc35077efd292c7bf41a7;hpb=81fff61a96bece351e381ad3fef8ab1248a952ba;p=pspp diff --git a/src/language/lexer/variable-parser.c b/src/language/lexer/variable-parser.c index 64792aaaec..44be48b9dd 100644 --- a/src/language/lexer/variable-parser.c +++ b/src/language/lexer/variable-parser.c @@ -19,6 +19,8 @@ #include +#include + #include #include #include @@ -42,23 +44,24 @@ variable's index and returns true if successful. On failure emits an error message and returns false. */ static bool -parse_vs_variable_idx (const struct var_set *vs, size_t *idx) +parse_vs_variable_idx (struct lexer *lexer, const struct var_set *vs, + size_t *idx) { assert (idx != NULL); - if (token != T_ID) + if (lex_token (lexer) != T_ID) { - lex_error (_("expecting variable name")); + lex_error (lexer, _("expecting variable name")); return false; } - else if (var_set_lookup_var_idx (vs, tokid, idx)) + else if (var_set_lookup_var_idx (vs, lex_tokid (lexer), idx)) { - lex_get (); + lex_get (lexer); return true; } else { - msg (SE, _("%s is not a variable name."), tokid); + msg (SE, _("%s is not a variable name."), lex_tokid (lexer)); return false; } } @@ -67,41 +70,32 @@ parse_vs_variable_idx (const struct var_set *vs, size_t *idx) if successful. On failure emits an error message and returns a null pointer. */ static struct variable * -parse_vs_variable (const struct var_set *vs) +parse_vs_variable (struct lexer *lexer, const struct var_set *vs) { size_t idx; - return parse_vs_variable_idx (vs, &idx) ? var_set_get_var (vs, idx) : NULL; + return parse_vs_variable_idx (lexer, vs, &idx) ? var_set_get_var (vs, idx) : NULL; } /* Parses a variable name in dictionary D and returns the variable if successful. On failure emits an error message and returns a null pointer. */ struct variable * -parse_dict_variable (const struct dictionary *d) +parse_variable (struct lexer *lexer, const struct dictionary *d) { struct var_set *vs = var_set_create_from_dict (d); - struct variable *var = parse_vs_variable (vs); + struct variable *var = parse_vs_variable (lexer, vs); var_set_destroy (vs); return var; } -/* Parses a variable name in default_dict and returns the - variable if successful. On failure emits an error message and - returns a null pointer. */ -struct variable * -parse_variable (void) -{ - return parse_dict_variable (default_dict); -} - - /* 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 nonzero only if + number of variables into *CNT. Returns true only if successful. */ -int -parse_variables (const struct dictionary *d, struct variable ***var, - size_t *cnt, int opts) +bool +parse_variables (struct lexer *lexer, const struct dictionary *d, + struct variable ***var, + size_t *cnt, int opts) { struct var_set *vs; int success; @@ -111,26 +105,51 @@ parse_variables (const struct dictionary *d, struct variable ***var, assert (cnt != NULL); vs = var_set_create_from_dict (d); - success = parse_var_set_vars (vs, var, cnt, opts); + success = parse_var_set_vars (lexer, vs, var, cnt, opts); if ( success == 0 ) free ( *var ) ; var_set_destroy (vs); return success; } +/* 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 + 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) +{ + int retval; + + /* PV_APPEND is unsafe because parse_variables would free the + existing names on failure, but those names are presumably + already in the pool, which would attempt to re-free it + later. */ + assert (!(opts & PV_APPEND)); + + retval = parse_variables (lexer, dict, vars, var_cnt, opts); + if (retval) + pool_register (pool, free, *vars); + return retval; +} + /* Parses a variable name from VS. If successful, sets *IDX to the variable's index in VS, *CLASS to the variable's - dictionary class, and returns nonzero. Returns zero on + dictionary class, and returns true. Returns false on failure. */ -static int -parse_var_idx_class (const struct var_set *vs, size_t *idx, - enum dict_class *class) +static bool +parse_var_idx_class (struct lexer *lexer, const struct var_set *vs, + size_t *idx, + enum dict_class *class) { - if (!parse_vs_variable_idx (vs, idx)) - return 0; + if (!parse_vs_variable_idx (lexer, vs, idx)) + return false; *class = dict_class_from_id (var_set_get_var (vs, *idx)->name); - return 1; + return true; } /* Add the variable from VS with index IDX to the list of @@ -162,20 +181,16 @@ add_variable (struct variable ***v, size_t *nv, size_t *mv, (*v)[0]->name, add->name, add->name); else if ((pv_opts & PV_NO_DUPLICATE) && included[idx]) msg (SE, _("Variable %s appears twice in variable list."), add->name); - else + else if ((pv_opts & PV_DUPLICATE) || !included[idx]) { if (*nv >= *mv) { *mv = 2 * (*nv + 1); *v = xnrealloc (*v, *mv, sizeof **v); } - - if ((pv_opts & PV_DUPLICATE) || !included[idx]) - { - (*v)[(*nv)++] = add; - if (!(pv_opts & PV_DUPLICATE)) - included[idx] = 1; - } + (*v)[(*nv)++] = add; + if (included != NULL) + included[idx] = 1; } } @@ -197,11 +212,11 @@ add_variables (struct variable ***v, size_t *nv, size_t *mv, char *included, add_variable (v, nv, mv, included, pv_opts, vs, i); } -/* Note that if parse_variables() returns 0, *v is free()'d. - Conversely, if parse_variables() returns non-zero, then *nv is +/* Note that if parse_variables() returns false, *v is free()'d. + Conversely, if parse_variables() returns true, then *nv is nonzero and *v is non-NULL. */ -int -parse_var_set_vars (const struct var_set *vs, +bool +parse_var_set_vars (struct lexer *lexer, const struct var_set *vs, struct variable ***v, size_t *nv, int pv_opts) { @@ -241,20 +256,20 @@ parse_var_set_vars (const struct var_set *vs, else included = NULL; - if (lex_match (T_ALL)) - add_variables (v, nv, &mv, included, pv_opts, - vs, 0, var_set_get_cnt (vs) - 1, DC_ORDINARY); - else + do { - do + if (lex_match (lexer, T_ALL)) + add_variables (v, nv, &mv, included, pv_opts, + vs, 0, var_set_get_cnt (vs) - 1, DC_ORDINARY); + else { enum dict_class class; size_t first_idx; - - if (!parse_var_idx_class (vs, &first_idx, &class)) + + if (!parse_var_idx_class (lexer, vs, &first_idx, &class)) goto fail; - if (!lex_match (T_TO)) + if (!lex_match (lexer, T_TO)) add_variable (v, nv, &mv, included, pv_opts, vs, first_idx); else { @@ -262,7 +277,7 @@ parse_var_set_vars (const struct var_set *vs, enum dict_class last_class; struct variable *first_var, *last_var; - if (!parse_var_idx_class (vs, &last_idx, &last_class)) + if (!parse_var_idx_class (lexer, vs, &last_idx, &last_class)) goto fail; first_var = var_set_get_var (vs, first_idx); @@ -291,13 +306,15 @@ parse_var_set_vars (const struct var_set *vs, add_variables (v, nv, &mv, included, pv_opts, vs, first_idx, last_idx, class); - } - if (pv_opts & PV_SINGLE) - break; - lex_match (','); + } } - while (token == T_ID && var_set_lookup_var (vs, tokid) != NULL); + + if (pv_opts & PV_SINGLE) + break; + lex_match (lexer, ','); } + while (lex_token (lexer) == T_ALL + || (lex_token (lexer) == T_ID && var_set_lookup_var (vs, lex_tokid (lexer)) != NULL)); if (*nv == 0) goto fail; @@ -358,8 +375,8 @@ 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. */ -int -parse_DATA_LIST_vars (char ***names, size_t *nnames, int pv_opts) +bool +parse_DATA_LIST_vars (struct lexer *lexer, char ***names, size_t *nnames, int pv_opts) { int n1, n2; int d1, d2; @@ -385,29 +402,29 @@ parse_DATA_LIST_vars (char ***names, size_t *nnames, int pv_opts) do { - if (token != T_ID) + if (lex_token (lexer) != T_ID) { - lex_error ("expecting variable name"); + lex_error (lexer, "expecting variable name"); goto fail; } - if (dict_class_from_id (tokid) == DC_SCRATCH + if (dict_class_from_id (lex_tokid (lexer)) == DC_SCRATCH && (pv_opts & PV_NO_SCRATCH)) { msg (SE, _("Scratch variables not allowed here.")); goto fail; } - strcpy (name1, tokid); - lex_get (); - if (token == T_TO) + strcpy (name1, lex_tokid (lexer)); + lex_get (lexer); + if (lex_token (lexer) == T_TO) { - lex_get (); - if (token != T_ID) + lex_get (lexer); + if (lex_token (lexer) != T_ID) { - lex_error ("expecting variable name"); + lex_error (lexer, "expecting variable name"); goto fail; } - strcpy (name2, tokid); - lex_get (); + strcpy (name2, lex_tokid (lexer)); + lex_get (lexer); if (!extract_num (name1, root1, &n1, &d1) || !extract_num (name2, root2, &n2, &d2)) @@ -450,12 +467,12 @@ parse_DATA_LIST_vars (char ***names, size_t *nnames, int pv_opts) (*names)[nvar++] = xstrdup (name1); } - lex_match (','); + lex_match (lexer, ','); if (pv_opts & PV_SINGLE) break; } - while (token == T_ID); + while (lex_token (lexer) == T_ID); success = 1; fail: @@ -472,11 +489,46 @@ fail: return success; } +/* Registers each of the NAMES[0...NNAMES - 1] in POOL, as well + as NAMES itself. */ +static void +register_vars_pool (struct pool *pool, char **names, size_t nnames) +{ + size_t i; + + for (i = 0; i < nnames; i++) + pool_register (pool, free, names[i]); + pool_register (pool, free, names); +} + +/* Parses a list of variable names according to the DATA LIST + version of the TO convention. Same args as + parse_DATA_LIST_vars(), except that all allocations are taken + from the given POOL. */ +bool +parse_DATA_LIST_vars_pool (struct lexer *lexer, struct pool *pool, + char ***names, size_t *nnames, int pv_opts) +{ + int retval; + + /* PV_APPEND is unsafe because parse_DATA_LIST_vars would free + the existing names on failure, but those names are + presumably already in the pool, which would attempt to + re-free it later. */ + assert (!(pv_opts & PV_APPEND)); + + retval = parse_DATA_LIST_vars (lexer, names, nnames, pv_opts); + if (retval) + register_vars_pool (pool, *names, *nnames); + return retval; +} + /* Parses a list of variables where some of the variables may be existing and the rest are to be created. Same args as parse_DATA_LIST_vars(). */ -int -parse_mixed_vars (char ***names, size_t *nnames, int pv_opts) +bool +parse_mixed_vars (struct lexer *lexer, const struct dictionary *dict, + char ***names, size_t *nnames, int pv_opts) { size_t i; @@ -489,14 +541,14 @@ parse_mixed_vars (char ***names, size_t *nnames, int pv_opts) *names = NULL; *nnames = 0; } - while (token == T_ID || token == T_ALL) + while (lex_token (lexer) == T_ID || lex_token (lexer) == T_ALL) { - if (token == T_ALL || dict_lookup_var (default_dict, tokid) != NULL) + if (lex_token (lexer) == T_ALL || dict_lookup_var (dict, lex_tokid (lexer)) != NULL) { struct variable **v; size_t nv; - if (!parse_variables (default_dict, &v, &nv, PV_NONE)) + if (!parse_variables (lexer, dict, &v, &nv, PV_NONE)) goto fail; *names = xnrealloc (*names, *nnames + nv, sizeof **names); for (i = 0; i < nv; i++) @@ -504,7 +556,7 @@ parse_mixed_vars (char ***names, size_t *nnames, int pv_opts) free (v); *nnames += nv; } - else if (!parse_DATA_LIST_vars (names, nnames, PV_APPEND)) + else if (!parse_DATA_LIST_vars (lexer, names, nnames, PV_APPEND)) goto fail; } return 1; @@ -520,24 +572,25 @@ fail: /* Parses a list of variables where some of the variables may be existing and the rest are to be created. Same args as - parse_DATA_LIST_vars(), except that all allocations are taken + parse_mixed_vars(), except that all allocations are taken from the given POOL. */ -int -parse_mixed_vars_pool (struct pool *pool, +bool +parse_mixed_vars_pool (struct lexer *lexer, const struct dictionary *dict, struct pool *pool, char ***names, size_t *nnames, int pv_opts) { - int retval = parse_mixed_vars (names, nnames, pv_opts); - if (retval) - { - size_t i; + int retval; - for (i = 0; i < *nnames; i++) - pool_register (pool, free, (*names)[i]); - pool_register (pool, free, *names); - } + /* PV_APPEND is unsafe because parse_mixed_vars_pool would free + the existing names on failure, but those names are + presumably already in the pool, which would attempt to + re-free it later. */ + assert (!(pv_opts & PV_APPEND)); + + retval = parse_mixed_vars (lexer, dict, names, nnames, pv_opts); + if (retval) + register_vars_pool (pool, *names, *nnames); return retval; } - /* A set of variables. */ struct var_set