Skip to content

Commit 2a4405a

Browse files
committed
rewrote some lookaheads
1 parent 7dd857e commit 2a4405a

File tree

1 file changed

+4
-12
lines changed

1 file changed

+4
-12
lines changed

src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1941,7 +1941,7 @@ Expression ComparisonItem() :
19411941
{
19421942
(
19431943
retval=AllComparisonExpression()
1944-
| LOOKAHEAD(AnyComparisonExpression()) retval=AnyComparisonExpression()
1944+
| LOOKAHEAD(3) retval=AnyComparisonExpression()
19451945
| LOOKAHEAD(3) retval=SimpleExpression()
19461946
| retval=RowConstructor()
19471947
)
@@ -2074,10 +2074,7 @@ Expression MultiplicativeExpression():
20742074
}
20752075
{
20762076
(
2077-
//LOOKAHEAD(2)
2078-
leftExpression=BitwiseXor()
2079-
// |
2080-
// "(" leftExpression=ConcatExpression() ")" {leftExpression = new Parenthesis(leftExpression); }
2077+
leftExpression=BitwiseXor()
20812078
)
20822079
{ result = leftExpression; }
20832080
(
@@ -2086,12 +2083,7 @@ Expression MultiplicativeExpression():
20862083
| "%" { result = new Modulo(); }
20872084
)
20882085

2089-
(
2090-
//LOOKAHEAD(2)
2091-
rightExpression=BitwiseXor()
2092-
// |
2093-
// "(" rightExpression=ConcatExpression() ")" {rightExpression = new Parenthesis(rightExpression); }
2094-
)
2086+
rightExpression=BitwiseXor()
20952087

20962088
{
20972089
BinaryExpression binExp = (BinaryExpression) result;
@@ -2153,7 +2145,7 @@ Expression PrimaryExpression():
21532145

21542146
| LOOKAHEAD(WithinGroupExpression()) retval=WithinGroupExpression()
21552147

2156-
| LOOKAHEAD(ExtractExpression()) retval=ExtractExpression()
2148+
| LOOKAHEAD(3) retval=ExtractExpression()
21572149

21582150
| retval=MySQLGroupConcat()
21592151

0 commit comments

Comments
 (0)