Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
MariaDB
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
d69cc730
Commit
d69cc730
authored
May 21, 2018
by
Alexander Barkov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Cleanup: fixing shift-reduce conflicts in expr/bool_pri/predicate
parent
7ad9b358
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
8 deletions
+14
-8
sql/sql_yacc.yy
sql/sql_yacc.yy
+7
-4
sql/sql_yacc_ora.yy
sql/sql_yacc_ora.yy
+7
-4
No files found.
sql/sql_yacc.yy
View file @
d69cc730
...
@@ -892,10 +892,10 @@ bool my_yyoverflow(short **a, YYSTYPE **b, size_t *yystacksize);
...
@@ -892,10 +892,10 @@ bool my_yyoverflow(short **a, YYSTYPE **b, size_t *yystacksize);
%parse-param { THD *thd }
%parse-param { THD *thd }
%lex-param { THD *thd }
%lex-param { THD *thd }
/*
/*
Currently there are
99
shift/reduce conflicts.
Currently there are
72
shift/reduce conflicts.
We should not introduce new conflicts any more.
We should not introduce new conflicts any more.
*/
*/
%expect
99
%expect
72
/*
/*
Comments for TOKENS.
Comments for TOKENS.
...
@@ -1658,7 +1658,10 @@ bool my_yyoverflow(short **a, YYSTYPE **b, size_t *yystacksize);
...
@@ -1658,7 +1658,10 @@ bool my_yyoverflow(short **a, YYSTYPE **b, size_t *yystacksize);
%left OR_SYM OR2_SYM
%left OR_SYM OR2_SYM
%left XOR
%left XOR
%left AND_SYM AND_AND_SYM
%left AND_SYM AND_AND_SYM
%left PREC_BELOW_NOT
%left NOT_SYM
%left NOT_SYM
%left BETWEEN_SYM CASE_SYM WHEN_SYM THEN_SYM ELSE
%left BETWEEN_SYM CASE_SYM WHEN_SYM THEN_SYM ELSE
%left '=' EQUAL_SYM GE '>' LE '<' NE IS LIKE REGEXP IN_SYM
%left '=' EQUAL_SYM GE '>' LE '<' NE IS LIKE REGEXP IN_SYM
%left '|'
%left '|'
...
@@ -9581,7 +9584,7 @@ expr:
...
@@ -9581,7 +9584,7 @@ expr:
if (unlikely($$ == NULL))
if (unlikely($$ == NULL))
MYSQL_YYABORT;
MYSQL_YYABORT;
}
}
| bool_pri
| bool_pri
%prec PREC_BELOW_NOT
;
;
bool_pri:
bool_pri:
...
@@ -9717,7 +9720,7 @@ predicate:
...
@@ -9717,7 +9720,7 @@ predicate:
if (unlikely($$ == NULL))
if (unlikely($$ == NULL))
MYSQL_YYABORT;
MYSQL_YYABORT;
}
}
| bit_expr
| bit_expr
%prec PREC_BELOW_NOT
;
;
bit_expr:
bit_expr:
...
...
sql/sql_yacc_ora.yy
View file @
d69cc730
...
@@ -284,10 +284,10 @@ bool my_yyoverflow(short **a, YYSTYPE **b, size_t *yystacksize);
...
@@ -284,10 +284,10 @@ bool my_yyoverflow(short **a, YYSTYPE **b, size_t *yystacksize);
%parse-param { THD *thd }
%parse-param { THD *thd }
%lex-param { THD *thd }
%lex-param { THD *thd }
/*
/*
Currently there are
99
shift/reduce conflicts.
Currently there are
73
shift/reduce conflicts.
We should not introduce new conflicts any more.
We should not introduce new conflicts any more.
*/
*/
%expect
99
%expect
73
/*
/*
Comments for TOKENS.
Comments for TOKENS.
...
@@ -1050,7 +1050,10 @@ bool my_yyoverflow(short **a, YYSTYPE **b, size_t *yystacksize);
...
@@ -1050,7 +1050,10 @@ bool my_yyoverflow(short **a, YYSTYPE **b, size_t *yystacksize);
%left OR_SYM OR2_SYM
%left OR_SYM OR2_SYM
%left XOR
%left XOR
%left AND_SYM AND_AND_SYM
%left AND_SYM AND_AND_SYM
%left PREC_BELOW_NOT
%left NOT_SYM
%left NOT_SYM
%left BETWEEN_SYM CASE_SYM WHEN_SYM THEN_SYM ELSE
%left BETWEEN_SYM CASE_SYM WHEN_SYM THEN_SYM ELSE
%left '=' EQUAL_SYM GE '>' LE '<' NE IS LIKE REGEXP IN_SYM
%left '=' EQUAL_SYM GE '>' LE '<' NE IS LIKE REGEXP IN_SYM
%left '|'
%left '|'
...
@@ -9664,7 +9667,7 @@ expr:
...
@@ -9664,7 +9667,7 @@ expr:
if (unlikely($$ == NULL))
if (unlikely($$ == NULL))
MYSQL_YYABORT;
MYSQL_YYABORT;
}
}
| bool_pri
| bool_pri
%prec PREC_BELOW_NOT
;
;
bool_pri:
bool_pri:
...
@@ -9800,7 +9803,7 @@ predicate:
...
@@ -9800,7 +9803,7 @@ predicate:
if (unlikely($$ == NULL))
if (unlikely($$ == NULL))
MYSQL_YYABORT;
MYSQL_YYABORT;
}
}
| bit_expr
| bit_expr
%prec PREC_BELOW_NOT
;
;
bit_expr:
bit_expr:
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment