Skip to content

Commit 05a6f4b

Browse files
committed
1 parent b2c6097 commit 05a6f4b

File tree

1 file changed

+7
-12
lines changed

1 file changed

+7
-12
lines changed

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

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2555,13 +2555,12 @@ Expression OrExpression():
25552555
{
25562556
left=AndExpression() { result = left; }
25572557
(
2558-
LOOKAHEAD(<K_OR>)
2559-
<K_OR>
2560-
right=AndExpression()
2561-
{
2562-
result = new OrExpression(left, right);
2563-
left = result;
2564-
}
2558+
<K_OR>
2559+
right=AndExpression()
2560+
{
2561+
result = new OrExpression(left, right);
2562+
left = result;
2563+
}
25652564
)*
25662565
{
25672566
return result;
@@ -2577,7 +2576,7 @@ Expression AndExpression() :
25772576
}
25782577
{
25792578
(
2580-
LOOKAHEAD(Condition())
2579+
LOOKAHEAD(Condition())
25812580
left=Condition()
25822581
|
25832582
[ <K_NOT> { not=true; } | "!" { not=true; exclamationMarkNot=true; } ]
@@ -2618,7 +2617,6 @@ Expression Condition():
26182617
(
26192618
LOOKAHEAD(RegularCondition()) result=RegularCondition()
26202619
| result=SQLCondition()
2621-
//| result=SimpleExpression()
26222620
)
26232621

26242622
{ return not?new NotExpression(result, exclamationMarkNot):result; }
@@ -3755,9 +3753,6 @@ Function InternalFunction(Function retval) :
37553753
boolean ignoreNulls = false;
37563754
}
37573755
{
3758-
/*funcName=RelObjectNameExt()
3759-
[ "." tmp=RelObjectNameExt() { funcName+= "." + tmp; } ["." tmp=RelObjectNameExt() { funcName+= "." + tmp; }]]
3760-
*/
37613756
funcName = RelObjectNameList()
37623757

37633758
"(" [ [ LOOKAHEAD(2)(<K_DISTINCT> { retval.setDistinct(true); } | <K_ALL> { retval.setAllColumns(true); }) ]

0 commit comments

Comments
 (0)