X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fexpressions%2Fparse.c;h=5c1e4632fd5105d50ea840d4fdb93381dc9f11ec;hb=9491a8bd354152d3a228e1bf041c7ad6228750d7;hp=0c89be63be1daf290298dee99564b8c9f97476bf;hpb=3816248a008a4af75aac6319d0c9929cb7ff679e;p=pspp-builds.git diff --git a/src/language/expressions/parse.c b/src/language/expressions/parse.c index 0c89be63..5c1e4632 100644 --- a/src/language/expressions/parse.c +++ b/src/language/expressions/parse.c @@ -1,6 +1,5 @@ /* PSPP - computes sample statistics. 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 modify it under the terms of the GNU General Public License as @@ -358,7 +357,7 @@ type_coercion_core (struct expression *e, msg_disable (); if ((*node)->type == OP_format && fmt_check_input (&(*node)->format.f) - && fmt_check_type_compat (&(*node)->format.f, NUMERIC)) + && fmt_check_type_compat (&(*node)->format.f, VAR_NUMERIC)) { msg_enable (); if (do_coercion) @@ -372,7 +371,7 @@ type_coercion_core (struct expression *e, msg_disable (); if ((*node)->type == OP_format && fmt_check_output (&(*node)->format.f) - && fmt_check_type_compat (&(*node)->format.f, NUMERIC)) + && fmt_check_type_compat (&(*node)->format.f, VAR_NUMERIC)) { msg_enable (); if (do_coercion) @@ -400,6 +399,15 @@ type_coercion_core (struct expression *e, } break; + case OP_var: + if ((*node)->type == OP_NUM_VAR || (*node)->type == OP_STR_VAR) + { + if (do_coercion) + *node = (*node)->composite.args[0]; + return true; + } + break; + case OP_pos_int: if ((*node)->type == OP_number && floor ((*node)->number.n) == (*node)->number.n @@ -456,6 +464,16 @@ is_coercible (atom_type required_type, union any_node *const *node) (union any_node **) node, NULL, false); } +/* Returns true if ACTUAL_TYPE is a kind of REQUIRED_TYPE, false + otherwise. */ +static bool +is_compatible (atom_type required_type, atom_type actual_type) +{ + return (required_type == actual_type + || (required_type == OP_var + && (actual_type == OP_num_var || actual_type == OP_str_var))); +} + /* How to parse an operator. */ struct operator { @@ -502,7 +520,7 @@ check_operator (const struct operator *op, int arg_cnt, atom_type arg_type) assert (o->arg_cnt == arg_cnt); assert ((o->flags & OPF_ARRAY_OPERAND) == 0); for (i = 0; i < arg_cnt; i++) - assert (o->args[i] == arg_type); + assert (is_compatible (arg_type, o->args[i])); return true; } @@ -901,7 +919,7 @@ parse_vector_element (struct lexer *lexer, struct expression *e) || !lex_match (lexer, ')')) return NULL; - return expr_allocate_binary (e, (vector->var[0]->type == NUMERIC + return expr_allocate_binary (e, (vector_get_type (vector) == VAR_NUMERIC ? OP_VEC_ELEM_NUM : OP_VEC_ELEM_STR), element, expr_allocate_vector (e, vector)); } @@ -944,8 +962,11 @@ word_matches (const char **test, const char **name) } static int -compare_names (const char *test, const char *name) +compare_names (const char *test, const char *name, bool abbrev_ok) { + if (!abbrev_ok) + return true; + for (;;) { if (!word_matches (&test, &name)) @@ -956,14 +977,15 @@ compare_names (const char *test, const char *name) } static int -compare_strings (const char *test, const char *name) +compare_strings (const char *test, const char *name, bool abbrev_ok UNUSED) { return strcasecmp (test, name); } static bool lookup_function_helper (const char *name, - int (*compare) (const char *test, const char *name), + int (*compare) (const char *test, const char *name, + bool abbrev_ok), const struct operation **first, const struct operation **last) { @@ -971,11 +993,12 @@ lookup_function_helper (const char *name, for (f = operations + OP_function_first; f <= operations + OP_function_last; f++) - if (!compare (name, f->name)) + if (!compare (name, f->name, !(f->flags & OPF_NO_ABBREV))) { *first = f; - while (f <= operations + OP_function_last && !compare (name, f->name)) + while (f <= operations + OP_function_last + && !compare (name, f->name, !(f->flags & OPF_NO_ABBREV))) f++; *last = f; @@ -1255,18 +1278,14 @@ parse_function (struct lexer *lexer, struct expression *e) n->composite.min_valid = min_valid != -1 ? min_valid : f->array_min_elems; if (n->type == OP_LAG_Vn || n->type == OP_LAG_Vs) - { - if (dataset_n_lag (e->ds) < 1) - dataset_set_n_lag (e->ds, 1); - } + dataset_need_lag (e->ds, 1); else if (n->type == OP_LAG_Vnn || n->type == OP_LAG_Vsn) { int n_before; assert (n->composite.arg_cnt == 2); assert (n->composite.args[1]->type == OP_pos_int); n_before = n->composite.args[1]->integer.i; - if ( dataset_n_lag (e->ds) < n_before) - dataset_set_n_lag (e->ds, n_before); + dataset_need_lag (e->ds, n_before); } free (args); @@ -1355,13 +1374,13 @@ is_valid_node (union any_node *n) assert (is_composite (n->type)); assert (c->arg_cnt >= op->arg_cnt); for (i = 0; i < op->arg_cnt; i++) - assert (expr_node_returns (c->args[i]) == op->args[i]); + assert (is_compatible (op->args[i], expr_node_returns (c->args[i]))); if (c->arg_cnt > op->arg_cnt && !is_operator (n->type)) { assert (op->flags & OPF_ARRAY_OPERAND); for (i = 0; i < c->arg_cnt; i++) - assert (operations[c->args[i]->type].returns - == op->args[op->arg_cnt - 1]); + assert (is_compatible (op->args[op->arg_cnt - 1], + expr_node_returns (c->args[i]))); } } @@ -1464,7 +1483,7 @@ union any_node * expr_allocate_variable (struct expression *e, struct variable *v) { union any_node *n = pool_alloc (e->expr_pool, sizeof n->variable); - n->type = v->type == NUMERIC ? OP_num_var : OP_str_var; + n->type = var_is_numeric (v) ? OP_num_var : OP_str_var; n->variable.v = v; return n; } @@ -1484,6 +1503,6 @@ static union any_node * allocate_unary_variable (struct expression *e, struct variable *v) { assert (v != NULL); - return expr_allocate_unary (e, v->type == NUMERIC ? OP_NUM_VAR : OP_STR_VAR, + return expr_allocate_unary (e, var_is_numeric (v) ? OP_NUM_VAR : OP_STR_VAR, expr_allocate_variable (e, v)); }