X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=src%2Flanguage%2Flexer%2Fvariable-parser.c;h=2cb54f7a542eae4cb7c486dc899c9b62d168951d;hb=888d0f91d57e0c3c5a4206c30ac71eb87bf44227;hp=2de98829bbc06f828eabc12299469e098612a65a;hpb=244ade48f9c233532cc535d3233fdef53bf9266b;p=pspp-builds.git diff --git a/src/language/lexer/variable-parser.c b/src/language/lexer/variable-parser.c index 2de98829..2cb54f7a 100644 --- a/src/language/lexer/variable-parser.c +++ b/src/language/lexer/variable-parser.c @@ -44,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; } } @@ -69,20 +70,20 @@ 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_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; } @@ -92,8 +93,9 @@ parse_variable (const struct dictionary *d) number of variables into *CNT. Returns true only if successful. */ bool -parse_variables (const struct dictionary *d, struct variable ***var, - size_t *cnt, int opts) +parse_variables (struct lexer *lexer, const struct dictionary *d, + struct variable ***var, + size_t *cnt, int opts) { struct var_set *vs; int success; @@ -103,7 +105,7 @@ 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); @@ -116,8 +118,9 @@ parse_variables (const struct dictionary *d, struct variable ***var, successful. Same behavior as parse_variables, except that all allocations are taken from the given POOL. */ bool -parse_variables_pool (struct pool *pool, const struct dictionary *dict, - struct variable ***vars, size_t *var_cnt, int opts) +parse_variables_pool (struct lexer *lexer, struct pool *pool, + const struct dictionary *dict, + struct variable ***vars, size_t *var_cnt, int opts) { int retval; @@ -127,7 +130,7 @@ parse_variables_pool (struct pool *pool, const struct dictionary *dict, later. */ assert (!(opts & PV_APPEND)); - retval = parse_variables (dict, vars, var_cnt, opts); + retval = parse_variables (lexer, dict, vars, var_cnt, opts); if (retval) pool_register (pool, free, *vars); return retval; @@ -138,13 +141,14 @@ parse_variables_pool (struct pool *pool, const struct dictionary *dict, dictionary class, and returns true. Returns false on failure. */ static bool -parse_var_idx_class (const struct var_set *vs, size_t *idx, - enum dict_class *class) +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)) + if (!parse_vs_variable_idx (lexer, vs, idx)) return false; - *class = dict_class_from_id (var_set_get_var (vs, *idx)->name); + *class = dict_class_from_id (var_get_name (var_set_get_var (vs, *idx))); return true; } @@ -159,24 +163,26 @@ add_variable (struct variable ***v, size_t *nv, size_t *mv, const struct var_set *vs, size_t idx) { struct variable *add = var_set_get_var (vs, idx); + const char *add_name = var_get_name (add); - if ((pv_opts & PV_NUMERIC) && add->type != NUMERIC) + if ((pv_opts & PV_NUMERIC) && !var_is_numeric (add)) msg (SW, _("%s is not a numeric variable. It will not be " - "included in the variable list."), add->name); - else if ((pv_opts & PV_STRING) && add->type != ALPHA) + "included in the variable list."), add_name); + else if ((pv_opts & PV_STRING) && !var_is_alpha (add)) msg (SE, _("%s is not a string variable. It will not be " - "included in the variable list."), add->name); + "included in the variable list."), add_name); else if ((pv_opts & PV_NO_SCRATCH) - && dict_class_from_id (add->name) == DC_SCRATCH) + && dict_class_from_id (add_name) == DC_SCRATCH) msg (SE, _("Scratch variables (such as %s) are not allowed " - "here."), add->name); - else if ((pv_opts & PV_SAME_TYPE) && *nv && add->type != (*v)[0]->type) + "here."), add_name); + else if ((pv_opts & PV_SAME_TYPE) && *nv + && var_get_type (add) != var_get_type ((*v)[0])) msg (SE, _("%s and %s are not the same type. All variables in " "this variable list must be of the same type. %s " "will be omitted from list."), - (*v)[0]->name, add->name, add->name); + var_get_name ((*v)[0]), add_name, add_name); else if ((pv_opts & PV_NO_DUPLICATE) && included[idx]) - msg (SE, _("Variable %s appears twice in variable list."), add->name); + msg (SE, _("Variable %s appears twice in variable list."), add_name); else if ((pv_opts & PV_DUPLICATE) || !included[idx]) { if (*nv >= *mv) @@ -204,7 +210,7 @@ add_variables (struct variable ***v, size_t *nv, size_t *mv, char *included, size_t i; for (i = first_idx; i <= last_idx; i++) - if (dict_class_from_id (var_set_get_var (vs, i)->name) == class) + if (dict_class_from_id (var_get_name (var_set_get_var (vs, i))) == class) add_variable (v, nv, mv, included, pv_opts, vs, i); } @@ -212,7 +218,7 @@ add_variables (struct variable ***v, size_t *nv, size_t *mv, char *included, Conversely, if parse_variables() returns true, then *nv is nonzero and *v is non-NULL. */ bool -parse_var_set_vars (const struct var_set *vs, +parse_var_set_vars (struct lexer *lexer, const struct var_set *vs, struct variable ***v, size_t *nv, int pv_opts) { @@ -254,7 +260,7 @@ parse_var_set_vars (const struct var_set *vs, do { - if (lex_match (T_ALL)) + 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 @@ -262,10 +268,10 @@ parse_var_set_vars (const struct var_set *vs, 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 { @@ -273,7 +279,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); @@ -281,10 +287,11 @@ parse_var_set_vars (const struct var_set *vs, if (last_idx < first_idx) { + const char *first_name = var_get_name (first_var); + const char *last_name = var_get_name (last_var); msg (SE, _("%s TO %s is not valid syntax since %s " "precedes %s in the dictionary."), - first_var->name, last_var->name, - first_var->name, last_var->name); + first_name, last_name, first_name, last_name); goto fail; } @@ -295,8 +302,9 @@ parse_var_set_vars (const struct var_set *vs, "the same variable dictionaries, of either " "ordinary, scratch, or system variables. " "%s is a %s variable, whereas %s is %s."), - first_var->name, dict_class_to_name (class), - last_var->name, dict_class_to_name (last_class)); + var_get_name (first_var), dict_class_to_name (class), + var_get_name (last_var), + dict_class_to_name (last_class)); goto fail; } @@ -307,10 +315,10 @@ parse_var_set_vars (const struct var_set *vs, if (pv_opts & PV_SINGLE) break; - lex_match (','); + lex_match (lexer, ','); } - while (token == T_ALL - || (token == T_ID && var_set_lookup_var (vs, tokid) != NULL)); + 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; @@ -372,7 +380,7 @@ 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 (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; @@ -398,29 +406,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)) @@ -463,12 +471,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: @@ -502,7 +510,7 @@ register_vars_pool (struct pool *pool, char **names, size_t nnames) parse_DATA_LIST_vars(), except that all allocations are taken from the given POOL. */ bool -parse_DATA_LIST_vars_pool (struct pool *pool, +parse_DATA_LIST_vars_pool (struct lexer *lexer, struct pool *pool, char ***names, size_t *nnames, int pv_opts) { int retval; @@ -513,7 +521,7 @@ parse_DATA_LIST_vars_pool (struct pool *pool, re-free it later. */ assert (!(pv_opts & PV_APPEND)); - retval = parse_DATA_LIST_vars (names, nnames, pv_opts); + retval = parse_DATA_LIST_vars (lexer, names, nnames, pv_opts); if (retval) register_vars_pool (pool, *names, *nnames); return retval; @@ -523,7 +531,7 @@ parse_DATA_LIST_vars_pool (struct pool *pool, existing and the rest are to be created. Same args as parse_DATA_LIST_vars(). */ bool -parse_mixed_vars (const struct dictionary *dict, +parse_mixed_vars (struct lexer *lexer, const struct dictionary *dict, char ***names, size_t *nnames, int pv_opts) { size_t i; @@ -537,22 +545,22 @@ parse_mixed_vars (const struct dictionary *dict, *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 (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 (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++) - (*names)[*nnames + i] = xstrdup (v[i]->name); + (*names)[*nnames + i] = xstrdup (var_get_name (v[i])); 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; @@ -571,7 +579,7 @@ fail: parse_mixed_vars(), except that all allocations are taken from the given POOL. */ bool -parse_mixed_vars_pool (const struct dictionary *dict, struct pool *pool, +parse_mixed_vars_pool (struct lexer *lexer, const struct dictionary *dict, struct pool *pool, char ***names, size_t *nnames, int pv_opts) { int retval; @@ -582,7 +590,7 @@ parse_mixed_vars_pool (const struct dictionary *dict, struct pool *pool, re-free it later. */ assert (!(pv_opts & PV_APPEND)); - retval = parse_mixed_vars (dict, names, nnames, pv_opts); + retval = parse_mixed_vars (lexer, dict, names, nnames, pv_opts); if (retval) register_vars_pool (pool, *names, *nnames); return retval;