X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fexpressions%2Fparse.c;h=0c89be63be1daf290298dee99564b8c9f97476bf;hb=3816248a008a4af75aac6319d0c9929cb7ff679e;hp=b4294c16b1dae0d39ee9b4515a43817f7cc038ba;hpb=ca31bef58d82ef1dfdb00a7a65667608ddc6ec9f;p=pspp diff --git a/src/language/expressions/parse.c b/src/language/expressions/parse.c index b4294c16b1..0c89be63be 100644 --- a/src/language/expressions/parse.c +++ b/src/language/expressions/parse.c @@ -1,5 +1,5 @@ /* PSPP - computes sample statistics. - Copyright (C) 1997-9, 2000 Free Software Foundation, Inc. + Copyright (C) 1997-9, 2000, 2006 Free Software Foundation, Inc. Written by Ben Pfaff . This program is free software; you can redistribute it and/or @@ -18,29 +18,34 @@ 02110-1301, USA. */ #include + #include "private.h" + #include #include #include #include -#include -#include + +#include "helpers.h" #include #include -#include -#include "helpers.h" +#include +#include +#include #include +#include +#include +#include +#include +#include #include #include -#include #include -#include -#include /* Declarations. */ /* Recursive descent parser in order of increasing precedence. */ -typedef union any_node *parse_recursively_func (struct expression *); +typedef union any_node *parse_recursively_func (struct lexer *, struct expression *); static parse_recursively_func parse_or, parse_and, parse_not; static parse_recursively_func parse_rel, parse_add, parse_mul; static parse_recursively_func parse_neg, parse_exp; @@ -48,7 +53,7 @@ static parse_recursively_func parse_primary; static parse_recursively_func parse_vector_element, parse_function; /* Utility functions. */ -static struct expression *expr_create (struct dictionary *); +static struct expression *expr_create (struct dataset *ds); atom_type expr_node_returns (const union any_node *); static const char *atom_type_name (atom_type); @@ -68,15 +73,15 @@ static union any_node *allocate_unary_variable (struct expression *, Returns the new expression if successful or a null pointer otherwise. */ struct expression * -expr_parse (struct dictionary *dict, enum expr_type type) +expr_parse (struct lexer *lexer, struct dataset *ds, enum expr_type type) { union any_node *n; struct expression *e; assert (type == EXPR_NUMBER || type == EXPR_STRING || type == EXPR_BOOLEAN); - e = expr_create (dict); - n = parse_or (e); + e = expr_create (ds); + n = parse_or (lexer, e); if (n != NULL && type_check (e, &n, type)) return finish_expression (expr_optimize (n, e), e); else @@ -90,10 +95,12 @@ expr_parse (struct dictionary *dict, enum expr_type type) expr_parse(), and sets up so that destroying POOL will free the expression as well. */ struct expression * -expr_parse_pool (struct pool *pool, - struct dictionary *dict, enum expr_type type) +expr_parse_pool (struct lexer *lexer, + struct pool *pool, + struct dataset *ds, + enum expr_type type) { - struct expression *e = expr_parse (dict, type); + struct expression *e = expr_parse (lexer, ds, type); if (e != NULL) pool_add_subpool (pool, e->expr_pool); return e; @@ -108,13 +115,13 @@ expr_free (struct expression *e) } struct expression * -expr_parse_any (struct dictionary *dict, bool optimize) +expr_parse_any (struct lexer *lexer, struct dataset *ds, bool optimize) { union any_node *n; struct expression *e; - e = expr_create (dict); - n = parse_or (e); + e = expr_create (ds); + n = parse_or (lexer, e); if (n == NULL) { expr_free (e); @@ -167,7 +174,7 @@ atom_type_stack (atom_type type) return ¬_on_stack; default: - abort (); + NOT_REACHED (); } } @@ -271,7 +278,7 @@ type_check (struct expression *e, break; default: - abort (); + NOT_REACHED (); } return true; @@ -345,28 +352,34 @@ type_coercion_core (struct expression *e, break; case OP_format: - abort (); + NOT_REACHED (); case OP_ni_format: + msg_disable (); if ((*node)->type == OP_format - && check_input_specifier (&(*node)->format.f, false) - && check_specifier_type (&(*node)->format.f, NUMERIC, false)) + && fmt_check_input (&(*node)->format.f) + && fmt_check_type_compat (&(*node)->format.f, NUMERIC)) { + msg_enable (); if (do_coercion) (*node)->type = OP_ni_format; return true; } + msg_enable (); break; case OP_no_format: + msg_disable (); if ((*node)->type == OP_format - && check_output_specifier (&(*node)->format.f, false) - && check_specifier_type (&(*node)->format.f, NUMERIC, false)) + && fmt_check_output (&(*node)->format.f) + && fmt_check_type_compat (&(*node)->format.f, NUMERIC)) { + msg_enable (); if (do_coercion) (*node)->type = OP_no_format; return true; } + msg_enable (); break; case OP_num_var: @@ -399,7 +412,7 @@ type_coercion_core (struct expression *e, break; default: - abort (); + NOT_REACHED (); } if (do_coercion) @@ -457,7 +470,7 @@ struct operator On failure, returns false and, if OPERATOR is non-null, sets *OPERATOR to a null pointer. */ static bool -match_operator (const struct operator ops[], size_t op_cnt, +match_operator (struct lexer *lexer, const struct operator ops[], size_t op_cnt, const struct operator **operator) { const struct operator *op; @@ -465,8 +478,8 @@ match_operator (const struct operator ops[], size_t op_cnt, for (op = ops; op < ops + op_cnt; op++) { if (op->token == '-') - lex_negative_to_dash (); - if (lex_match (op->token)) + lex_negative_to_dash (lexer); + if (lex_match (lexer, op->token)) { if (operator != NULL) *operator = op; @@ -517,7 +530,7 @@ get_operand_type (const struct operator *op) is non-null, then it will be issued as a warning if more than one operator/operand pair is parsed. */ static union any_node * -parse_binary_operators (struct expression *e, union any_node *node, +parse_binary_operators (struct lexer *lexer, struct expression *e, union any_node *node, const struct operator ops[], size_t op_cnt, parse_recursively_func *parse_next_level, const char *chain_warning) @@ -530,7 +543,7 @@ parse_binary_operators (struct expression *e, union any_node *node, if (node == NULL) return node; - for (op_count = 0; match_operator (ops, op_cnt, &operator); op_count++) + for (op_count = 0; match_operator (lexer, ops, op_cnt, &operator); op_count++) { union any_node *rhs; @@ -540,7 +553,7 @@ parse_binary_operators (struct expression *e, union any_node *node, /* Parse the right-hand side and coerce to type OPERAND_TYPE. */ - rhs = parse_next_level (e); + rhs = parse_next_level (lexer, e); if (!type_coercion (e, operand_type, &rhs, operator->name)) return NULL; node = expr_allocate_binary (e, operator->type, node, rhs); @@ -553,7 +566,7 @@ parse_binary_operators (struct expression *e, union any_node *node, } static union any_node * -parse_inverting_unary_operator (struct expression *e, +parse_inverting_unary_operator (struct lexer *lexer, struct expression *e, const struct operator *op, parse_recursively_func *parse_next_level) { @@ -563,10 +576,10 @@ parse_inverting_unary_operator (struct expression *e, check_operator (op, 1, get_operand_type (op)); op_count = 0; - while (match_operator (op, 1, NULL)) + while (match_operator (lexer, op, 1, NULL)) op_count++; - node = parse_next_level (e); + node = parse_next_level (lexer, e); if (op_count > 0 && type_coercion (e, get_operand_type (op), &node, op->name) && op_count % 2 != 0) @@ -577,36 +590,37 @@ parse_inverting_unary_operator (struct expression *e, /* Parses the OR level. */ static union any_node * -parse_or (struct expression *e) +parse_or (struct lexer *lexer, struct expression *e) { static const struct operator op = { T_OR, OP_OR, "logical disjunction (\"OR\")" }; - return parse_binary_operators (e, parse_and (e), &op, 1, parse_and, NULL); + return parse_binary_operators (lexer, e, parse_and (lexer, e), &op, 1, parse_and, NULL); } /* Parses the AND level. */ static union any_node * -parse_and (struct expression *e) +parse_and (struct lexer *lexer, struct expression *e) { static const struct operator op = { T_AND, OP_AND, "logical conjunction (\"AND\")" }; - return parse_binary_operators (e, parse_not (e), &op, 1, parse_not, NULL); + return parse_binary_operators (lexer, e, parse_not (lexer, e), + &op, 1, parse_not, NULL); } /* Parses the NOT level. */ static union any_node * -parse_not (struct expression *e) +parse_not (struct lexer *lexer, struct expression *e) { static const struct operator op = { T_NOT, OP_NOT, "logical negation (\"NOT\")" }; - return parse_inverting_unary_operator (e, &op, parse_rel); + return parse_inverting_unary_operator (lexer, e, &op, parse_rel); } /* Parse relational operators. */ static union any_node * -parse_rel (struct expression *e) +parse_rel (struct lexer *lexer, struct expression *e) { const char *chain_warning = _("Chaining relational operators (e.g. \"a < b < c\") will " @@ -616,7 +630,7 @@ parse_rel (struct expression *e) "If chaining is really intended, parentheses will disable " "this warning (e.g. \"(a < b) < c\".)"); - union any_node *node = parse_add (e); + union any_node *node = parse_add (lexer, e); if (node == NULL) return NULL; @@ -637,7 +651,8 @@ parse_rel (struct expression *e) { T_NE, OP_NE, "numeric inequality (\"<>\")" }, }; - return parse_binary_operators (e, node, ops, sizeof ops / sizeof *ops, + return parse_binary_operators (lexer, e, node, ops, + sizeof ops / sizeof *ops, parse_add, chain_warning); } @@ -654,7 +669,8 @@ parse_rel (struct expression *e) { T_NE, OP_NE_STRING, "string inequality (\"<>\")" }, }; - return parse_binary_operators (e, node, ops, sizeof ops / sizeof *ops, + return parse_binary_operators (lexer, e, node, ops, + sizeof ops / sizeof *ops, parse_add, chain_warning); } @@ -665,7 +681,7 @@ parse_rel (struct expression *e) /* Parses the addition and subtraction level. */ static union any_node * -parse_add (struct expression *e) +parse_add (struct lexer *lexer, struct expression *e) { static const struct operator ops[] = { @@ -673,14 +689,14 @@ parse_add (struct expression *e) { '-', OP_SUB, "subtraction (\"-\")" }, }; - return parse_binary_operators (e, parse_mul (e), + return parse_binary_operators (lexer, e, parse_mul (lexer, e), ops, sizeof ops / sizeof *ops, parse_mul, NULL); } /* Parses the multiplication and division level. */ static union any_node * -parse_mul (struct expression *e) +parse_mul (struct lexer *lexer, struct expression *e) { static const struct operator ops[] = { @@ -688,21 +704,21 @@ parse_mul (struct expression *e) { '/', OP_DIV, "division (\"/\")" }, }; - return parse_binary_operators (e, parse_neg (e), + return parse_binary_operators (lexer, e, parse_neg (lexer, e), ops, sizeof ops / sizeof *ops, parse_neg, NULL); } /* Parses the unary minus level. */ static union any_node * -parse_neg (struct expression *e) +parse_neg (struct lexer *lexer, struct expression *e) { static const struct operator op = { '-', OP_NEG, "negation (\"-\")" }; - return parse_inverting_unary_operator (e, &op, parse_exp); + return parse_inverting_unary_operator (lexer, e, &op, parse_exp); } static union any_node * -parse_exp (struct expression *e) +parse_exp (struct lexer *lexer, struct expression *e) { static const struct operator op = { T_EXP, OP_POW, "exponentiation (\"**\")" }; @@ -713,17 +729,17 @@ parse_exp (struct expression *e) "That is, \"a**b**c\" equals \"(a**b)**c\", not as \"a**(b**c)\". " "To disable this warning, insert parentheses."); - return parse_binary_operators (e, parse_primary (e), &op, 1, + return parse_binary_operators (lexer, e, parse_primary (lexer, e), &op, 1, parse_primary, chain_warning); } /* Parses system variables. */ static union any_node * -parse_sysvar (struct expression *e) +parse_sysvar (struct lexer *lexer, struct expression *e) { - if (lex_match_id ("$CASENUM")) + if (lex_match_id (lexer, "$CASENUM")) return expr_allocate_nullary (e, OP_CASENUM); - else if (lex_match_id ("$DATE")) + else if (lex_match_id (lexer, "$DATE")) { static const char *months[12] = { @@ -731,7 +747,7 @@ parse_sysvar (struct expression *e) "JUL", "AUG", "SEP", "OCT", "NOV", "DEC", }; - time_t last_proc_time = time_of_last_procedure (); + time_t last_proc_time = time_of_last_procedure (e->ds); struct tm *time; char temp_buf[10]; @@ -741,23 +757,23 @@ parse_sysvar (struct expression *e) return expr_allocate_string_buffer (e, temp_buf, strlen (temp_buf)); } - else if (lex_match_id ("$TRUE")) + else if (lex_match_id (lexer, "$TRUE")) return expr_allocate_boolean (e, 1.0); - else if (lex_match_id ("$FALSE")) + else if (lex_match_id (lexer, "$FALSE")) return expr_allocate_boolean (e, 0.0); - else if (lex_match_id ("$SYSMIS")) + else if (lex_match_id (lexer, "$SYSMIS")) return expr_allocate_number (e, SYSMIS); - else if (lex_match_id ("$JDATE")) + else if (lex_match_id (lexer, "$JDATE")) { - time_t time = time_of_last_procedure (); + time_t time = time_of_last_procedure (e->ds); struct tm *tm = localtime (&time); return expr_allocate_number (e, expr_ymd_to_ofs (tm->tm_year + 1900, tm->tm_mon + 1, tm->tm_mday)); } - else if (lex_match_id ("$TIME")) + else if (lex_match_id (lexer, "$TIME")) { - time_t time = time_of_last_procedure (); + time_t time = time_of_last_procedure (e->ds); struct tm *tm = localtime (&time); return expr_allocate_number (e, expr_ymd_to_date (tm->tm_year + 1900, @@ -767,55 +783,61 @@ parse_sysvar (struct expression *e) + tm->tm_min * 60. + tm->tm_sec); } - else if (lex_match_id ("$LENGTH")) + else if (lex_match_id (lexer, "$LENGTH")) return expr_allocate_number (e, get_viewlength ()); - else if (lex_match_id ("$WIDTH")) + else if (lex_match_id (lexer, "$WIDTH")) return expr_allocate_number (e, get_viewwidth ()); else { - msg (SE, _("Unknown system variable %s."), tokid); + msg (SE, _("Unknown system variable %s."), lex_tokid (lexer)); return NULL; } } /* Parses numbers, varnames, etc. */ static union any_node * -parse_primary (struct expression *e) +parse_primary (struct lexer *lexer, struct expression *e) { - switch (token) + switch (lex_token (lexer)) { case T_ID: - if (lex_look_ahead () == '(') + if (lex_look_ahead (lexer) == '(') { /* An identifier followed by a left parenthesis may be a vector element reference. If not, it's a function call. */ - if (e->dict != NULL && dict_lookup_vector (e->dict, tokid) != NULL) - return parse_vector_element (e); + if (e->ds != NULL && dict_lookup_vector (dataset_dict (e->ds), lex_tokid (lexer)) != NULL) + return parse_vector_element (lexer, e); else - return parse_function (e); + return parse_function (lexer, e); } - else if (tokid[0] == '$') + else if (lex_tokid (lexer)[0] == '$') { /* $ at the beginning indicates a system variable. */ - return parse_sysvar (e); + return parse_sysvar (lexer, e); } - else if (e->dict != NULL && dict_lookup_var (e->dict, tokid)) + else if (e->ds != NULL && dict_lookup_var (dataset_dict (e->ds), lex_tokid (lexer))) { /* It looks like a user variable. (It could be a format specifier, but we'll assume it's a variable unless proven otherwise. */ - return allocate_unary_variable (e, parse_dict_variable (e->dict)); + return allocate_unary_variable (e, parse_variable (lexer, dataset_dict (e->ds))); } else { /* Try to parse it as a format specifier. */ struct fmt_spec fmt; - if (parse_format_specifier (&fmt, FMTP_SUPPRESS_ERRORS)) + bool ok; + + msg_disable (); + ok = parse_format_specifier (lexer, &fmt); + msg_enable (); + + if (ok) return expr_allocate_format (e, &fmt); /* All attempts failed. */ - msg (SE, _("Unknown identifier %s."), tokid); + msg (SE, _("Unknown identifier %s."), lex_tokid (lexer)); return NULL; } break; @@ -823,40 +845,40 @@ parse_primary (struct expression *e) case T_POS_NUM: case T_NEG_NUM: { - union any_node *node = expr_allocate_number (e, tokval); - lex_get (); + union any_node *node = expr_allocate_number (e, lex_tokval (lexer) ); + lex_get (lexer); return node; } case T_STRING: { - union any_node *node = expr_allocate_string_buffer (e, ds_c_str (&tokstr), - ds_length (&tokstr)); - lex_get (); + union any_node *node = expr_allocate_string_buffer ( + e, ds_cstr (lex_tokstr (lexer) ), ds_length (lex_tokstr (lexer) )); + lex_get (lexer); return node; } case '(': { union any_node *node; - lex_get (); - node = parse_or (e); - if (node != NULL && !lex_match (')')) + lex_get (lexer); + node = parse_or (lexer, e); + if (node != NULL && !lex_match (lexer, ')')) { - lex_error (_("expecting `)'")); + lex_error (lexer, _("expecting `)'")); return NULL; } return node; } default: - lex_error (_("in expression")); + lex_error (lexer, _("in expression")); return NULL; } } static union any_node * -parse_vector_element (struct expression *e) +parse_vector_element (struct lexer *lexer, struct expression *e) { const struct vector *vector; union any_node *element; @@ -864,19 +886,19 @@ parse_vector_element (struct expression *e) /* Find vector, skip token. The caller must already have verified that the current token is the name of a vector. */ - vector = dict_lookup_vector (default_dict, tokid); + vector = dict_lookup_vector (dataset_dict (e->ds), lex_tokid (lexer)); assert (vector != NULL); - lex_get (); + lex_get (lexer); /* Skip left parenthesis token. The caller must have verified that the lookahead is a left parenthesis. */ - assert (token == '('); - lex_get (); + assert (lex_token (lexer) == '('); + lex_get (lexer); - element = parse_or (e); + element = parse_or (lexer, e); if (!type_coercion (e, OP_number, &element, "vector indexing") - || !lex_match (')')) + || !lex_match (lexer, ')')) return NULL; return expr_allocate_binary (e, (vector->var[0]->type == NUMERIC @@ -886,7 +908,7 @@ parse_vector_element (struct expression *e) /* Individual function parsing. */ -struct operation operations[OP_first + OP_cnt] = { +const struct operation operations[OP_first + OP_cnt] = { #include "parse.inc" }; @@ -945,7 +967,7 @@ lookup_function_helper (const char *name, const struct operation **first, const struct operation **last) { - struct operation *f; + const struct operation *f; for (f = operations + OP_function_first; f <= operations + OP_function_last; f++) @@ -1095,14 +1117,14 @@ put_invocation (struct string *s, { size_t i; - ds_printf (s, "%s(", func_name); + ds_put_format (s, "%s(", func_name); for (i = 0; i < arg_cnt; i++) { if (i > 0) - ds_puts (s, ", "); - ds_puts (s, operations[expr_node_returns (args[i])].prototype); + ds_put_cstr (s, ", "); + ds_put_cstr (s, operations[expr_node_returns (args[i])].prototype); } - ds_putc (s, ')'); + ds_put_char (s, ')'); } static void @@ -1113,31 +1135,31 @@ no_match (const char *func_name, struct string s; const struct operation *f; - ds_init (&s, 128); + ds_init_empty (&s); if (last - first == 1) { - ds_printf (&s, _("Type mismatch invoking %s as "), first->prototype); + ds_put_format (&s, _("Type mismatch invoking %s as "), first->prototype); put_invocation (&s, func_name, args, arg_cnt); } else { - ds_puts (&s, _("Function invocation ")); + ds_put_cstr (&s, _("Function invocation ")); put_invocation (&s, func_name, args, arg_cnt); - ds_puts (&s, _(" does not match any known function. Candidates are:")); + ds_put_cstr (&s, _(" does not match any known function. Candidates are:")); for (f = first; f < last; f++) - ds_printf (&s, "\n%s", f->prototype); + ds_put_format (&s, "\n%s", f->prototype); } - ds_putc (&s, '.'); + ds_put_char (&s, '.'); - msg (SE, "%s", ds_c_str (&s)); + msg (SE, "%s", ds_cstr (&s)); ds_destroy (&s); } static union any_node * -parse_function (struct expression *e) +parse_function (struct lexer *lexer, struct expression *e) { int min_valid; const struct operation *f, *first, *last; @@ -1146,38 +1168,38 @@ parse_function (struct expression *e) int arg_cnt = 0; int arg_cap = 0; - struct fixed_string func_name; + struct string func_name; union any_node *n; - ls_create (&func_name, ds_c_str (&tokstr)); - min_valid = extract_min_valid (ds_c_str (&tokstr)); - if (!lookup_function (ds_c_str (&tokstr), &first, &last)) + ds_init_string (&func_name, lex_tokstr (lexer)); + min_valid = extract_min_valid (ds_cstr (lex_tokstr (lexer))); + if (!lookup_function (ds_cstr (lex_tokstr (lexer)), &first, &last)) { - msg (SE, _("No function or vector named %s."), ds_c_str (&tokstr)); - ls_destroy (&func_name); + msg (SE, _("No function or vector named %s."), ds_cstr (lex_tokstr (lexer))); + ds_destroy (&func_name); return NULL; } - lex_get (); - if (!lex_force_match ('(')) + lex_get (lexer); + if (!lex_force_match (lexer, '(')) { - ls_destroy (&func_name); + ds_destroy (&func_name); return NULL; } args = NULL; arg_cnt = arg_cap = 0; - if (token != ')') + if (lex_token (lexer) != ')') for (;;) { - if (token == T_ID && lex_look_ahead () == 'T') + if (lex_token (lexer) == T_ID && lex_look_ahead (lexer) == 'T') { struct variable **vars; size_t var_cnt; size_t i; - if (!parse_variables (default_dict, &vars, &var_cnt, PV_SINGLE)) + if (!parse_variables (lexer, dataset_dict (e->ds), &vars, &var_cnt, PV_SINGLE)) goto fail; for (i = 0; i < var_cnt; i++) add_arg (&args, &arg_cnt, &arg_cap, @@ -1186,17 +1208,17 @@ parse_function (struct expression *e) } else { - union any_node *arg = parse_or (e); + union any_node *arg = parse_or (lexer, e); if (arg == NULL) goto fail; add_arg (&args, &arg_cnt, &arg_cap, arg); } - if (lex_match (')')) + if (lex_match (lexer, ')')) break; - else if (!lex_match (',')) + else if (!lex_match (lexer, ',')) { - lex_error (_("expecting `,' or `)' invoking %s function"), + lex_error (lexer, _("expecting `,' or `)' invoking %s function"), first->name); goto fail; } @@ -1207,7 +1229,7 @@ parse_function (struct expression *e) break; if (f >= last) { - no_match (ls_c_str (&func_name), args, arg_cnt, first, last); + no_match (ds_cstr (&func_name), args, arg_cnt, first, last); goto fail; } @@ -1222,7 +1244,8 @@ parse_function (struct expression *e) msg (SE, _("%s is not yet implemented."), f->prototype); goto fail; } - if ((f->flags & OPF_PERM_ONLY) && in_temporary_transformations ()) + if ((f->flags & OPF_PERM_ONLY) && + proc_in_temporary_transformations (e->ds)) { msg (SE, _("%s may not appear after TEMPORARY."), f->prototype); goto fail; @@ -1233,8 +1256,8 @@ parse_function (struct expression *e) if (n->type == OP_LAG_Vn || n->type == OP_LAG_Vs) { - if (n_lag < 1) - n_lag = 1; + if (dataset_n_lag (e->ds) < 1) + dataset_set_n_lag (e->ds, 1); } else if (n->type == OP_LAG_Vnn || n->type == OP_LAG_Vsn) { @@ -1242,29 +1265,29 @@ parse_function (struct expression *e) assert (n->composite.arg_cnt == 2); assert (n->composite.args[1]->type == OP_pos_int); n_before = n->composite.args[1]->integer.i; - if (n_lag < n_before) - n_lag = n_before; + if ( dataset_n_lag (e->ds) < n_before) + dataset_set_n_lag (e->ds, n_before); } free (args); - ls_destroy (&func_name); + ds_destroy (&func_name); return n; fail: free (args); - ls_destroy (&func_name); + ds_destroy (&func_name); return NULL; } /* Utility functions. */ static struct expression * -expr_create (struct dictionary *dict) +expr_create (struct dataset *ds) { struct pool *pool = pool_create (); struct expression *e = pool_alloc (pool, sizeof *e); e->expr_pool = pool; - e->dict = dict; + e->ds = ds; e->eval_pool = pool_create_subpool (e->expr_pool); e->ops = NULL; e->op_types = NULL; @@ -1282,7 +1305,7 @@ expr_node_returns (const union any_node *n) else if (is_composite (n->type)) return operations[n->type].returns; else - abort (); + NOT_REACHED (); } static const char * @@ -1318,7 +1341,7 @@ expr_allocate_binary (struct expression *e, operation_type op, static bool is_valid_node (union any_node *n) { - struct operation *op; + const struct operation *op; size_t i; assert (n != NULL); @@ -1422,14 +1445,14 @@ expr_allocate_string_buffer (struct expression *e, { union any_node *n = pool_alloc (e->expr_pool, sizeof n->string); n->type = OP_string; - if (length > 255) - length = 255; + if (length > MAX_STRING) + length = MAX_STRING; n->string.s = copy_string (e, string, length); return n; } union any_node * -expr_allocate_string (struct expression *e, struct fixed_string s) +expr_allocate_string (struct expression *e, struct substring s) { union any_node *n = pool_alloc (e->expr_pool, sizeof n->string); n->type = OP_string;