Remove workaround for ANTLR bug
Issue has already been fixed, so
the workaround of extracting the pattern into a separate rule is no longer
needed.
@@ -246,19 +246,13 @@ expression
;
booleanExpression
- : predicated #booleanDefault
+ : valueExpression predicate[$valueExpression.ctx]? #predicated
| NOT booleanExpression #logicalNot
| left=booleanExpression operator=AND right=booleanExpression #logicalBinary
| left=booleanExpression operator=OR right=booleanExpression #logicalBinary
;
-// workaround for:
-// https://github.com/antlr/antlr4/issues/780
-// https://github.com/antlr/antlr4/issues/781
-predicated
- : valueExpression predicate[$valueExpression.ctx]?
- ;
-
+// workaround for https://github.com/antlr/antlr4/issues/780
predicate[ParserRuleContext value]
: comparisonOperator right=valueExpression #comparison
| comparisonOperator comparisonQuantifier '(' query ')' #quantifiedComparison
