diff options
| author | Alexander Barkov <bar@mariadb.com> | 2018-05-16 21:58:28 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.com> | 2018-05-16 21:58:28 +0400 |
| commit | 48d7038861599dd2e7c0ae9449ab4fe7ee779a5c (patch) | |
| tree | 70d317bd14666101ad110bac6243d9fa3af2e423 /sql/sql_yacc_ora.yy | |
| parent | c2df4e9d624199db421f6fc1a58e354f3f5dbac8 (diff) | |
| download | mariadb-git-48d7038861599dd2e7c0ae9449ab4fe7ee779a5c.tar.gz | |
Token precedence cleanup in *.yy
We'll be fixing soon shift-reduce conflicts introduced in the new
10.3 syntax (see MDEV-15818 for details) by defining precedence for
a number of tokens (e.g. TIMESTAMP, TRANSACTION_SYM, TEXT_STRING)
and adding "%prec" directives.
Before doing this, it's better to have the existing precedences set properly,
for easier readability and maintainability.
Details:
- Changing precedence of NOT to its proper position (between AND and IS).
It was wrong. It worked fine only because the relevant grammar reside
in different separate rules (expr and predicate).
- Moving NOT2_SYM and BINARY to the same line with NEG and ~
It worked fine because operators !, BINARY, ~ do not conflict
to each other.
- Fixing associativity of NOT_SYM, NOT2_SYM, BINARY, COLLATE_SYM
from "right" to "left". They are not dyadic (operate on a single expression
only). So "%left" or "%right" is needed only to set precedence,
while associativity does not matter.
Note, it would be better to use "%precedence" for these tokens
instead of "%left" though, but we use an old version of Bison on windows,
which may not support %precedence yet.
This patch does not change behavior. The generated sql_yacc.cc and
sql_yacc_ora.cc are exactly the same before and after this change.
Diffstat (limited to 'sql/sql_yacc_ora.yy')
| -rw-r--r-- | sql/sql_yacc_ora.yy | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/sql_yacc_ora.yy b/sql/sql_yacc_ora.yy index 736837b9ca1..c112c215c20 100644 --- a/sql/sql_yacc_ora.yy +++ b/sql/sql_yacc_ora.yy @@ -1044,6 +1044,7 @@ bool my_yyoverflow(short **a, YYSTYPE **b, size_t *yystacksize); %left OR_SYM OR2_SYM %left XOR %left AND_SYM AND_AND_SYM +%left NOT_SYM %left BETWEEN_SYM CASE_SYM WHEN_SYM THEN_SYM ELSE %left '=' EQUAL_SYM GE '>' LE '<' NE IS LIKE REGEXP IN_SYM %left '|' @@ -1053,9 +1054,8 @@ bool my_yyoverflow(short **a, YYSTYPE **b, size_t *yystacksize); %left '*' '/' DIV_SYM MOD_SYM %left '^' %left MYSQL_CONCAT_SYM -%left NEG '~' -%right NOT_SYM NOT2_SYM -%right BINARY COLLATE_SYM +%left NEG '~' NOT2_SYM BINARY +%left COLLATE_SYM %type <lex_str> DECIMAL_NUM FLOAT_NUM NUM LONG_NUM |