X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fexpressions%2Fparse.c;h=a9c324bcb55e4b944f32efe0cd7caa7dde8f2620;hb=81579d9e9f994fb2908f50af41c3eb033d216e58;hp=5ae4994484c685362d2daa689e79544c78a9f140;hpb=9f087e7aa4cdff1d5d46d5e188c0017a9d2d0029;p=pspp-builds.git diff --git a/src/language/expressions/parse.c b/src/language/expressions/parse.c index 5ae49944..a9c324bc 100644 --- a/src/language/expressions/parse.c +++ b/src/language/expressions/parse.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 1997-9, 2000, 2006 Free Software Foundation, Inc. + Copyright (C) 1997-9, 2000, 2006, 2010, 2011 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 @@ -23,22 +23,22 @@ #include #include -#include "helpers.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "xalloc.h" +#include "data/case.h" +#include "data/dictionary.h" +#include "data/settings.h" +#include "data/variable.h" +#include "language/expressions/helpers.h" +#include "language/lexer/format-parser.h" +#include "language/lexer/lexer.h" +#include "language/lexer/variable-parser.h" +#include "libpspp/array.h" +#include "libpspp/assertion.h" +#include "libpspp/message.h" +#include "libpspp/misc.h" +#include "libpspp/pool.h" +#include "libpspp/str.h" + +#include "gl/xalloc.h" /* Declarations. */ @@ -344,7 +344,13 @@ type_coercion_core (struct expression *e, { /* Convert numeric to boolean. */ if (do_coercion) - *node = expr_allocate_unary (e, OP_NUM_TO_BOOLEAN, *node); + { + union any_node *op_name; + + op_name = expr_allocate_string (e, ss_cstr (operator_name)); + *node = expr_allocate_binary (e, OP_NUM_TO_BOOLEAN, *node, + op_name); + } return true; } break; @@ -356,7 +362,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, VAR_NUMERIC)) + && fmt_check_type_compat (&(*node)->format.f, VAL_NUMERIC)) { msg_enable (); if (do_coercion) @@ -370,7 +376,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, VAR_NUMERIC)) + && fmt_check_type_compat (&(*node)->format.f, VAL_NUMERIC)) { msg_enable (); if (do_coercion) @@ -493,16 +499,14 @@ match_operator (struct lexer *lexer, const struct operator ops[], size_t op_cnt, const struct operator *op; for (op = ops; op < ops + op_cnt; op++) - { - if (op->token == '-') - lex_negative_to_dash (lexer); - if (lex_match (lexer, op->token)) - { - if (operator != NULL) - *operator = op; - return true; - } - } + if (lex_token (lexer) == op->token) + { + if (op->token != T_NEG_NUM) + lex_get (lexer); + if (operator != NULL) + *operator = op; + return true; + } if (operator != NULL) *operator = NULL; return false; @@ -577,7 +581,7 @@ parse_binary_operators (struct lexer *lexer, struct expression *e, union any_nod } if (op_count > 1 && chain_warning != NULL) - msg (SW, chain_warning); + msg (SW, "%s", chain_warning); return node; } @@ -610,7 +614,7 @@ static union any_node * parse_or (struct lexer *lexer, struct expression *e) { static const struct operator op = - { T_OR, OP_OR, "logical disjunction (\"OR\")" }; + { T_OR, OP_OR, "logical disjunction (`OR')" }; return parse_binary_operators (lexer, e, parse_and (lexer, e), &op, 1, parse_and, NULL); } @@ -620,7 +624,7 @@ static union any_node * parse_and (struct lexer *lexer, struct expression *e) { static const struct operator op = - { T_AND, OP_AND, "logical conjunction (\"AND\")" }; + { T_AND, OP_AND, "logical conjunction (`AND')" }; return parse_binary_operators (lexer, e, parse_not (lexer, e), &op, 1, parse_not, NULL); @@ -631,7 +635,7 @@ static union any_node * parse_not (struct lexer *lexer, struct expression *e) { static const struct operator op - = { T_NOT, OP_NOT, "logical negation (\"NOT\")" }; + = { T_NOT, OP_NOT, "logical negation (`NOT')" }; return parse_inverting_unary_operator (lexer, e, &op, parse_rel); } @@ -640,12 +644,12 @@ static union any_node * parse_rel (struct lexer *lexer, struct expression *e) { const char *chain_warning = - _("Chaining relational operators (e.g. \"a < b < c\") will " + _("Chaining relational operators (e.g. `a < b < c') will " "not produce the mathematically expected result. " "Use the AND logical operator to fix the problem " - "(e.g. \"a < b AND b < c\"). " + "(e.g. `a < b AND b < c'). " "If chaining is really intended, parentheses will disable " - "this warning (e.g. \"(a < b) < c\".)"); + "this warning (e.g. `(a < b) < c'.)"); union any_node *node = parse_add (lexer, e); @@ -659,13 +663,13 @@ parse_rel (struct lexer *lexer, struct expression *e) { static const struct operator ops[] = { - { '=', OP_EQ, "numeric equality (\"=\")" }, - { T_EQ, OP_EQ, "numeric equality (\"EQ\")" }, - { T_GE, OP_GE, "numeric greater-than-or-equal-to (\">=\")" }, - { T_GT, OP_GT, "numeric greater than (\">\")" }, - { T_LE, OP_LE, "numeric less-than-or-equal-to (\"<=\")" }, - { T_LT, OP_LT, "numeric less than (\"<\")" }, - { T_NE, OP_NE, "numeric inequality (\"<>\")" }, + { T_EQUALS, OP_EQ, "numeric equality (`=')" }, + { T_EQ, OP_EQ, "numeric equality (`EQ')" }, + { T_GE, OP_GE, "numeric greater-than-or-equal-to (`>=')" }, + { T_GT, OP_GT, "numeric greater than (`>')" }, + { T_LE, OP_LE, "numeric less-than-or-equal-to (`<=')" }, + { T_LT, OP_LT, "numeric less than (`<')" }, + { T_NE, OP_NE, "numeric inequality (`<>')" }, }; return parse_binary_operators (lexer, e, node, ops, @@ -677,13 +681,13 @@ parse_rel (struct lexer *lexer, struct expression *e) { static const struct operator ops[] = { - { '=', OP_EQ_STRING, "string equality (\"=\")" }, - { T_EQ, OP_EQ_STRING, "string equality (\"EQ\")" }, - { T_GE, OP_GE_STRING, "string greater-than-or-equal-to (\">=\")" }, - { T_GT, OP_GT_STRING, "string greater than (\">\")" }, - { T_LE, OP_LE_STRING, "string less-than-or-equal-to (\"<=\")" }, - { T_LT, OP_LT_STRING, "string less than (\"<\")" }, - { T_NE, OP_NE_STRING, "string inequality (\"<>\")" }, + { T_EQUALS, OP_EQ_STRING, "string equality (`=')" }, + { T_EQ, OP_EQ_STRING, "string equality (`EQ')" }, + { T_GE, OP_GE_STRING, "string greater-than-or-equal-to (`>=')" }, + { T_GT, OP_GT_STRING, "string greater than (`>')" }, + { T_LE, OP_LE_STRING, "string less-than-or-equal-to (`<=')" }, + { T_LT, OP_LT_STRING, "string less than (`<')" }, + { T_NE, OP_NE_STRING, "string inequality (`<>')" }, }; return parse_binary_operators (lexer, e, node, ops, @@ -702,8 +706,9 @@ parse_add (struct lexer *lexer, struct expression *e) { static const struct operator ops[] = { - { '+', OP_ADD, "addition (\"+\")" }, - { '-', OP_SUB, "subtraction (\"-\")" }, + { T_PLUS, OP_ADD, "addition (`+')" }, + { T_DASH, OP_SUB, "subtraction (`-')" }, + { T_NEG_NUM, OP_ADD, "subtraction (`-')" }, }; return parse_binary_operators (lexer, e, parse_mul (lexer, e), @@ -717,8 +722,8 @@ parse_mul (struct lexer *lexer, struct expression *e) { static const struct operator ops[] = { - { '*', OP_MUL, "multiplication (\"*\")" }, - { '/', OP_DIV, "division (\"/\")" }, + { T_ASTERISK, OP_MUL, "multiplication (`*')" }, + { T_SLASH, OP_DIV, "division (`/')" }, }; return parse_binary_operators (lexer, e, parse_neg (lexer, e), @@ -730,7 +735,7 @@ parse_mul (struct lexer *lexer, struct expression *e) static union any_node * parse_neg (struct lexer *lexer, struct expression *e) { - static const struct operator op = { '-', OP_NEG, "negation (\"-\")" }; + static const struct operator op = { T_DASH, OP_NEG, "negation (`-')" }; return parse_inverting_unary_operator (lexer, e, &op, parse_exp); } @@ -738,16 +743,29 @@ static union any_node * parse_exp (struct lexer *lexer, struct expression *e) { static const struct operator op = - { T_EXP, OP_POW, "exponentiation (\"**\")" }; + { T_EXP, OP_POW, "exponentiation (`**')" }; const char *chain_warning = - _("The exponentiation operator (\"**\") is left-associative, " + _("The exponentiation operator (`**') is left-associative, " "even though right-associative semantics are more useful. " - "That is, \"a**b**c\" equals \"(a**b)**c\", not as \"a**(b**c)\". " + "That is, `a**b**c' equals `(a**b)**c', not as `a**(b**c)'. " "To disable this warning, insert parentheses."); - return parse_binary_operators (lexer, e, parse_primary (lexer, e), &op, 1, - parse_primary, chain_warning); + union any_node *lhs, *node; + bool negative = false; + + if (lex_token (lexer) == T_NEG_NUM) + { + lhs = expr_allocate_number (e, -lex_tokval (lexer)); + negative = true; + lex_get (lexer); + } + else + lhs = parse_primary (lexer, e); + + node = parse_binary_operators (lexer, e, lhs, &op, 1, + parse_primary, chain_warning); + return negative ? expr_allocate_unary (e, OP_NEG, node) : node; } /* Parses system variables. */ @@ -801,12 +819,12 @@ parse_sysvar (struct lexer *lexer, struct expression *e) + tm->tm_sec); } else if (lex_match_id (lexer, "$LENGTH")) - return expr_allocate_number (e, get_viewlength ()); + return expr_allocate_number (e, settings_get_viewlength ()); else if (lex_match_id (lexer, "$WIDTH")) - return expr_allocate_number (e, get_viewwidth ()); + return expr_allocate_number (e, settings_get_viewwidth ()); else { - msg (SE, _("Unknown system variable %s."), lex_tokid (lexer)); + msg (SE, _("Unknown system variable %s."), lex_tokcstr (lexer)); return NULL; } } @@ -818,22 +836,22 @@ parse_primary (struct lexer *lexer, struct expression *e) switch (lex_token (lexer)) { case T_ID: - if (lex_look_ahead (lexer) == '(') + if (lex_look_ahead (lexer) == T_LPAREN) { /* An identifier followed by a left parenthesis may be a vector element reference. If not, it's a function call. */ - if (e->ds != NULL && dict_lookup_vector (dataset_dict (e->ds), lex_tokid (lexer)) != NULL) + if (e->ds != NULL && dict_lookup_vector (dataset_dict (e->ds), lex_tokcstr (lexer)) != NULL) return parse_vector_element (lexer, e); else return parse_function (lexer, e); } - else if (lex_tokid (lexer)[0] == '$') + else if (lex_tokcstr (lexer)[0] == '$') { /* $ at the beginning indicates a system variable. */ return parse_sysvar (lexer, e); } - else if (e->ds != NULL && dict_lookup_var (dataset_dict (e->ds), lex_tokid (lexer))) + else if (e->ds != NULL && dict_lookup_var (dataset_dict (e->ds), lex_tokcstr (lexer))) { /* It looks like a user variable. (It could be a format specifier, but we'll assume @@ -854,7 +872,7 @@ parse_primary (struct lexer *lexer, struct expression *e) return expr_allocate_format (e, &fmt); /* All attempts failed. */ - msg (SE, _("Unknown identifier %s."), lex_tokid (lexer)); + msg (SE, _("Unknown identifier %s."), lex_tokcstr (lexer)); return NULL; } break; @@ -870,26 +888,23 @@ parse_primary (struct lexer *lexer, struct expression *e) case T_STRING: { union any_node *node = expr_allocate_string_buffer ( - e, ds_cstr (lex_tokstr (lexer) ), ds_length (lex_tokstr (lexer) )); + e, lex_tokcstr (lexer), ss_length (lex_tokss (lexer))); lex_get (lexer); return node; } - case '(': + case T_LPAREN: { union any_node *node; lex_get (lexer); node = parse_or (lexer, e); - if (node != NULL && !lex_match (lexer, ')')) - { - lex_error (lexer, _("expecting `)'")); - return NULL; - } + if (node != NULL && !lex_force_match (lexer, T_RPAREN)) + return NULL; return node; } default: - lex_error (lexer, _("in expression")); + lex_error (lexer, NULL); return NULL; } } @@ -903,22 +918,22 @@ parse_vector_element (struct lexer *lexer, 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 (dataset_dict (e->ds), lex_tokid (lexer)); + vector = dict_lookup_vector (dataset_dict (e->ds), lex_tokcstr (lexer)); assert (vector != NULL); lex_get (lexer); /* Skip left parenthesis token. The caller must have verified that the lookahead is a left parenthesis. */ - assert (lex_token (lexer) == '('); + assert (lex_token (lexer) == T_LPAREN); lex_get (lexer); element = parse_or (lexer, e); if (!type_coercion (e, OP_number, &element, "vector indexing") - || !lex_match (lexer, ')')) + || !lex_match (lexer, T_RPAREN)) return NULL; - return expr_allocate_binary (e, (vector_get_type (vector) == VAR_NUMERIC + return expr_allocate_binary (e, (vector_get_type (vector) == VAL_NUMERIC ? OP_VEC_ELEM_NUM : OP_VEC_ELEM_STR), element, expr_allocate_vector (e, vector)); } @@ -1018,7 +1033,7 @@ lookup_function (const char *name, } static int -extract_min_valid (char *s) +extract_min_valid (const char *s) { char *p = strrchr (s, '.'); if (p == NULL @@ -1079,7 +1094,7 @@ validate_function_args (const struct operation *f, int arg_cnt, int min_valid) && array_arg_cnt % f->array_granularity != 0) { if (f->array_granularity == 2) - msg (SE, _("%s must have even number of arguments in list."), + msg (SE, _("%s must have an even number of arguments in list."), f->prototype); else msg (SE, _("%s must have multiple of %d arguments in list."), @@ -1146,7 +1161,7 @@ put_invocation (struct string *s, ds_put_cstr (s, ", "); ds_put_cstr (s, operations[expr_node_returns (args[i])].prototype); } - ds_put_char (s, ')'); + ds_put_byte (s, ')'); } static void @@ -1173,7 +1188,7 @@ no_match (const char *func_name, for (f = first; f < last; f++) ds_put_format (&s, "\n%s", f->prototype); } - ds_put_char (&s, '.'); + ds_put_byte (&s, '.'); msg (SE, "%s", ds_cstr (&s)); @@ -1194,17 +1209,17 @@ parse_function (struct lexer *lexer, struct expression *e) union any_node *n; - 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)) + ds_init_substring (&func_name, lex_tokss (lexer)); + min_valid = extract_min_valid (lex_tokcstr (lexer)); + if (!lookup_function (lex_tokcstr (lexer), &first, &last)) { - msg (SE, _("No function or vector named %s."), ds_cstr (lex_tokstr (lexer))); + msg (SE, _("No function or vector named %s."), lex_tokcstr (lexer)); ds_destroy (&func_name); return NULL; } lex_get (lexer); - if (!lex_force_match (lexer, '(')) + if (!lex_force_match (lexer, T_LPAREN)) { ds_destroy (&func_name); return NULL; @@ -1212,11 +1227,11 @@ parse_function (struct lexer *lexer, struct expression *e) args = NULL; arg_cnt = arg_cap = 0; - if (lex_token (lexer) != ')') + if (lex_token (lexer) != T_RPAREN) for (;;) { if (lex_token (lexer) == T_ID - && toupper (lex_look_ahead (lexer)) == 'T') + && toupper (lex_look_ahead (lexer)) == T_ID) { const struct variable **vars; size_t var_cnt; @@ -1237,9 +1252,9 @@ parse_function (struct lexer *lexer, struct expression *e) add_arg (&args, &arg_cnt, &arg_cap, arg); } - if (lex_match (lexer, ')')) + if (lex_match (lexer, T_RPAREN)) break; - else if (!lex_match (lexer, ',')) + else if (!lex_match (lexer, T_COMMA)) { lex_error (lexer, _("expecting `,' or `)' invoking %s function"), first->name); @@ -1260,7 +1275,7 @@ parse_function (struct lexer *lexer, struct expression *e) if (!validate_function_args (f, arg_cnt, min_valid)) goto fail; - if ((f->flags & OPF_EXTENSION) && get_syntax () == COMPATIBLE) + if ((f->flags & OPF_EXTENSION) && settings_get_syntax () == COMPATIBLE) msg (SW, _("%s is a PSPP extension."), f->prototype); if (f->flags & OPF_UNIMPLEMENTED) {