@opra/common 0.10.0 → 0.10.2

package/esm/filter/antlr/OpraFilterParser.js

@@ -1,43 +1,37 @@
 /* eslint-disable */
-// Generated from ../antlr/OpraFilter.g4 by ANTLR 4.9.0-SNAPSHOT
-// noinspection ES6UnusedImports,ExceptionCaughtLocallyJS
-import { ATN } from "antlr4ts/atn/ATN";
-import { ATNDeserializer } from "antlr4ts/atn/ATNDeserializer";
-import { FailedPredicateException } from "antlr4ts/FailedPredicateException";
-import { NoViableAltException } from "antlr4ts/NoViableAltException";
-import { Parser } from "antlr4ts/Parser";
-import { ParserRuleContext } from "antlr4ts/ParserRuleContext";
-import { ParserATNSimulator } from "antlr4ts/atn/ParserATNSimulator";
-import { RecognitionException } from "antlr4ts/RecognitionException";
-import { Token } from "antlr4ts/Token";
-import { VocabularyImpl } from "antlr4ts/VocabularyImpl";
-import * as Utils from "antlr4ts/misc/Utils";
-export class OpraFilterParser extends Parser {
+// Generated from ./src/filter/antlr/OpraFilter.g4 by ANTLR 4.11.2-SNAPSHOT
+// noinspection ES6UnusedImports,JSUnusedGlobalSymbols,JSUnusedLocalSymbols,SpellCheckingInspection
+// @ts-nocheck
+import { ATN, ATNDeserializer, DFA, FailedPredicateException, NoViableAltException, Parser, ParserATNSimulator, ParserRuleContext, PredictionContextCache, RecognitionException, Token } from 'antlr4';
+export default class OpraFilterParser extends Parser {
     constructor(input) {
         super(input);
-        this._interp = new ParserATNSimulator(OpraFilterParser._ATN, this);
+        this._interp = new ParserATNSimulator(this, OpraFilterParser._ATN, OpraFilterParser.DecisionsToDFA, new PredictionContextCache());
     }
-    // @Override
-    // @NotNull
-    get vocabulary() {
-        return OpraFilterParser.VOCABULARY;
+    get grammarFileName() {
+        return "OpraFilter.g4";
+    }
+    get literalNames() {
+        return OpraFilterParser.literalNames;
+    }
+    get symbolicNames() {
+        return OpraFilterParser.symbolicNames;
+    }
+    get ruleNames() {
+        return OpraFilterParser.ruleNames;
+    }
+    get serializedATN() {
+        return OpraFilterParser._serializedATN;
     }
-    // tslint:enable:no-trailing-whitespace
-    // @Override
-    get grammarFileName() { return "OpraFilter.g4"; }
-    // @Override
-    get ruleNames() { return OpraFilterParser.ruleNames; }
-    // @Override
-    get serializedATN() { return OpraFilterParser._serializedATN; }
     createFailedPredicateException(predicate, message) {
         return new FailedPredicateException(this, predicate, message);
     }
     // @RuleVersion(0)
     root() {
-        let _localctx = new RootContext(this._ctx, this.state);
-        this.enterRule(_localctx, 0, OpraFilterParser.RULE_root);
+        let localctx = new RootContext(this, this._ctx, this.state);
+        this.enterRule(localctx, 0, OpraFilterParser.RULE_root);
         try {
-            this.enterOuterAlt(_localctx, 1);
+            this.enterOuterAlt(localctx, 1);
             {
                 this.state = 44;
                 this.expression(0);
@@ -47,7 +41,7 @@ export class OpraFilterParser extends Parser {
         }
         catch (re) {
             if (re instanceof RecognitionException) {
-                _localctx.exception = re;
+                localctx.exception = re;
                 this._errHandler.reportError(this, re);
                 this._errHandler.recover(this, re);
             }
@@ -58,7 +52,7 @@ export class OpraFilterParser extends Parser {
         finally {
             this.exitRule();
         }
-        return _localctx;
+        return localctx;
     }
     // @RuleVersion(0)
     expression(_p) {
@@ -67,55 +61,55 @@ export class OpraFilterParser extends Parser {
         }
         let _parentctx = this._ctx;
         let _parentState = this.state;
-        let _localctx = new ExpressionContext(this._ctx, _parentState);
-        let _prevctx = _localctx;
+        let localctx = new ExpressionContext(this, this._ctx, _parentState);
+        let _prevctx = localctx;
         let _startState = 2;
-        this.enterRecursionRule(_localctx, 2, OpraFilterParser.RULE_expression, _p);
+        this.enterRecursionRule(localctx, 2, OpraFilterParser.RULE_expression, _p);
         let _la;
         try {
             let _alt;
-            this.enterOuterAlt(_localctx, 1);
+            this.enterOuterAlt(localctx, 1);
             {
                 this.state = 67;
                 this._errHandler.sync(this);
                 switch (this._input.LA(1)) {
-                    case OpraFilterParser.T__22:
-                    case OpraFilterParser.T__41:
-                    case OpraFilterParser.T__42:
-                    case OpraFilterParser.T__43:
-                    case OpraFilterParser.T__44:
-                    case OpraFilterParser.T__45:
-                    case OpraFilterParser.DATE:
-                    case OpraFilterParser.DATETIME:
-                    case OpraFilterParser.TIME:
-                    case OpraFilterParser.IDENTIFIER:
-                    case OpraFilterParser.STRING:
-                    case OpraFilterParser.NUMBER:
+                    case 23:
+                    case 42:
+                    case 43:
+                    case 44:
+                    case 45:
+                    case 46:
+                    case 47:
+                    case 48:
+                    case 49:
+                    case 50:
+                    case 51:
+                    case 52:
                         {
-                            _localctx = new TermExpressionContext(_localctx);
-                            this._ctx = _localctx;
-                            _prevctx = _localctx;
+                            localctx = new TermExpressionContext(this, localctx);
+                            this._ctx = localctx;
+                            _prevctx = localctx;
                             this.state = 48;
                             this.term();
                         }
                         break;
-                    case OpraFilterParser.T__35:
-                    case OpraFilterParser.T__36:
+                    case 36:
+                    case 37:
                         {
-                            _localctx = new PolarityExpressionContext(_localctx);
-                            this._ctx = _localctx;
-                            _prevctx = _localctx;
+                            localctx = new PolarityExpressionContext(this, localctx);
+                            this._ctx = localctx;
+                            _prevctx = localctx;
                             this.state = 49;
                             this.polarOp();
                             this.state = 50;
                             this.expression(6);
                         }
                         break;
-                    case OpraFilterParser.T__0:
+                    case 1:
                         {
-                            _localctx = new ParenthesizedExpressionContext(_localctx);
-                            this._ctx = _localctx;
-                            _prevctx = _localctx;
+                            localctx = new ParenthesizedExpressionContext(this, localctx);
+                            this._ctx = localctx;
+                            _prevctx = localctx;
                             this.state = 52;
                             this.match(OpraFilterParser.T__0);
                             this.state = 53;
@@ -124,11 +118,11 @@ export class OpraFilterParser extends Parser {
                             this.match(OpraFilterParser.T__1);
                         }
                         break;
-                    case OpraFilterParser.T__2:
+                    case 3:
                         {
-                            _localctx = new ArrayExpressionContext(_localctx);
-                            this._ctx = _localctx;
-                            _prevctx = _localctx;
+                            localctx = new ArrayExpressionContext(this, localctx);
+                            this._ctx = localctx;
+                            _prevctx = localctx;
                             this.state = 56;
                             this.match(OpraFilterParser.T__2);
                             this.state = 57;
@@ -136,7 +130,7 @@ export class OpraFilterParser extends Parser {
                             this.state = 62;
                             this._errHandler.sync(this);
                             _la = this._input.LA(1);
-                            while (_la === OpraFilterParser.T__3) {
+                            while (_la === 4) {
                                 {
                                     {
                                         this.state = 58;
@@ -156,24 +150,24 @@ export class OpraFilterParser extends Parser {
                     default:
                         throw new NoViableAltException(this);
                 }
-                this._ctx._stop = this._input.tryLT(-1);
+                this._ctx.stop = this._input.LT(-1);
                 this.state = 83;
                 this._errHandler.sync(this);
-                _alt = this.interpreter.adaptivePredict(this._input, 3, this._ctx);
+                _alt = this._interp.adaptivePredict(this._input, 3, this._ctx);
                 while (_alt !== 2 && _alt !== ATN.INVALID_ALT_NUMBER) {
                     if (_alt === 1) {
                         if (this._parseListeners != null) {
                             this.triggerExitRuleEvent();
                         }
-                        _prevctx = _localctx;
+                        _prevctx = localctx;
                         {
                             this.state = 81;
                             this._errHandler.sync(this);
-                            switch (this.interpreter.adaptivePredict(this._input, 2, this._ctx)) {
+                            switch (this._interp.adaptivePredict(this._input, 2, this._ctx)) {
                                 case 1:
                                     {
-                                        _localctx = new ArithmeticExpressionContext(new ExpressionContext(_parentctx, _parentState));
-                                        this.pushNewRecursionContext(_localctx, _startState, OpraFilterParser.RULE_expression);
+                                        localctx = new ArithmeticExpressionContext(this, new ExpressionContext(this, _parentctx, _parentState));
+                                        this.pushNewRecursionContext(localctx, _startState, OpraFilterParser.RULE_expression);
                                         this.state = 69;
                                         if (!(this.precpred(this._ctx, 5))) {
                                             throw this.createFailedPredicateException("this.precpred(this._ctx, 5)");
@@ -186,8 +180,8 @@ export class OpraFilterParser extends Parser {
                                     break;
                                 case 2:
                                     {
-                                        _localctx = new ComparisonExpressionContext(new ExpressionContext(_parentctx, _parentState));
-                                        this.pushNewRecursionContext(_localctx, _startState, OpraFilterParser.RULE_expression);
+                                        localctx = new ComparisonExpressionContext(this, new ExpressionContext(this, _parentctx, _parentState));
+                                        this.pushNewRecursionContext(localctx, _startState, OpraFilterParser.RULE_expression);
                                         this.state = 73;
                                         if (!(this.precpred(this._ctx, 4))) {
                                             throw this.createFailedPredicateException("this.precpred(this._ctx, 4)");
@@ -200,8 +194,8 @@ export class OpraFilterParser extends Parser {
                                     break;
                                 case 3:
                                     {
-                                        _localctx = new LogicalExpressionContext(new ExpressionContext(_parentctx, _parentState));
-                                        this.pushNewRecursionContext(_localctx, _startState, OpraFilterParser.RULE_expression);
+                                        localctx = new LogicalExpressionContext(this, new ExpressionContext(this, _parentctx, _parentState));
+                                        this.pushNewRecursionContext(localctx, _startState, OpraFilterParser.RULE_expression);
                                         this.state = 77;
                                         if (!(this.precpred(this._ctx, 3))) {
                                             throw this.createFailedPredicateException("this.precpred(this._ctx, 3)");
@@ -217,13 +211,13 @@ export class OpraFilterParser extends Parser {
                     }
                     this.state = 85;
                     this._errHandler.sync(this);
-                    _alt = this.interpreter.adaptivePredict(this._input, 3, this._ctx);
+                    _alt = this._interp.adaptivePredict(this._input, 3, this._ctx);
                 }
             }
         }
         catch (re) {
             if (re instanceof RecognitionException) {
-                _localctx.exception = re;
+                localctx.exception = re;
                 this._errHandler.reportError(this, re);
                 this._errHandler.recover(this, re);
             }
@@ -234,44 +228,44 @@ export class OpraFilterParser extends Parser {
         finally {
             this.unrollRecursionContexts(_parentctx);
         }
-        return _localctx;
+        return localctx;
     }
     // @RuleVersion(0)
     term() {
-        let _localctx = new TermContext(this._ctx, this.state);
-        this.enterRule(_localctx, 4, OpraFilterParser.RULE_term);
+        let localctx = new TermContext(this, this._ctx, this.state);
+        this.enterRule(localctx, 4, OpraFilterParser.RULE_term);
         try {
             this.state = 89;
             this._errHandler.sync(this);
             switch (this._input.LA(1)) {
-                case OpraFilterParser.T__41:
-                case OpraFilterParser.T__42:
-                case OpraFilterParser.T__43:
-                case OpraFilterParser.T__44:
-                case OpraFilterParser.T__45:
-                case OpraFilterParser.DATE:
-                case OpraFilterParser.DATETIME:
-                case OpraFilterParser.TIME:
-                case OpraFilterParser.STRING:
-                case OpraFilterParser.NUMBER:
-                    _localctx = new LiteralTermContext(_localctx);
-                    this.enterOuterAlt(_localctx, 1);
+                case 42:
+                case 43:
+                case 44:
+                case 45:
+                case 46:
+                case 47:
+                case 48:
+                case 49:
+                case 51:
+                case 52:
+                    localctx = new LiteralTermContext(this, localctx);
+                    this.enterOuterAlt(localctx, 1);
                     {
                         this.state = 86;
                         this.literal();
                     }
                     break;
-                case OpraFilterParser.IDENTIFIER:
-                    _localctx = new QualifiedIdentifierTermContext(_localctx);
-                    this.enterOuterAlt(_localctx, 2);
+                case 50:
+                    localctx = new QualifiedIdentifierTermContext(this, localctx);
+                    this.enterOuterAlt(localctx, 2);
                     {
                         this.state = 87;
                         this.qualifiedIdentifier();
                     }
                     break;
-                case OpraFilterParser.T__22:
-                    _localctx = new ExternalConstantTermContext(_localctx);
-                    this.enterOuterAlt(_localctx, 3);
+                case 23:
+                    localctx = new ExternalConstantTermContext(this, localctx);
+                    this.enterOuterAlt(localctx, 3);
                     {
                         this.state = 88;
                         this.externalConstant();
@@ -283,7 +277,7 @@ export class OpraFilterParser extends Parser {
         }
         catch (re) {
             if (re instanceof RecognitionException) {
-                _localctx.exception = re;
+                localctx.exception = re;
                 this._errHandler.reportError(this, re);
                 this._errHandler.recover(this, re);
             }
@@ -294,22 +288,22 @@ export class OpraFilterParser extends Parser {
         finally {
             this.exitRule();
         }
-        return _localctx;
+        return localctx;
     }
     // @RuleVersion(0)
     invocable() {
-        let _localctx = new InvocableContext(this._ctx, this.state);
-        this.enterRule(_localctx, 6, OpraFilterParser.RULE_invocable);
+        let localctx = new InvocableContext(this, this._ctx, this.state);
+        this.enterRule(localctx, 6, OpraFilterParser.RULE_invocable);
         try {
-            this.enterOuterAlt(_localctx, 1);
+            this.enterOuterAlt(localctx, 1);
             {
                 this.state = 91;
-                this.function();
+                this.function_();
             }
         }
         catch (re) {
             if (re instanceof RecognitionException) {
-                _localctx.exception = re;
+                localctx.exception = re;
                 this._errHandler.reportError(this, re);
                 this._errHandler.recover(this, re);
             }
@@ -320,15 +314,15 @@ export class OpraFilterParser extends Parser {
         finally {
             this.exitRule();
         }
-        return _localctx;
+        return localctx;
     }
     // @RuleVersion(0)
     invocation() {
-        let _localctx = new InvocationContext(this._ctx, this.state);
-        this.enterRule(_localctx, 8, OpraFilterParser.RULE_invocation);
+        let localctx = new InvocationContext(this, this._ctx, this.state);
+        this.enterRule(localctx, 8, OpraFilterParser.RULE_invocation);
         try {
-            _localctx = new MemberInvocationContext(_localctx);
-            this.enterOuterAlt(_localctx, 1);
+            localctx = new MemberInvocationContext(this, localctx);
+            this.enterOuterAlt(localctx, 1);
             {
                 this.state = 93;
                 this.identifier();
@@ -336,7 +330,7 @@ export class OpraFilterParser extends Parser {
         }
         catch (re) {
             if (re instanceof RecognitionException) {
-                _localctx.exception = re;
+                localctx.exception = re;
                 this._errHandler.reportError(this, re);
                 this._errHandler.recover(this, re);
             }
@@ -347,27 +341,27 @@ export class OpraFilterParser extends Parser {
         finally {
             this.exitRule();
         }
-        return _localctx;
+        return localctx;
     }
     // @RuleVersion(0)
     indexer() {
-        let _localctx = new IndexerContext(this._ctx, this.state);
-        this.enterRule(_localctx, 10, OpraFilterParser.RULE_indexer);
+        let localctx = new IndexerContext(this, this._ctx, this.state);
+        this.enterRule(localctx, 10, OpraFilterParser.RULE_indexer);
         try {
             this.state = 97;
             this._errHandler.sync(this);
             switch (this._input.LA(1)) {
-                case OpraFilterParser.IDENTIFIER:
-                    _localctx = new MemberIndexContext(_localctx);
-                    this.enterOuterAlt(_localctx, 1);
+                case 50:
+                    localctx = new MemberIndexContext(this, localctx);
+                    this.enterOuterAlt(localctx, 1);
                     {
                         this.state = 95;
                         this.identifier();
                     }
                     break;
-                case OpraFilterParser.INTEGER:
-                    _localctx = new NumberIndexContext(_localctx);
-                    this.enterOuterAlt(_localctx, 2);
+                case 53:
+                    localctx = new NumberIndexContext(this, localctx);
+                    this.enterOuterAlt(localctx, 2);
                     {
                         this.state = 96;
                         this.match(OpraFilterParser.INTEGER);
@@ -379,7 +373,7 @@ export class OpraFilterParser extends Parser {
         }
         catch (re) {
             if (re instanceof RecognitionException) {
-                _localctx.exception = re;
+                localctx.exception = re;
                 this._errHandler.reportError(this, re);
                 this._errHandler.recover(this, re);
             }
@@ -390,15 +384,15 @@ export class OpraFilterParser extends Parser {
         finally {
             this.exitRule();
         }
-        return _localctx;
+        return localctx;
     }
     // @RuleVersion(0)
-    function() {
-        let _localctx = new FunctionContext(this._ctx, this.state);
-        this.enterRule(_localctx, 12, OpraFilterParser.RULE_function);
+    function_() {
+        let localctx = new FunctionContext(this, this._ctx, this.state);
+        this.enterRule(localctx, 12, OpraFilterParser.RULE_function);
         let _la;
         try {
-            this.enterOuterAlt(_localctx, 1);
+            this.enterOuterAlt(localctx, 1);
             {
                 this.state = 99;
                 this.identifier();
@@ -407,7 +401,7 @@ export class OpraFilterParser extends Parser {
                 this.state = 102;
                 this._errHandler.sync(this);
                 _la = this._input.LA(1);
-                if ((((_la) & ~0x1F) === 0 && ((1 << _la) & ((1 << OpraFilterParser.T__0) | (1 << OpraFilterParser.T__2) | (1 << OpraFilterParser.T__22))) !== 0) || ((((_la - 36)) & ~0x1F) === 0 && ((1 << (_la - 36)) & ((1 << (OpraFilterParser.T__35 - 36)) | (1 << (OpraFilterParser.T__36 - 36)) | (1 << (OpraFilterParser.T__41 - 36)) | (1 << (OpraFilterParser.T__42 - 36)) | (1 << (OpraFilterParser.T__43 - 36)) | (1 << (OpraFilterParser.T__44 - 36)) | (1 << (OpraFilterParser.T__45 - 36)) | (1 << (OpraFilterParser.DATE - 36)) | (1 << (OpraFilterParser.DATETIME - 36)) | (1 << (OpraFilterParser.TIME - 36)) | (1 << (OpraFilterParser.IDENTIFIER - 36)) | (1 << (OpraFilterParser.STRING - 36)) | (1 << (OpraFilterParser.NUMBER - 36)))) !== 0)) {
+                if ((((_la) & ~0x1F) === 0 && ((1 << _la) & 8388618) !== 0) || ((((_la - 36)) & ~0x1F) === 0 && ((1 << (_la - 36)) & 131011) !== 0)) {
                     {
                         this.state = 101;
                         this.paramList();
@@ -419,7 +413,7 @@ export class OpraFilterParser extends Parser {
         }
         catch (re) {
             if (re instanceof RecognitionException) {
-                _localctx.exception = re;
+                localctx.exception = re;
                 this._errHandler.reportError(this, re);
                 this._errHandler.recover(this, re);
             }
@@ -430,22 +424,22 @@ export class OpraFilterParser extends Parser {
         finally {
             this.exitRule();
         }
-        return _localctx;
+        return localctx;
     }
     // @RuleVersion(0)
     paramList() {
-        let _localctx = new ParamListContext(this._ctx, this.state);
-        this.enterRule(_localctx, 14, OpraFilterParser.RULE_paramList);
+        let localctx = new ParamListContext(this, this._ctx, this.state);
+        this.enterRule(localctx, 14, OpraFilterParser.RULE_paramList);
         let _la;
         try {
-            this.enterOuterAlt(_localctx, 1);
+            this.enterOuterAlt(localctx, 1);
             {
                 this.state = 106;
                 this.expression(0);
                 this.state = 111;
                 this._errHandler.sync(this);
                 _la = this._input.LA(1);
-                while (_la === OpraFilterParser.T__3) {
+                while (_la === 4) {
                     {
                         {
                             this.state = 107;
@@ -462,7 +456,7 @@ export class OpraFilterParser extends Parser {
         }
         catch (re) {
             if (re instanceof RecognitionException) {
-                _localctx.exception = re;
+                localctx.exception = re;
                 this._errHandler.reportError(this, re);
                 this._errHandler.recover(this, re);
             }
@@ -473,46 +467,46 @@ export class OpraFilterParser extends Parser {
         finally {
             this.exitRule();
         }
-        return _localctx;
+        return localctx;
     }
     // @RuleVersion(0)
     unit() {
-        let _localctx = new UnitContext(this._ctx, this.state);
-        this.enterRule(_localctx, 16, OpraFilterParser.RULE_unit);
+        let localctx = new UnitContext(this, this._ctx, this.state);
+        this.enterRule(localctx, 16, OpraFilterParser.RULE_unit);
         try {
             this.state = 117;
             this._errHandler.sync(this);
             switch (this._input.LA(1)) {
-                case OpraFilterParser.T__5:
-                case OpraFilterParser.T__6:
-                case OpraFilterParser.T__7:
-                case OpraFilterParser.T__8:
-                case OpraFilterParser.T__9:
-                case OpraFilterParser.T__10:
-                case OpraFilterParser.T__11:
-                case OpraFilterParser.T__12:
-                    this.enterOuterAlt(_localctx, 1);
+                case 6:
+                case 7:
+                case 8:
+                case 9:
+                case 10:
+                case 11:
+                case 12:
+                case 13:
+                    this.enterOuterAlt(localctx, 1);
                     {
                         this.state = 114;
                         this.dateTimePrecision();
                     }
                     break;
-                case OpraFilterParser.T__13:
-                case OpraFilterParser.T__14:
-                case OpraFilterParser.T__15:
-                case OpraFilterParser.T__16:
-                case OpraFilterParser.T__17:
-                case OpraFilterParser.T__18:
-                case OpraFilterParser.T__19:
-                case OpraFilterParser.T__20:
-                    this.enterOuterAlt(_localctx, 2);
+                case 14:
+                case 15:
+                case 16:
+                case 17:
+                case 18:
+                case 19:
+                case 20:
+                case 21:
+                    this.enterOuterAlt(localctx, 2);
                     {
                         this.state = 115;
                         this.pluralDateTimePrecision();
                     }
                     break;
-                case OpraFilterParser.STRING:
-                    this.enterOuterAlt(_localctx, 3);
+                case 51:
+                    this.enterOuterAlt(localctx, 3);
                     {
                         this.state = 116;
                         this.match(OpraFilterParser.STRING);
@@ -524,7 +518,7 @@ export class OpraFilterParser extends Parser {
         }
         catch (re) {
             if (re instanceof RecognitionException) {
-                _localctx.exception = re;
+                localctx.exception = re;
                 this._errHandler.reportError(this, re);
                 this._errHandler.recover(this, re);
             }
@@ -535,25 +529,22 @@ export class OpraFilterParser extends Parser {
         finally {
             this.exitRule();
         }
-        return _localctx;
+        return localctx;
     }
     // @RuleVersion(0)
     dateTimePrecision() {
-        let _localctx = new DateTimePrecisionContext(this._ctx, this.state);
-        this.enterRule(_localctx, 18, OpraFilterParser.RULE_dateTimePrecision);
+        let localctx = new DateTimePrecisionContext(this, this._ctx, this.state);
+        this.enterRule(localctx, 18, OpraFilterParser.RULE_dateTimePrecision);
         let _la;
         try {
-            this.enterOuterAlt(_localctx, 1);
+            this.enterOuterAlt(localctx, 1);
             {
                 this.state = 119;
                 _la = this._input.LA(1);
-                if (!((((_la) & ~0x1F) === 0 && ((1 << _la) & ((1 << OpraFilterParser.T__5) | (1 << OpraFilterParser.T__6) | (1 << OpraFilterParser.T__7) | (1 << OpraFilterParser.T__8) | (1 << OpraFilterParser.T__9) | (1 << OpraFilterParser.T__10) | (1 << OpraFilterParser.T__11) | (1 << OpraFilterParser.T__12))) !== 0))) {
+                if (!((((_la) & ~0x1F) === 0 && ((1 << _la) & 16320) !== 0))) {
                     this._errHandler.recoverInline(this);
                 }
                 else {
-                    if (this._input.LA(1) === Token.EOF) {
-                        this.matchedEOF = true;
-                    }
                     this._errHandler.reportMatch(this);
                     this.consume();
                 }
@@ -561,7 +552,7 @@ export class OpraFilterParser extends Parser {
         }
         catch (re) {
             if (re instanceof RecognitionException) {
-                _localctx.exception = re;
+                localctx.exception = re;
                 this._errHandler.reportError(this, re);
                 this._errHandler.recover(this, re);
             }
@@ -572,25 +563,22 @@ export class OpraFilterParser extends Parser {
         finally {
             this.exitRule();
         }
-        return _localctx;
+        return localctx;
     }
     // @RuleVersion(0)
     pluralDateTimePrecision() {
-        let _localctx = new PluralDateTimePrecisionContext(this._ctx, this.state);
-        this.enterRule(_localctx, 20, OpraFilterParser.RULE_pluralDateTimePrecision);
+        let localctx = new PluralDateTimePrecisionContext(this, this._ctx, this.state);
+        this.enterRule(localctx, 20, OpraFilterParser.RULE_pluralDateTimePrecision);
         let _la;
         try {
-            this.enterOuterAlt(_localctx, 1);
+            this.enterOuterAlt(localctx, 1);
             {
                 this.state = 121;
                 _la = this._input.LA(1);
-                if (!((((_la) & ~0x1F) === 0 && ((1 << _la) & ((1 << OpraFilterParser.T__13) | (1 << OpraFilterParser.T__14) | (1 << OpraFilterParser.T__15) | (1 << OpraFilterParser.T__16) | (1 << OpraFilterParser.T__17) | (1 << OpraFilterParser.T__18) | (1 << OpraFilterParser.T__19) | (1 << OpraFilterParser.T__20))) !== 0))) {
+                if (!((((_la) & ~0x1F) === 0 && ((1 << _la) & 4177920) !== 0))) {
                     this._errHandler.recoverInline(this);
                 }
                 else {
-                    if (this._input.LA(1) === Token.EOF) {
-                        this.matchedEOF = true;
-                    }
                     this._errHandler.reportMatch(this);
                     this.consume();
                 }
@@ -598,7 +586,7 @@ export class OpraFilterParser extends Parser {
         }
         catch (re) {
             if (re instanceof RecognitionException) {
-                _localctx.exception = re;
+                localctx.exception = re;
                 this._errHandler.reportError(this, re);
                 this._errHandler.recover(this, re);
             }
@@ -609,19 +597,19 @@ export class OpraFilterParser extends Parser {
         finally {
             this.exitRule();
         }
-        return _localctx;
+        return localctx;
     }
     // @RuleVersion(0)
     qualifiedIdentifier() {
-        let _localctx = new QualifiedIdentifierContext(this._ctx, this.state);
-        this.enterRule(_localctx, 22, OpraFilterParser.RULE_qualifiedIdentifier);
+        let localctx = new QualifiedIdentifierContext(this, this._ctx, this.state);
+        this.enterRule(localctx, 22, OpraFilterParser.RULE_qualifiedIdentifier);
         try {
             let _alt;
-            this.enterOuterAlt(_localctx, 1);
+            this.enterOuterAlt(localctx, 1);
             {
                 this.state = 128;
                 this._errHandler.sync(this);
-                _alt = this.interpreter.adaptivePredict(this._input, 9, this._ctx);
+                _alt = this._interp.adaptivePredict(this._input, 9, this._ctx);
                 while (_alt !== 2 && _alt !== ATN.INVALID_ALT_NUMBER) {
                     if (_alt === 1) {
                         {
@@ -635,7 +623,7 @@ export class OpraFilterParser extends Parser {
                     }
                     this.state = 130;
                     this._errHandler.sync(this);
-                    _alt = this.interpreter.adaptivePredict(this._input, 9, this._ctx);
+                    _alt = this._interp.adaptivePredict(this._input, 9, this._ctx);
                 }
                 this.state = 131;
                 this.identifier();
@@ -643,7 +631,7 @@ export class OpraFilterParser extends Parser {
         }
         catch (re) {
             if (re instanceof RecognitionException) {
-                _localctx.exception = re;
+                localctx.exception = re;
                 this._errHandler.reportError(this, re);
                 this._errHandler.recover(this, re);
             }
@@ -654,27 +642,24 @@ export class OpraFilterParser extends Parser {
         finally {
             this.exitRule();
         }
-        return _localctx;
+        return localctx;
     }
     // @RuleVersion(0)
     externalConstant() {
-        let _localctx = new ExternalConstantContext(this._ctx, this.state);
-        this.enterRule(_localctx, 24, OpraFilterParser.RULE_externalConstant);
+        let localctx = new ExternalConstantContext(this, this._ctx, this.state);
+        this.enterRule(localctx, 24, OpraFilterParser.RULE_externalConstant);
         let _la;
         try {
-            this.enterOuterAlt(_localctx, 1);
+            this.enterOuterAlt(localctx, 1);
             {
                 this.state = 133;
                 this.match(OpraFilterParser.T__22);
                 this.state = 134;
                 _la = this._input.LA(1);
-                if (!(_la === OpraFilterParser.IDENTIFIER || _la === OpraFilterParser.STRING)) {
+                if (!(_la === 50 || _la === 51)) {
                     this._errHandler.recoverInline(this);
                 }
                 else {
-                    if (this._input.LA(1) === Token.EOF) {
-                        this.matchedEOF = true;
-                    }
                     this._errHandler.reportMatch(this);
                     this.consume();
                 }
@@ -682,7 +667,7 @@ export class OpraFilterParser extends Parser {
         }
         catch (re) {
             if (re instanceof RecognitionException) {
-                _localctx.exception = re;
+                localctx.exception = re;
                 this._errHandler.reportError(this, re);
                 this._errHandler.recover(this, re);
             }
@@ -693,14 +678,14 @@ export class OpraFilterParser extends Parser {
         finally {
             this.exitRule();
         }
-        return _localctx;
+        return localctx;
     }
     // @RuleVersion(0)
     identifier() {
-        let _localctx = new IdentifierContext(this._ctx, this.state);
-        this.enterRule(_localctx, 26, OpraFilterParser.RULE_identifier);
+        let localctx = new IdentifierContext(this, this._ctx, this.state);
+        this.enterRule(localctx, 26, OpraFilterParser.RULE_identifier);
         try {
-            this.enterOuterAlt(_localctx, 1);
+            this.enterOuterAlt(localctx, 1);
             {
                 this.state = 136;
                 this.match(OpraFilterParser.IDENTIFIER);
@@ -708,7 +693,7 @@ export class OpraFilterParser extends Parser {
         }
         catch (re) {
             if (re instanceof RecognitionException) {
-                _localctx.exception = re;
+                localctx.exception = re;
                 this._errHandler.reportError(this, re);
                 this._errHandler.recover(this, re);
             }
@@ -719,77 +704,77 @@ export class OpraFilterParser extends Parser {
         finally {
             this.exitRule();
         }
-        return _localctx;
+        return localctx;
     }
     // @RuleVersion(0)
     literal() {
-        let _localctx = new LiteralContext(this._ctx, this.state);
-        this.enterRule(_localctx, 28, OpraFilterParser.RULE_literal);
+        let localctx = new LiteralContext(this, this._ctx, this.state);
+        this.enterRule(localctx, 28, OpraFilterParser.RULE_literal);
         try {
             this.state = 146;
             this._errHandler.sync(this);
             switch (this._input.LA(1)) {
-                case OpraFilterParser.NUMBER:
-                    _localctx = new NumberLiteralContext(_localctx);
-                    this.enterOuterAlt(_localctx, 1);
+                case 52:
+                    localctx = new NumberLiteralContext(this, localctx);
+                    this.enterOuterAlt(localctx, 1);
                     {
                         this.state = 138;
                         this.match(OpraFilterParser.NUMBER);
                     }
                     break;
-                case OpraFilterParser.T__44:
-                case OpraFilterParser.T__45:
-                    _localctx = new InfinityLiteralContext(_localctx);
-                    this.enterOuterAlt(_localctx, 2);
+                case 45:
+                case 46:
+                    localctx = new InfinityLiteralContext(this, localctx);
+                    this.enterOuterAlt(localctx, 2);
                     {
                         this.state = 139;
                         this.infinity();
                     }
                     break;
-                case OpraFilterParser.T__41:
-                case OpraFilterParser.T__42:
-                    _localctx = new BooleanLiteralContext(_localctx);
-                    this.enterOuterAlt(_localctx, 3);
+                case 42:
+                case 43:
+                    localctx = new BooleanLiteralContext(this, localctx);
+                    this.enterOuterAlt(localctx, 3);
                     {
                         this.state = 140;
-                        this.boolean();
+                        this.boolean_();
                     }
                     break;
-                case OpraFilterParser.T__43:
-                    _localctx = new NullLiteralContext(_localctx);
-                    this.enterOuterAlt(_localctx, 4);
+                case 44:
+                    localctx = new NullLiteralContext(this, localctx);
+                    this.enterOuterAlt(localctx, 4);
                     {
                         this.state = 141;
-                        this.null();
+                        this.null_();
                     }
                     break;
-                case OpraFilterParser.DATE:
-                    _localctx = new DateLiteralContext(_localctx);
-                    this.enterOuterAlt(_localctx, 5);
+                case 47:
+                    localctx = new DateLiteralContext(this, localctx);
+                    this.enterOuterAlt(localctx, 5);
                     {
                         this.state = 142;
                         this.match(OpraFilterParser.DATE);
                     }
                     break;
-                case OpraFilterParser.DATETIME:
-                    _localctx = new DateTimeLiteralContext(_localctx);
-                    this.enterOuterAlt(_localctx, 6);
+                case 48:
+                    localctx = new DateTimeLiteralContext(this, localctx);
+                    this.enterOuterAlt(localctx, 6);
                     {
                         this.state = 143;
                         this.match(OpraFilterParser.DATETIME);
                     }
                     break;
-                case OpraFilterParser.TIME:
-                    _localctx = new TimeLiteralContext(_localctx);
-                    this.enterOuterAlt(_localctx, 7);
+                case 49:
+                    localctx = new TimeLiteralContext(this, localctx);
+                    this.enterOuterAlt(localctx, 7);
                     {
                         this.state = 144;
                         this.match(OpraFilterParser.TIME);
                     }
                     break;
-                case OpraFilterParser.STRING:
-                    _localctx = new StringLiteralContext(_localctx);
-                    this.enterOuterAlt(_localctx, 8);
+                case 51:
+                    localctx = new StringLiteralContext(this, localctx);
+                    this.enterOuterAlt(localctx, 8);
                     {
                         this.state = 145;
                         this.match(OpraFilterParser.STRING);
@@ -801,7 +786,7 @@ export class OpraFilterParser extends Parser {
         }
         catch (re) {
             if (re instanceof RecognitionException) {
-                _localctx.exception = re;
+                localctx.exception = re;
                 this._errHandler.reportError(this, re);
                 this._errHandler.recover(this, re);
             }
@@ -812,25 +797,22 @@ export class OpraFilterParser extends Parser {
         finally {
             this.exitRule();
         }
-        return _localctx;
+        return localctx;
     }
     // @RuleVersion(0)
     compOp() {
-        let _localctx = new CompOpContext(this._ctx, this.state);
-        this.enterRule(_localctx, 30, OpraFilterParser.RULE_compOp);
+        let localctx = new CompOpContext(this, this._ctx, this.state);
+        this.enterRule(localctx, 30, OpraFilterParser.RULE_compOp);
         let _la;
         try {
-            this.enterOuterAlt(_localctx, 1);
+            this.enterOuterAlt(localctx, 1);
             {
                 this.state = 148;
                 _la = this._input.LA(1);
-                if (!(((((_la - 24)) & ~0x1F) === 0 && ((1 << (_la - 24)) & ((1 << (OpraFilterParser.T__23 - 24)) | (1 << (OpraFilterParser.T__24 - 24)) | (1 << (OpraFilterParser.T__25 - 24)) | (1 << (OpraFilterParser.T__26 - 24)) | (1 << (OpraFilterParser.T__27 - 24)) | (1 << (OpraFilterParser.T__28 - 24)) | (1 << (OpraFilterParser.T__29 - 24)) | (1 << (OpraFilterParser.T__30 - 24)) | (1 << (OpraFilterParser.T__31 - 24)) | (1 << (OpraFilterParser.T__32 - 24)) | (1 << (OpraFilterParser.T__33 - 24)) | (1 << (OpraFilterParser.T__34 - 24)))) !== 0))) {
+                if (!(((((_la - 24)) & ~0x1F) === 0 && ((1 << (_la - 24)) & 4095) !== 0))) {
                     this._errHandler.recoverInline(this);
                 }
                 else {
-                    if (this._input.LA(1) === Token.EOF) {
-                        this.matchedEOF = true;
-                    }
                     this._errHandler.reportMatch(this);
                     this.consume();
                 }
@@ -838,7 +820,7 @@ export class OpraFilterParser extends Parser {
         }
         catch (re) {
             if (re instanceof RecognitionException) {
-                _localctx.exception = re;
+                localctx.exception = re;
                 this._errHandler.reportError(this, re);
                 this._errHandler.recover(this, re);
             }
@@ -849,25 +831,22 @@ export class OpraFilterParser extends Parser {
         finally {
             this.exitRule();
         }
-        return _localctx;
+        return localctx;
     }
     // @RuleVersion(0)
     arthOp() {
-        let _localctx = new ArthOpContext(this._ctx, this.state);
-        this.enterRule(_localctx, 32, OpraFilterParser.RULE_arthOp);
+        let localctx = new ArthOpContext(this, this._ctx, this.state);
+        this.enterRule(localctx, 32, OpraFilterParser.RULE_arthOp);
         let _la;
         try {
-            this.enterOuterAlt(_localctx, 1);
+            this.enterOuterAlt(localctx, 1);
             {
                 this.state = 150;
                 _la = this._input.LA(1);
-                if (!(((((_la - 36)) & ~0x1F) === 0 && ((1 << (_la - 36)) & ((1 << (OpraFilterParser.T__35 - 36)) | (1 << (OpraFilterParser.T__36 - 36)) | (1 << (OpraFilterParser.T__37 - 36)) | (1 << (OpraFilterParser.T__38 - 36)))) !== 0))) {
+                if (!(((((_la - 36)) & ~0x1F) === 0 && ((1 << (_la - 36)) & 15) !== 0))) {
                     this._errHandler.recoverInline(this);
                 }
                 else {
-                    if (this._input.LA(1) === Token.EOF) {
-                        this.matchedEOF = true;
-                    }
                     this._errHandler.reportMatch(this);
                     this.consume();
                 }
@@ -875,7 +854,7 @@ export class OpraFilterParser extends Parser {
         }
         catch (re) {
             if (re instanceof RecognitionException) {
-                _localctx.exception = re;
+                localctx.exception = re;
                 this._errHandler.reportError(this, re);
                 this._errHandler.recover(this, re);
             }
@@ -886,25 +865,22 @@ export class OpraFilterParser extends Parser {
         finally {
             this.exitRule();
         }
-        return _localctx;
+        return localctx;
     }
     // @RuleVersion(0)
     polarOp() {
-        let _localctx = new PolarOpContext(this._ctx, this.state);
-        this.enterRule(_localctx, 34, OpraFilterParser.RULE_polarOp);
+        let localctx = new PolarOpContext(this, this._ctx, this.state);
+        this.enterRule(localctx, 34, OpraFilterParser.RULE_polarOp);
         let _la;
         try {
-            this.enterOuterAlt(_localctx, 1);
+            this.enterOuterAlt(localctx, 1);
             {
                 this.state = 152;
                 _la = this._input.LA(1);
-                if (!(_la === OpraFilterParser.T__35 || _la === OpraFilterParser.T__36)) {
+                if (!(_la === 36 || _la === 37)) {
                     this._errHandler.recoverInline(this);
                 }
                 else {
-                    if (this._input.LA(1) === Token.EOF) {
-                        this.matchedEOF = true;
-                    }
                     this._errHandler.reportMatch(this);
                     this.consume();
                 }
@@ -912,7 +888,7 @@ export class OpraFilterParser extends Parser {
         }
         catch (re) {
             if (re instanceof RecognitionException) {
-                _localctx.exception = re;
+                localctx.exception = re;
                 this._errHandler.reportError(this, re);
                 this._errHandler.recover(this, re);
             }
@@ -923,25 +899,22 @@ export class OpraFilterParser extends Parser {
         finally {
             this.exitRule();
         }
-        return _localctx;
+        return localctx;
     }
     // @RuleVersion(0)
     logOp() {
-        let _localctx = new LogOpContext(this._ctx, this.state);
-        this.enterRule(_localctx, 36, OpraFilterParser.RULE_logOp);
+        let localctx = new LogOpContext(this, this._ctx, this.state);
+        this.enterRule(localctx, 36, OpraFilterParser.RULE_logOp);
         let _la;
         try {
-            this.enterOuterAlt(_localctx, 1);
+            this.enterOuterAlt(localctx, 1);
             {
                 this.state = 154;
                 _la = this._input.LA(1);
-                if (!(_la === OpraFilterParser.T__39 || _la === OpraFilterParser.T__40)) {
+                if (!(_la === 40 || _la === 41)) {
                     this._errHandler.recoverInline(this);
                 }
                 else {
-                    if (this._input.LA(1) === Token.EOF) {
-                        this.matchedEOF = true;
-                    }
                     this._errHandler.reportMatch(this);
                     this.consume();
                 }
@@ -949,7 +922,7 @@ export class OpraFilterParser extends Parser {
         }
         catch (re) {
             if (re instanceof RecognitionException) {
-                _localctx.exception = re;
+                localctx.exception = re;
                 this._errHandler.reportError(this, re);
                 this._errHandler.recover(this, re);
             }
@@ -960,25 +933,22 @@ export class OpraFilterParser extends Parser {
         finally {
             this.exitRule();
         }
-        return _localctx;
+        return localctx;
     }
     // @RuleVersion(0)
-    boolean() {
-        let _localctx = new BooleanContext(this._ctx, this.state);
-        this.enterRule(_localctx, 38, OpraFilterParser.RULE_boolean);
+    boolean_() {
+        let localctx = new BooleanContext(this, this._ctx, this.state);
+        this.enterRule(localctx, 38, OpraFilterParser.RULE_boolean);
         let _la;
         try {
-            this.enterOuterAlt(_localctx, 1);
+            this.enterOuterAlt(localctx, 1);
             {
                 this.state = 156;
                 _la = this._input.LA(1);
-                if (!(_la === OpraFilterParser.T__41 || _la === OpraFilterParser.T__42)) {
+                if (!(_la === 42 || _la === 43)) {
                     this._errHandler.recoverInline(this);
                 }
                 else {
-                    if (this._input.LA(1) === Token.EOF) {
-                        this.matchedEOF = true;
-                    }
                     this._errHandler.reportMatch(this);
                     this.consume();
                 }
@@ -986,7 +956,7 @@ export class OpraFilterParser extends Parser {
         }
         catch (re) {
             if (re instanceof RecognitionException) {
-                _localctx.exception = re;
+                localctx.exception = re;
                 this._errHandler.reportError(this, re);
                 this._errHandler.recover(this, re);
             }
@@ -997,14 +967,14 @@ export class OpraFilterParser extends Parser {
         finally {
             this.exitRule();
         }
-        return _localctx;
+        return localctx;
     }
     // @RuleVersion(0)
-    null() {
-        let _localctx = new NullContext(this._ctx, this.state);
-        this.enterRule(_localctx, 40, OpraFilterParser.RULE_null);
+    null_() {
+        let localctx = new NullContext(this, this._ctx, this.state);
+        this.enterRule(localctx, 40, OpraFilterParser.RULE_null);
         try {
-            this.enterOuterAlt(_localctx, 1);
+            this.enterOuterAlt(localctx, 1);
             {
                 this.state = 158;
                 this.match(OpraFilterParser.T__43);
@@ -1012,7 +982,7 @@ export class OpraFilterParser extends Parser {
         }
         catch (re) {
             if (re instanceof RecognitionException) {
-                _localctx.exception = re;
+                localctx.exception = re;
                 this._errHandler.reportError(this, re);
                 this._errHandler.recover(this, re);
             }
@@ -1023,25 +993,22 @@ export class OpraFilterParser extends Parser {
         finally {
             this.exitRule();
         }
-        return _localctx;
+        return localctx;
     }
     // @RuleVersion(0)
     infinity() {
-        let _localctx = new InfinityContext(this._ctx, this.state);
-        this.enterRule(_localctx, 42, OpraFilterParser.RULE_infinity);
+        let localctx = new InfinityContext(this, this._ctx, this.state);
+        this.enterRule(localctx, 42, OpraFilterParser.RULE_infinity);
         let _la;
         try {
-            this.enterOuterAlt(_localctx, 1);
+            this.enterOuterAlt(localctx, 1);
             {
                 this.state = 160;
                 _la = this._input.LA(1);
-                if (!(_la === OpraFilterParser.T__44 || _la === OpraFilterParser.T__45)) {
+                if (!(_la === 45 || _la === 46)) {
                     this._errHandler.recoverInline(this);
                 }
                 else {
-                    if (this._input.LA(1) === Token.EOF) {
-                        this.matchedEOF = true;
-                    }
                     this._errHandler.reportMatch(this);
                     this.consume();
                 }
@@ -1049,7 +1016,7 @@ export class OpraFilterParser extends Parser {
         }
         catch (re) {
             if (re instanceof RecognitionException) {
-                _localctx.exception = re;
+                localctx.exception = re;
                 this._errHandler.reportError(this, re);
                 this._errHandler.recover(this, re);
             }
@@ -1060,16 +1027,16 @@ export class OpraFilterParser extends Parser {
         finally {
             this.exitRule();
         }
-        return _localctx;
+        return localctx;
     }
-    sempred(_localctx, ruleIndex, predIndex) {
+    sempred(localctx, ruleIndex, predIndex) {
         switch (ruleIndex) {
             case 1:
-                return this.expression_sempred(_localctx, predIndex);
+                return this.expression_sempred(localctx, predIndex);
         }
         return true;
     }
-    expression_sempred(_localctx, predIndex) {
+    expression_sempred(localctx, predIndex) {
         switch (predIndex) {
             case 0:
                 return this.precpred(this._ctx, 5);
@@ -1082,7 +1049,7 @@ export class OpraFilterParser extends Parser {
     }
     static get _ATN() {
         if (!OpraFilterParser.__ATN) {
-            OpraFilterParser.__ATN = new ATNDeserializer().deserialize(Utils.toCharArray(OpraFilterParser._serializedATN));
+            OpraFilterParser.__ATN = new ATNDeserializer().deserialize(OpraFilterParser._serializedATN);
         }
         return OpraFilterParser.__ATN;
     }
@@ -1143,6 +1110,7 @@ OpraFilterParser.INTEGER = 53;
 OpraFilterParser.WHITESPACE = 54;
 OpraFilterParser.COMMENT = 55;
 OpraFilterParser.LINE_COMMENT = 56;
+OpraFilterParser.EOF = Token.EOF;
 OpraFilterParser.RULE_root = 0;
 OpraFilterParser.RULE_expression = 1;
 OpraFilterParser.RULE_term = 2;
@@ -1165,6 +1133,42 @@ OpraFilterParser.RULE_logOp = 18;
 OpraFilterParser.RULE_boolean = 19;
 OpraFilterParser.RULE_null = 20;
 OpraFilterParser.RULE_infinity = 21;
+OpraFilterParser.literalNames = [null, "'('", "')'", "'['",
+    "','", "']'", "'year'",
+    "'month'", "'week'",
+    "'day'", "'hour'", "'minute'",
+    "'second'", "'millisecond'",
+    "'years'", "'months'",
+    "'weeks'", "'days'",
+    "'hours'", "'minutes'",
+    "'seconds'", "'milliseconds'",
+    "'.'", "'@'", "'<='",
+    "'<'", "'>'", "'>='",
+    "'='", "'!='", "'in'",
+    "'!in'", "'like'", "'!like'",
+    "'ilike'", "'!ilike'",
+    "'+'", "'-'", "'*'",
+    "'/'", "'and'", "'or'",
+    "'true'", "'false'",
+    "'null'", "'Infinity'",
+    "'infinity'"];
+OpraFilterParser.symbolicNames = [null, null, null, null,
+    null, null, null, null,
+    null, null, null, null,
+    null, null, null, null,
+    null, null, null, null,
+    null, null, null, null,
+    null, null, null, null,
+    null, null, null, null,
+    null, null, null, null,
+    null, null, null, null,
+    null, null, null, null,
+    null, null, null, "DATE",
+    "DATETIME", "TIME",
+    "IDENTIFIER", "STRING",
+    "NUMBER", "INTEGER",
+    "WHITESPACE", "COMMENT",
+    "LINE_COMMENT"];
 // tslint:disable:no-trailing-whitespace
 OpraFilterParser.ruleNames = [
     "root", "expression", "term", "invocable", "invocation", "indexer", "function",
@@ -1172,104 +1176,80 @@ OpraFilterParser.ruleNames = [
     "externalConstant", "identifier", "literal", "compOp", "arthOp", "polarOp",
     "logOp", "boolean", "null", "infinity",
 ];
-OpraFilterParser._LITERAL_NAMES = [
-    undefined, "'('", "')'", "'['", "','", "']'", "'year'", "'month'", "'week'",
-    "'day'", "'hour'", "'minute'", "'second'", "'millisecond'", "'years'",
-    "'months'", "'weeks'", "'days'", "'hours'", "'minutes'", "'seconds'",
-    "'milliseconds'", "'.'", "'@'", "'<='", "'<'", "'>'", "'>='", "'='", "'!='",
-    "'in'", "'!in'", "'like'", "'!like'", "'ilike'", "'!ilike'", "'+'", "'-'",
-    "'*'", "'/'", "'and'", "'or'", "'true'", "'false'", "'null'", "'Infinity'",
-    "'infinity'",
-];
-OpraFilterParser._SYMBOLIC_NAMES = [
-    undefined, undefined, undefined, undefined, undefined, undefined, undefined,
-    undefined, undefined, undefined, undefined, undefined, undefined, undefined,
-    undefined, undefined, undefined, undefined, undefined, undefined, undefined,
-    undefined, undefined, undefined, undefined, undefined, undefined, undefined,
-    undefined, undefined, undefined, undefined, undefined, undefined, undefined,
-    undefined, undefined, undefined, undefined, undefined, undefined, undefined,
-    undefined, undefined, undefined, undefined, undefined, "DATE", "DATETIME",
-    "TIME", "IDENTIFIER", "STRING", "NUMBER", "INTEGER", "WHITESPACE", "COMMENT",
-    "LINE_COMMENT",
-];
-OpraFilterParser.VOCABULARY = new VocabularyImpl(OpraFilterParser._LITERAL_NAMES, OpraFilterParser._SYMBOLIC_NAMES, []);
-OpraFilterParser._serializedATN = "\x03\uC91D\uCABA\u058D\uAFBA\u4F53\u0607\uEA8B\uC241\x03:\xA5\x04\x02" +
-    "\t\x02\x04\x03\t\x03\x04\x04\t\x04\x04\x05\t\x05\x04\x06\t\x06\x04\x07" +
-    "\t\x07\x04\b\t\b\x04\t\t\t\x04\n\t\n\x04\v\t\v\x04\f\t\f\x04\r\t\r\x04" +
-    "\x0E\t\x0E\x04\x0F\t\x0F\x04\x10\t\x10\x04\x11\t\x11\x04\x12\t\x12\x04" +
-    "\x13\t\x13\x04\x14\t\x14\x04\x15\t\x15\x04\x16\t\x16\x04\x17\t\x17\x03" +
-    "\x02\x03\x02\x03\x02\x03\x03\x03\x03\x03\x03\x03\x03\x03\x03\x03\x03\x03" +
-    "\x03\x03\x03\x03\x03\x03\x03\x03\x03\x03\x03\x03\x03\x07\x03?\n\x03\f" +
-    "\x03\x0E\x03B\v\x03\x03\x03\x03\x03\x05\x03F\n\x03\x03\x03\x03\x03\x03" +
-    "\x03\x03\x03\x03\x03\x03\x03\x03\x03\x03\x03\x03\x03\x03\x03\x03\x03\x03" +
-    "\x03\x07\x03T\n\x03\f\x03\x0E\x03W\v\x03\x03\x04\x03\x04\x03\x04\x05\x04" +
-    "\\\n\x04\x03\x05\x03\x05\x03\x06\x03\x06\x03\x07\x03\x07\x05\x07d\n\x07" +
-    "\x03\b\x03\b\x03\b\x05\bi\n\b\x03\b\x03\b\x03\t\x03\t\x03\t\x07\tp\n\t" +
-    "\f\t\x0E\ts\v\t\x03\n\x03\n\x03\n\x05\nx\n\n\x03\v\x03\v\x03\f\x03\f\x03" +
-    "\r\x03\r\x03\r\x07\r\x81\n\r\f\r\x0E\r\x84\v\r\x03\r\x03\r\x03\x0E\x03" +
-    "\x0E\x03\x0E\x03\x0F\x03\x0F\x03\x10\x03\x10\x03\x10\x03\x10\x03\x10\x03" +
-    "\x10\x03\x10\x03\x10\x05\x10\x95\n\x10\x03\x11\x03\x11\x03\x12\x03\x12" +
-    "\x03\x13\x03\x13\x03\x14\x03\x14\x03\x15\x03\x15\x03\x16\x03\x16\x03\x17" +
-    "\x03\x17\x03\x17\x02\x02\x03\x04\x18\x02\x02\x04\x02\x06\x02\b\x02\n\x02" +
-    "\f\x02\x0E\x02\x10\x02\x12\x02\x14\x02\x16\x02\x18\x02\x1A\x02\x1C\x02" +
-    "\x1E\x02 \x02\"\x02$\x02&\x02(\x02*\x02,\x02\x02\v\x03\x02\b\x0F\x03\x02" +
-    "\x10\x17\x03\x0245\x03\x02\x1A%\x03\x02&)\x03\x02&\'\x03\x02*+\x03\x02" +
-    ",-\x03\x02/0\x02\xA4\x02.\x03\x02\x02\x02\x04E\x03\x02\x02\x02\x06[\x03" +
-    "\x02\x02\x02\b]\x03\x02\x02\x02\n_\x03\x02\x02\x02\fc\x03\x02\x02\x02" +
-    "\x0Ee\x03\x02\x02\x02\x10l\x03\x02\x02\x02\x12w\x03\x02\x02\x02\x14y\x03" +
-    "\x02\x02\x02\x16{\x03\x02\x02\x02\x18\x82\x03\x02\x02\x02\x1A\x87\x03" +
-    "\x02\x02\x02\x1C\x8A\x03\x02\x02\x02\x1E\x94\x03\x02\x02\x02 \x96\x03" +
-    "\x02\x02\x02\"\x98\x03\x02\x02\x02$\x9A\x03\x02\x02\x02&\x9C\x03\x02\x02" +
-    "\x02(\x9E\x03\x02\x02\x02*\xA0\x03\x02\x02\x02,\xA2\x03\x02\x02\x02./" +
-    "\x05\x04\x03\x02/0\x07\x02\x02\x030\x03\x03\x02\x02\x0212\b\x03\x01\x02" +
-    "2F\x05\x06\x04\x0234\x05$\x13\x0245\x05\x04\x03\b5F\x03\x02\x02\x0267" +
-    "\x07\x03\x02\x0278\x05\x04\x03\x0289\x07\x04\x02\x029F\x03\x02\x02\x02" +
-    ":;\x07\x05\x02\x02;@\x05\x04\x03\x02<=\x07\x06\x02\x02=?\x05\x04\x03\x02" +
-    "><\x03\x02\x02\x02?B\x03\x02\x02\x02@>\x03\x02\x02\x02@A\x03\x02\x02\x02" +
-    "AC\x03\x02\x02\x02B@\x03\x02\x02\x02CD\x07\x07\x02\x02DF\x03\x02\x02\x02" +
-    "E1\x03\x02\x02\x02E3\x03\x02\x02\x02E6\x03\x02\x02\x02E:\x03\x02\x02\x02" +
-    "FU\x03\x02\x02\x02GH\f\x07\x02\x02HI\x05\"\x12\x02IJ\x05\x04\x03\bJT\x03" +
-    "\x02\x02\x02KL\f\x06\x02\x02LM\x05 \x11\x02MN\x05\x04\x03\x07NT\x03\x02" +
-    "\x02\x02OP\f\x05\x02\x02PQ\x05&\x14\x02QR\x05\x04\x03\x06RT\x03\x02\x02" +
-    "\x02SG\x03\x02\x02\x02SK\x03\x02\x02\x02SO\x03\x02\x02\x02TW\x03\x02\x02" +
-    "\x02US\x03\x02\x02\x02UV\x03\x02\x02\x02V\x05\x03\x02\x02\x02WU\x03\x02" +
-    "\x02\x02X\\\x05\x1E\x10\x02Y\\\x05\x18\r\x02Z\\\x05\x1A\x0E\x02[X\x03" +
-    "\x02\x02\x02[Y\x03\x02\x02\x02[Z\x03\x02\x02\x02\\\x07\x03\x02\x02\x02" +
-    "]^\x05\x0E\b\x02^\t\x03\x02\x02\x02_`\x05\x1C\x0F\x02`\v\x03\x02\x02\x02" +
-    "ad\x05\x1C\x0F\x02bd\x077\x02\x02ca\x03\x02\x02\x02cb\x03\x02\x02\x02" +
-    "d\r\x03\x02\x02\x02ef\x05\x1C\x0F\x02fh\x07\x03\x02\x02gi\x05\x10\t\x02" +
-    "hg\x03\x02\x02\x02hi\x03\x02\x02\x02ij\x03\x02\x02\x02jk\x07\x04\x02\x02" +
-    "k\x0F\x03\x02\x02\x02lq\x05\x04\x03\x02mn\x07\x06\x02\x02np\x05\x04\x03" +
-    "\x02om\x03\x02\x02\x02ps\x03\x02\x02\x02qo\x03\x02\x02\x02qr\x03\x02\x02" +
-    "\x02r\x11\x03\x02\x02\x02sq\x03\x02\x02\x02tx\x05\x14\v\x02ux\x05\x16" +
-    "\f\x02vx\x075\x02\x02wt\x03\x02\x02\x02wu\x03\x02\x02\x02wv\x03\x02\x02" +
-    "\x02x\x13\x03\x02\x02\x02yz\t\x02\x02\x02z\x15\x03\x02\x02\x02{|\t\x03" +
-    "\x02\x02|\x17\x03\x02\x02\x02}~\x05\x1C\x0F\x02~\x7F\x07\x18\x02\x02\x7F" +
-    "\x81\x03\x02\x02\x02\x80}\x03\x02\x02\x02\x81\x84\x03\x02\x02\x02\x82" +
-    "\x80\x03\x02\x02\x02\x82\x83\x03\x02\x02\x02\x83\x85\x03\x02\x02\x02\x84" +
-    "\x82\x03\x02\x02\x02\x85\x86\x05\x1C\x0F\x02\x86\x19\x03\x02\x02\x02\x87" +
-    "\x88\x07\x19\x02\x02\x88\x89\t\x04\x02\x02\x89\x1B\x03\x02\x02\x02\x8A" +
-    "\x8B\x074\x02\x02\x8B\x1D\x03\x02\x02\x02\x8C\x95\x076\x02\x02\x8D\x95" +
-    "\x05,\x17\x02\x8E\x95\x05(\x15\x02\x8F\x95\x05*\x16\x02\x90\x95\x071\x02" +
-    "\x02\x91\x95\x072\x02\x02\x92\x95\x073\x02\x02\x93\x95\x075\x02\x02\x94" +
-    "\x8C\x03\x02\x02\x02\x94\x8D\x03\x02\x02\x02\x94\x8E\x03\x02\x02\x02\x94" +
-    "\x8F\x03\x02\x02\x02\x94\x90\x03\x02\x02\x02\x94\x91\x03\x02\x02\x02\x94" +
-    "\x92\x03\x02\x02\x02\x94\x93\x03\x02\x02\x02\x95\x1F\x03\x02\x02\x02\x96" +
-    "\x97\t\x05\x02\x02\x97!\x03\x02\x02\x02\x98\x99\t\x06\x02\x02\x99#\x03" +
-    "\x02\x02\x02\x9A\x9B\t\x07\x02\x02\x9B%\x03\x02\x02\x02\x9C\x9D\t\b\x02" +
-    "\x02\x9D\'\x03\x02\x02\x02\x9E\x9F\t\t\x02\x02\x9F)\x03\x02\x02\x02\xA0" +
-    "\xA1\x07.\x02\x02\xA1+\x03\x02\x02\x02\xA2\xA3\t\n\x02\x02\xA3-\x03\x02" +
-    "\x02\x02\r@ESU[chqw\x82\x94";
+OpraFilterParser._serializedATN = [4, 1, 56, 163, 2, 0, 7, 0, 2,
+    1, 7, 1, 2, 2, 7, 2, 2, 3, 7, 3, 2, 4, 7, 4, 2, 5, 7, 5, 2, 6, 7, 6, 2, 7, 7, 7, 2, 8, 7, 8, 2, 9, 7, 9, 2,
+    10, 7, 10, 2, 11, 7, 11, 2, 12, 7, 12, 2, 13, 7, 13, 2, 14, 7, 14, 2, 15, 7, 15, 2, 16, 7, 16, 2, 17,
+    7, 17, 2, 18, 7, 18, 2, 19, 7, 19, 2, 20, 7, 20, 2, 21, 7, 21, 1, 0, 1, 0, 1, 0, 1, 1, 1, 1, 1, 1, 1,
+    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 5, 1, 61, 8, 1, 10, 1, 12, 1, 64, 9, 1, 1, 1, 1,
+    1, 3, 1, 68, 8, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 5, 1, 82, 8, 1,
+    10, 1, 12, 1, 85, 9, 1, 1, 2, 1, 2, 1, 2, 3, 2, 90, 8, 2, 1, 3, 1, 3, 1, 4, 1, 4, 1, 5, 1, 5, 3, 5, 98,
+    8, 5, 1, 6, 1, 6, 1, 6, 3, 6, 103, 8, 6, 1, 6, 1, 6, 1, 7, 1, 7, 1, 7, 5, 7, 110, 8, 7, 10, 7, 12, 7, 113,
+    9, 7, 1, 8, 1, 8, 1, 8, 3, 8, 118, 8, 8, 1, 9, 1, 9, 1, 10, 1, 10, 1, 11, 1, 11, 1, 11, 5, 11, 127, 8,
+    11, 10, 11, 12, 11, 130, 9, 11, 1, 11, 1, 11, 1, 12, 1, 12, 1, 12, 1, 13, 1, 13, 1, 14, 1, 14, 1,
+    14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 3, 14, 147, 8, 14, 1, 15, 1, 15, 1, 16, 1, 16, 1, 17, 1, 17,
+    1, 18, 1, 18, 1, 19, 1, 19, 1, 20, 1, 20, 1, 21, 1, 21, 1, 21, 0, 1, 2, 22, 0, 2, 4, 6, 8, 10, 12, 14,
+    16, 18, 20, 22, 24, 26, 28, 30, 32, 34, 36, 38, 40, 42, 0, 9, 1, 0, 6, 13, 1, 0, 14, 21, 1, 0, 50,
+    51, 1, 0, 24, 35, 1, 0, 36, 39, 1, 0, 36, 37, 1, 0, 40, 41, 1, 0, 42, 43, 1, 0, 45, 46, 162, 0, 44,
+    1, 0, 0, 0, 2, 67, 1, 0, 0, 0, 4, 89, 1, 0, 0, 0, 6, 91, 1, 0, 0, 0, 8, 93, 1, 0, 0, 0, 10, 97, 1, 0, 0,
+    0, 12, 99, 1, 0, 0, 0, 14, 106, 1, 0, 0, 0, 16, 117, 1, 0, 0, 0, 18, 119, 1, 0, 0, 0, 20, 121, 1, 0,
+    0, 0, 22, 128, 1, 0, 0, 0, 24, 133, 1, 0, 0, 0, 26, 136, 1, 0, 0, 0, 28, 146, 1, 0, 0, 0, 30, 148,
+    1, 0, 0, 0, 32, 150, 1, 0, 0, 0, 34, 152, 1, 0, 0, 0, 36, 154, 1, 0, 0, 0, 38, 156, 1, 0, 0, 0, 40,
+    158, 1, 0, 0, 0, 42, 160, 1, 0, 0, 0, 44, 45, 3, 2, 1, 0, 45, 46, 5, 0, 0, 1, 46, 1, 1, 0, 0, 0, 47,
+    48, 6, 1, -1, 0, 48, 68, 3, 4, 2, 0, 49, 50, 3, 34, 17, 0, 50, 51, 3, 2, 1, 6, 51, 68, 1, 0, 0, 0, 52,
+    53, 5, 1, 0, 0, 53, 54, 3, 2, 1, 0, 54, 55, 5, 2, 0, 0, 55, 68, 1, 0, 0, 0, 56, 57, 5, 3, 0, 0, 57, 62,
+    3, 2, 1, 0, 58, 59, 5, 4, 0, 0, 59, 61, 3, 2, 1, 0, 60, 58, 1, 0, 0, 0, 61, 64, 1, 0, 0, 0, 62, 60, 1,
+    0, 0, 0, 62, 63, 1, 0, 0, 0, 63, 65, 1, 0, 0, 0, 64, 62, 1, 0, 0, 0, 65, 66, 5, 5, 0, 0, 66, 68, 1, 0,
+    0, 0, 67, 47, 1, 0, 0, 0, 67, 49, 1, 0, 0, 0, 67, 52, 1, 0, 0, 0, 67, 56, 1, 0, 0, 0, 68, 83, 1, 0, 0,
+    0, 69, 70, 10, 5, 0, 0, 70, 71, 3, 32, 16, 0, 71, 72, 3, 2, 1, 6, 72, 82, 1, 0, 0, 0, 73, 74, 10, 4,
+    0, 0, 74, 75, 3, 30, 15, 0, 75, 76, 3, 2, 1, 5, 76, 82, 1, 0, 0, 0, 77, 78, 10, 3, 0, 0, 78, 79, 3,
+    36, 18, 0, 79, 80, 3, 2, 1, 4, 80, 82, 1, 0, 0, 0, 81, 69, 1, 0, 0, 0, 81, 73, 1, 0, 0, 0, 81, 77, 1,
+    0, 0, 0, 82, 85, 1, 0, 0, 0, 83, 81, 1, 0, 0, 0, 83, 84, 1, 0, 0, 0, 84, 3, 1, 0, 0, 0, 85, 83, 1, 0,
+    0, 0, 86, 90, 3, 28, 14, 0, 87, 90, 3, 22, 11, 0, 88, 90, 3, 24, 12, 0, 89, 86, 1, 0, 0, 0, 89, 87,
+    1, 0, 0, 0, 89, 88, 1, 0, 0, 0, 90, 5, 1, 0, 0, 0, 91, 92, 3, 12, 6, 0, 92, 7, 1, 0, 0, 0, 93, 94, 3,
+    26, 13, 0, 94, 9, 1, 0, 0, 0, 95, 98, 3, 26, 13, 0, 96, 98, 5, 53, 0, 0, 97, 95, 1, 0, 0, 0, 97, 96,
+    1, 0, 0, 0, 98, 11, 1, 0, 0, 0, 99, 100, 3, 26, 13, 0, 100, 102, 5, 1, 0, 0, 101, 103, 3, 14, 7, 0,
+    102, 101, 1, 0, 0, 0, 102, 103, 1, 0, 0, 0, 103, 104, 1, 0, 0, 0, 104, 105, 5, 2, 0, 0, 105, 13,
+    1, 0, 0, 0, 106, 111, 3, 2, 1, 0, 107, 108, 5, 4, 0, 0, 108, 110, 3, 2, 1, 0, 109, 107, 1, 0, 0, 0,
+    110, 113, 1, 0, 0, 0, 111, 109, 1, 0, 0, 0, 111, 112, 1, 0, 0, 0, 112, 15, 1, 0, 0, 0, 113, 111,
+    1, 0, 0, 0, 114, 118, 3, 18, 9, 0, 115, 118, 3, 20, 10, 0, 116, 118, 5, 51, 0, 0, 117, 114, 1, 0,
+    0, 0, 117, 115, 1, 0, 0, 0, 117, 116, 1, 0, 0, 0, 118, 17, 1, 0, 0, 0, 119, 120, 7, 0, 0, 0, 120,
+    19, 1, 0, 0, 0, 121, 122, 7, 1, 0, 0, 122, 21, 1, 0, 0, 0, 123, 124, 3, 26, 13, 0, 124, 125, 5, 22,
+    0, 0, 125, 127, 1, 0, 0, 0, 126, 123, 1, 0, 0, 0, 127, 130, 1, 0, 0, 0, 128, 126, 1, 0, 0, 0, 128,
+    129, 1, 0, 0, 0, 129, 131, 1, 0, 0, 0, 130, 128, 1, 0, 0, 0, 131, 132, 3, 26, 13, 0, 132, 23, 1,
+    0, 0, 0, 133, 134, 5, 23, 0, 0, 134, 135, 7, 2, 0, 0, 135, 25, 1, 0, 0, 0, 136, 137, 5, 50, 0, 0,
+    137, 27, 1, 0, 0, 0, 138, 147, 5, 52, 0, 0, 139, 147, 3, 42, 21, 0, 140, 147, 3, 38, 19, 0, 141,
+    147, 3, 40, 20, 0, 142, 147, 5, 47, 0, 0, 143, 147, 5, 48, 0, 0, 144, 147, 5, 49, 0, 0, 145, 147,
+    5, 51, 0, 0, 146, 138, 1, 0, 0, 0, 146, 139, 1, 0, 0, 0, 146, 140, 1, 0, 0, 0, 146, 141, 1, 0, 0,
+    0, 146, 142, 1, 0, 0, 0, 146, 143, 1, 0, 0, 0, 146, 144, 1, 0, 0, 0, 146, 145, 1, 0, 0, 0, 147, 29,
+    1, 0, 0, 0, 148, 149, 7, 3, 0, 0, 149, 31, 1, 0, 0, 0, 150, 151, 7, 4, 0, 0, 151, 33, 1, 0, 0, 0, 152,
+    153, 7, 5, 0, 0, 153, 35, 1, 0, 0, 0, 154, 155, 7, 6, 0, 0, 155, 37, 1, 0, 0, 0, 156, 157, 7, 7, 0,
+    0, 157, 39, 1, 0, 0, 0, 158, 159, 5, 44, 0, 0, 159, 41, 1, 0, 0, 0, 160, 161, 7, 8, 0, 0, 161, 43,
+    1, 0, 0, 0, 11, 62, 67, 81, 83, 89, 97, 102, 111, 117, 128, 146];
+OpraFilterParser.DecisionsToDFA = OpraFilterParser._ATN.decisionToState.map((ds, index) => new DFA(ds, index));
 export class RootContext extends ParserRuleContext {
+    constructor(parser, parent, invokingState) {
+        super(parent, invokingState);
+        this.parser = parser;
+    }
     expression() {
-        return this.getRuleContext(0, ExpressionContext);
+        return this.getTypedRuleContext(ExpressionContext, 0);
     }
-    EOF() { return this.getToken(OpraFilterParser.EOF, 0); }
-    constructor(parent, invokingState) {
-        super(parent, invokingState);
+    EOF() {
+        return this.getToken(OpraFilterParser.EOF, 0);
+    }
+    get ruleIndex() {
+        return OpraFilterParser.RULE_root;
+    }
+    enterRule(listener) {
+        if (listener.enterRoot) {
+            listener.enterRoot(this);
+        }
+    }
+    exitRule(listener) {
+        if (listener.exitRoot) {
+            listener.exitRoot(this);
+        }
     }
-    // @Override
-    get ruleIndex() { return OpraFilterParser.RULE_root; }
     // @Override
     accept(visitor) {
         if (visitor.visitRoot) {
@@ -1281,74 +1261,101 @@ export class RootContext extends ParserRuleContext {
     }
 }
 export class ExpressionContext extends ParserRuleContext {
-    constructor(parent, invokingState) {
+    constructor(parser, parent, invokingState) {
         super(parent, invokingState);
+        this.parser = parser;
+    }
+    get ruleIndex() {
+        return OpraFilterParser.RULE_expression;
     }
-    // @Override
-    get ruleIndex() { return OpraFilterParser.RULE_expression; }
     copyFrom(ctx) {
         super.copyFrom(ctx);
     }
 }
-export class TermExpressionContext extends ExpressionContext {
-    term() {
-        return this.getRuleContext(0, TermContext);
+export class ParenthesizedExpressionContext extends ExpressionContext {
+    constructor(parser, ctx) {
+        super(parser, ctx.parentCtx, ctx.invokingState);
+        super.copyFrom(ctx);
+    }
+    expression() {
+        return this.getTypedRuleContext(ExpressionContext, 0);
     }
-    constructor(ctx) {
-        super(ctx.parent, ctx.invokingState);
-        this.copyFrom(ctx);
+    enterRule(listener) {
+        if (listener.enterParenthesizedExpression) {
+            listener.enterParenthesizedExpression(this);
+        }
+    }
+    exitRule(listener) {
+        if (listener.exitParenthesizedExpression) {
+            listener.exitParenthesizedExpression(this);
+        }
     }
     // @Override
     accept(visitor) {
-        if (visitor.visitTermExpression) {
-            return visitor.visitTermExpression(this);
+        if (visitor.visitParenthesizedExpression) {
+            return visitor.visitParenthesizedExpression(this);
         }
         else {
             return visitor.visitChildren(this);
         }
     }
 }
-export class PolarityExpressionContext extends ExpressionContext {
-    polarOp() {
-        return this.getRuleContext(0, PolarOpContext);
+export class ArrayExpressionContext extends ExpressionContext {
+    constructor(parser, ctx) {
+        super(parser, ctx.parentCtx, ctx.invokingState);
+        super.copyFrom(ctx);
     }
-    expression() {
-        return this.getRuleContext(0, ExpressionContext);
+    expression_list() {
+        return this.getTypedRuleContexts(ExpressionContext);
+    }
+    expression(i) {
+        return this.getTypedRuleContext(ExpressionContext, i);
     }
-    constructor(ctx) {
-        super(ctx.parent, ctx.invokingState);
-        this.copyFrom(ctx);
+    enterRule(listener) {
+        if (listener.enterArrayExpression) {
+            listener.enterArrayExpression(this);
+        }
+    }
+    exitRule(listener) {
+        if (listener.exitArrayExpression) {
+            listener.exitArrayExpression(this);
+        }
     }
     // @Override
     accept(visitor) {
-        if (visitor.visitPolarityExpression) {
-            return visitor.visitPolarityExpression(this);
+        if (visitor.visitArrayExpression) {
+            return visitor.visitArrayExpression(this);
         }
         else {
             return visitor.visitChildren(this);
         }
     }
 }
-export class ArithmeticExpressionContext extends ExpressionContext {
-    expression(i) {
-        if (i === undefined) {
-            return this.getRuleContexts(ExpressionContext);
-        }
-        else {
-            return this.getRuleContext(i, ExpressionContext);
-        }
+export class PolarityExpressionContext extends ExpressionContext {
+    constructor(parser, ctx) {
+        super(parser, ctx.parentCtx, ctx.invokingState);
+        super.copyFrom(ctx);
     }
-    arthOp() {
-        return this.getRuleContext(0, ArthOpContext);
+    polarOp() {
+        return this.getTypedRuleContext(PolarOpContext, 0);
+    }
+    expression() {
+        return this.getTypedRuleContext(ExpressionContext, 0);
     }
-    constructor(ctx) {
-        super(ctx.parent, ctx.invokingState);
-        this.copyFrom(ctx);
+    enterRule(listener) {
+        if (listener.enterPolarityExpression) {
+            listener.enterPolarityExpression(this);
+        }
+    }
+    exitRule(listener) {
+        if (listener.exitPolarityExpression) {
+            listener.exitPolarityExpression(this);
+        }
     }
     // @Override
     accept(visitor) {
-        if (visitor.visitArithmeticExpression) {
-            return visitor.visitArithmeticExpression(this);
+        if (visitor.visitPolarityExpression) {
+            return visitor.visitPolarityExpression(this);
         }
         else {
             return visitor.visitChildren(this);
@@ -1356,20 +1363,28 @@ export class ArithmeticExpressionContext extends ExpressionContext {
     }
 }
 export class ComparisonExpressionContext extends ExpressionContext {
+    constructor(parser, ctx) {
+        super(parser, ctx.parentCtx, ctx.invokingState);
+        super.copyFrom(ctx);
+    }
+    expression_list() {
+        return this.getTypedRuleContexts(ExpressionContext);
+    }
     expression(i) {
-        if (i === undefined) {
-            return this.getRuleContexts(ExpressionContext);
-        }
-        else {
-            return this.getRuleContext(i, ExpressionContext);
-        }
+        return this.getTypedRuleContext(ExpressionContext, i);
     }
     compOp() {
-        return this.getRuleContext(0, CompOpContext);
+        return this.getTypedRuleContext(CompOpContext, 0);
     }
-    constructor(ctx) {
-        super(ctx.parent, ctx.invokingState);
-        this.copyFrom(ctx);
+    enterRule(listener) {
+        if (listener.enterComparisonExpression) {
+            listener.enterComparisonExpression(this);
+        }
+    }
+    exitRule(listener) {
+        if (listener.exitComparisonExpression) {
+            listener.exitComparisonExpression(this);
+        }
     }
     // @Override
     accept(visitor) {
@@ -1381,67 +1396,96 @@ export class ComparisonExpressionContext extends ExpressionContext {
         }
     }
 }
-export class LogicalExpressionContext extends ExpressionContext {
+export class ArithmeticExpressionContext extends ExpressionContext {
+    constructor(parser, ctx) {
+        super(parser, ctx.parentCtx, ctx.invokingState);
+        super.copyFrom(ctx);
+    }
+    expression_list() {
+        return this.getTypedRuleContexts(ExpressionContext);
+    }
     expression(i) {
-        if (i === undefined) {
-            return this.getRuleContexts(ExpressionContext);
-        }
-        else {
-            return this.getRuleContext(i, ExpressionContext);
-        }
+        return this.getTypedRuleContext(ExpressionContext, i);
     }
-    logOp() {
-        return this.getRuleContext(0, LogOpContext);
+    arthOp() {
+        return this.getTypedRuleContext(ArthOpContext, 0);
     }
-    constructor(ctx) {
-        super(ctx.parent, ctx.invokingState);
-        this.copyFrom(ctx);
+    enterRule(listener) {
+        if (listener.enterArithmeticExpression) {
+            listener.enterArithmeticExpression(this);
+        }
+    }
+    exitRule(listener) {
+        if (listener.exitArithmeticExpression) {
+            listener.exitArithmeticExpression(this);
+        }
     }
     // @Override
     accept(visitor) {
-        if (visitor.visitLogicalExpression) {
-            return visitor.visitLogicalExpression(this);
+        if (visitor.visitArithmeticExpression) {
+            return visitor.visitArithmeticExpression(this);
         }
         else {
             return visitor.visitChildren(this);
         }
     }
 }
-export class ParenthesizedExpressionContext extends ExpressionContext {
-    expression() {
-        return this.getRuleContext(0, ExpressionContext);
+export class LogicalExpressionContext extends ExpressionContext {
+    constructor(parser, ctx) {
+        super(parser, ctx.parentCtx, ctx.invokingState);
+        super.copyFrom(ctx);
     }
-    constructor(ctx) {
-        super(ctx.parent, ctx.invokingState);
-        this.copyFrom(ctx);
+    expression_list() {
+        return this.getTypedRuleContexts(ExpressionContext);
+    }
+    expression(i) {
+        return this.getTypedRuleContext(ExpressionContext, i);
+    }
+    logOp() {
+        return this.getTypedRuleContext(LogOpContext, 0);
+    }
+    enterRule(listener) {
+        if (listener.enterLogicalExpression) {
+            listener.enterLogicalExpression(this);
+        }
+    }
+    exitRule(listener) {
+        if (listener.exitLogicalExpression) {
+            listener.exitLogicalExpression(this);
+        }
     }
     // @Override
     accept(visitor) {
-        if (visitor.visitParenthesizedExpression) {
-            return visitor.visitParenthesizedExpression(this);
+        if (visitor.visitLogicalExpression) {
+            return visitor.visitLogicalExpression(this);
         }
         else {
             return visitor.visitChildren(this);
         }
     }
 }
-export class ArrayExpressionContext extends ExpressionContext {
-    expression(i) {
-        if (i === undefined) {
-            return this.getRuleContexts(ExpressionContext);
-        }
-        else {
-            return this.getRuleContext(i, ExpressionContext);
+export class TermExpressionContext extends ExpressionContext {
+    constructor(parser, ctx) {
+        super(parser, ctx.parentCtx, ctx.invokingState);
+        super.copyFrom(ctx);
+    }
+    term() {
+        return this.getTypedRuleContext(TermContext, 0);
+    }
+    enterRule(listener) {
+        if (listener.enterTermExpression) {
+            listener.enterTermExpression(this);
         }
     }
-    constructor(ctx) {
-        super(ctx.parent, ctx.invokingState);
-        this.copyFrom(ctx);
+    exitRule(listener) {
+        if (listener.exitTermExpression) {
+            listener.exitTermExpression(this);
+        }
     }
     // @Override
     accept(visitor) {
-        if (visitor.visitArrayExpression) {
-            return visitor.visitArrayExpression(this);
+        if (visitor.visitTermExpression) {
+            return visitor.visitTermExpression(this);
         }
         else {
             return visitor.visitChildren(this);
@@ -1449,63 +1493,95 @@ export class ArrayExpressionContext extends ExpressionContext {
     }
 }
 export class TermContext extends ParserRuleContext {
-    constructor(parent, invokingState) {
+    constructor(parser, parent, invokingState) {
         super(parent, invokingState);
+        this.parser = parser;
+    }
+    get ruleIndex() {
+        return OpraFilterParser.RULE_term;
     }
-    // @Override
-    get ruleIndex() { return OpraFilterParser.RULE_term; }
     copyFrom(ctx) {
         super.copyFrom(ctx);
     }
 }
-export class LiteralTermContext extends TermContext {
-    literal() {
-        return this.getRuleContext(0, LiteralContext);
+export class ExternalConstantTermContext extends TermContext {
+    constructor(parser, ctx) {
+        super(parser, ctx.parentCtx, ctx.invokingState);
+        super.copyFrom(ctx);
+    }
+    externalConstant() {
+        return this.getTypedRuleContext(ExternalConstantContext, 0);
     }
-    constructor(ctx) {
-        super(ctx.parent, ctx.invokingState);
-        this.copyFrom(ctx);
+    enterRule(listener) {
+        if (listener.enterExternalConstantTerm) {
+            listener.enterExternalConstantTerm(this);
+        }
+    }
+    exitRule(listener) {
+        if (listener.exitExternalConstantTerm) {
+            listener.exitExternalConstantTerm(this);
+        }
     }
     // @Override
     accept(visitor) {
-        if (visitor.visitLiteralTerm) {
-            return visitor.visitLiteralTerm(this);
+        if (visitor.visitExternalConstantTerm) {
+            return visitor.visitExternalConstantTerm(this);
         }
         else {
             return visitor.visitChildren(this);
         }
     }
 }
-export class QualifiedIdentifierTermContext extends TermContext {
-    qualifiedIdentifier() {
-        return this.getRuleContext(0, QualifiedIdentifierContext);
+export class LiteralTermContext extends TermContext {
+    constructor(parser, ctx) {
+        super(parser, ctx.parentCtx, ctx.invokingState);
+        super.copyFrom(ctx);
+    }
+    literal() {
+        return this.getTypedRuleContext(LiteralContext, 0);
     }
-    constructor(ctx) {
-        super(ctx.parent, ctx.invokingState);
-        this.copyFrom(ctx);
+    enterRule(listener) {
+        if (listener.enterLiteralTerm) {
+            listener.enterLiteralTerm(this);
+        }
+    }
+    exitRule(listener) {
+        if (listener.exitLiteralTerm) {
+            listener.exitLiteralTerm(this);
+        }
     }
     // @Override
     accept(visitor) {
-        if (visitor.visitQualifiedIdentifierTerm) {
-            return visitor.visitQualifiedIdentifierTerm(this);
+        if (visitor.visitLiteralTerm) {
+            return visitor.visitLiteralTerm(this);
         }
         else {
             return visitor.visitChildren(this);
         }
     }
 }
-export class ExternalConstantTermContext extends TermContext {
-    externalConstant() {
-        return this.getRuleContext(0, ExternalConstantContext);
+export class QualifiedIdentifierTermContext extends TermContext {
+    constructor(parser, ctx) {
+        super(parser, ctx.parentCtx, ctx.invokingState);
+        super.copyFrom(ctx);
+    }
+    qualifiedIdentifier() {
+        return this.getTypedRuleContext(QualifiedIdentifierContext, 0);
     }
-    constructor(ctx) {
-        super(ctx.parent, ctx.invokingState);
-        this.copyFrom(ctx);
+    enterRule(listener) {
+        if (listener.enterQualifiedIdentifierTerm) {
+            listener.enterQualifiedIdentifierTerm(this);
+        }
+    }
+    exitRule(listener) {
+        if (listener.exitQualifiedIdentifierTerm) {
+            listener.exitQualifiedIdentifierTerm(this);
+        }
     }
     // @Override
     accept(visitor) {
-        if (visitor.visitExternalConstantTerm) {
-            return visitor.visitExternalConstantTerm(this);
+        if (visitor.visitQualifiedIdentifierTerm) {
+            return visitor.visitQualifiedIdentifierTerm(this);
         }
         else {
             return visitor.visitChildren(this);
@@ -1513,14 +1589,26 @@ export class ExternalConstantTermContext extends TermContext {
     }
 }
 export class InvocableContext extends ParserRuleContext {
-    function() {
-        return this.getRuleContext(0, FunctionContext);
-    }
-    constructor(parent, invokingState) {
+    constructor(parser, parent, invokingState) {
         super(parent, invokingState);
+        this.parser = parser;
+    }
+    function_() {
+        return this.getTypedRuleContext(FunctionContext, 0);
+    }
+    get ruleIndex() {
+        return OpraFilterParser.RULE_invocable;
+    }
+    enterRule(listener) {
+        if (listener.enterInvocable) {
+            listener.enterInvocable(this);
+        }
+    }
+    exitRule(listener) {
+        if (listener.exitInvocable) {
+            listener.exitInvocable(this);
+        }
     }
-    // @Override
-    get ruleIndex() { return OpraFilterParser.RULE_invocable; }
     // @Override
     accept(visitor) {
         if (visitor.visitInvocable) {
@@ -1532,22 +1620,34 @@ export class InvocableContext extends ParserRuleContext {
     }
 }
 export class InvocationContext extends ParserRuleContext {
-    constructor(parent, invokingState) {
+    constructor(parser, parent, invokingState) {
         super(parent, invokingState);
+        this.parser = parser;
+    }
+    get ruleIndex() {
+        return OpraFilterParser.RULE_invocation;
     }
-    // @Override
-    get ruleIndex() { return OpraFilterParser.RULE_invocation; }
     copyFrom(ctx) {
         super.copyFrom(ctx);
     }
 }
 export class MemberInvocationContext extends InvocationContext {
+    constructor(parser, ctx) {
+        super(parser, ctx.parentCtx, ctx.invokingState);
+        super.copyFrom(ctx);
+    }
     identifier() {
-        return this.getRuleContext(0, IdentifierContext);
+        return this.getTypedRuleContext(IdentifierContext, 0);
     }
-    constructor(ctx) {
-        super(ctx.parent, ctx.invokingState);
-        this.copyFrom(ctx);
+    enterRule(listener) {
+        if (listener.enterMemberInvocation) {
+            listener.enterMemberInvocation(this);
+        }
+    }
+    exitRule(listener) {
+        if (listener.exitMemberInvocation) {
+            listener.exitMemberInvocation(this);
+        }
     }
     // @Override
     accept(visitor) {
@@ -1560,43 +1660,67 @@ export class MemberInvocationContext extends InvocationContext {
     }
 }
 export class IndexerContext extends ParserRuleContext {
-    constructor(parent, invokingState) {
+    constructor(parser, parent, invokingState) {
         super(parent, invokingState);
+        this.parser = parser;
+    }
+    get ruleIndex() {
+        return OpraFilterParser.RULE_indexer;
     }
-    // @Override
-    get ruleIndex() { return OpraFilterParser.RULE_indexer; }
     copyFrom(ctx) {
         super.copyFrom(ctx);
     }
 }
-export class MemberIndexContext extends IndexerContext {
-    identifier() {
-        return this.getRuleContext(0, IdentifierContext);
+export class NumberIndexContext extends IndexerContext {
+    constructor(parser, ctx) {
+        super(parser, ctx.parentCtx, ctx.invokingState);
+        super.copyFrom(ctx);
     }
-    constructor(ctx) {
-        super(ctx.parent, ctx.invokingState);
-        this.copyFrom(ctx);
+    INTEGER() {
+        return this.getToken(OpraFilterParser.INTEGER, 0);
+    }
+    enterRule(listener) {
+        if (listener.enterNumberIndex) {
+            listener.enterNumberIndex(this);
+        }
+    }
+    exitRule(listener) {
+        if (listener.exitNumberIndex) {
+            listener.exitNumberIndex(this);
+        }
     }
     // @Override
     accept(visitor) {
-        if (visitor.visitMemberIndex) {
-            return visitor.visitMemberIndex(this);
+        if (visitor.visitNumberIndex) {
+            return visitor.visitNumberIndex(this);
         }
         else {
             return visitor.visitChildren(this);
         }
     }
 }
-export class NumberIndexContext extends IndexerContext {
-    INTEGER() { return this.getToken(OpraFilterParser.INTEGER, 0); }
-    constructor(ctx) {
-        super(ctx.parent, ctx.invokingState);
-        this.copyFrom(ctx);
+export class MemberIndexContext extends IndexerContext {
+    constructor(parser, ctx) {
+        super(parser, ctx.parentCtx, ctx.invokingState);
+        super.copyFrom(ctx);
+    }
+    identifier() {
+        return this.getTypedRuleContext(IdentifierContext, 0);
+    }
+    enterRule(listener) {
+        if (listener.enterMemberIndex) {
+            listener.enterMemberIndex(this);
+        }
+    }
+    exitRule(listener) {
+        if (listener.exitMemberIndex) {
+            listener.exitMemberIndex(this);
+        }
     }
     // @Override
     accept(visitor) {
-        if (visitor.visitNumberIndex) {
-            return visitor.visitNumberIndex(this);
+        if (visitor.visitMemberIndex) {
+            return visitor.visitMemberIndex(this);
         }
         else {
             return visitor.visitChildren(this);
@@ -1604,17 +1728,29 @@ export class NumberIndexContext extends IndexerContext {
     }
 }
 export class FunctionContext extends ParserRuleContext {
+    constructor(parser, parent, invokingState) {
+        super(parent, invokingState);
+        this.parser = parser;
+    }
     identifier() {
-        return this.getRuleContext(0, IdentifierContext);
+        return this.getTypedRuleContext(IdentifierContext, 0);
     }
     paramList() {
-        return this.tryGetRuleContext(0, ParamListContext);
+        return this.getTypedRuleContext(ParamListContext, 0);
     }
-    constructor(parent, invokingState) {
-        super(parent, invokingState);
+    get ruleIndex() {
+        return OpraFilterParser.RULE_function;
+    }
+    enterRule(listener) {
+        if (listener.enterFunction) {
+            listener.enterFunction(this);
+        }
+    }
+    exitRule(listener) {
+        if (listener.exitFunction) {
+            listener.exitFunction(this);
+        }
     }
-    // @Override
-    get ruleIndex() { return OpraFilterParser.RULE_function; }
     // @Override
     accept(visitor) {
         if (visitor.visitFunction) {
@@ -1626,20 +1762,30 @@ export class FunctionContext extends ParserRuleContext {
     }
 }
 export class ParamListContext extends ParserRuleContext {
+    constructor(parser, parent, invokingState) {
+        super(parent, invokingState);
+        this.parser = parser;
+    }
+    expression_list() {
+        return this.getTypedRuleContexts(ExpressionContext);
+    }
     expression(i) {
-        if (i === undefined) {
-            return this.getRuleContexts(ExpressionContext);
-        }
-        else {
-            return this.getRuleContext(i, ExpressionContext);
+        return this.getTypedRuleContext(ExpressionContext, i);
+    }
+    get ruleIndex() {
+        return OpraFilterParser.RULE_paramList;
+    }
+    enterRule(listener) {
+        if (listener.enterParamList) {
+            listener.enterParamList(this);
         }
     }
-    constructor(parent, invokingState) {
-        super(parent, invokingState);
+    exitRule(listener) {
+        if (listener.exitParamList) {
+            listener.exitParamList(this);
+        }
     }
     // @Override
-    get ruleIndex() { return OpraFilterParser.RULE_paramList; }
-    // @Override
     accept(visitor) {
         if (visitor.visitParamList) {
             return visitor.visitParamList(this);
@@ -1650,18 +1796,32 @@ export class ParamListContext extends ParserRuleContext {
     }
 }
 export class UnitContext extends ParserRuleContext {
+    constructor(parser, parent, invokingState) {
+        super(parent, invokingState);
+        this.parser = parser;
+    }
     dateTimePrecision() {
-        return this.tryGetRuleContext(0, DateTimePrecisionContext);
+        return this.getTypedRuleContext(DateTimePrecisionContext, 0);
     }
     pluralDateTimePrecision() {
-        return this.tryGetRuleContext(0, PluralDateTimePrecisionContext);
+        return this.getTypedRuleContext(PluralDateTimePrecisionContext, 0);
     }
-    STRING() { return this.tryGetToken(OpraFilterParser.STRING, 0); }
-    constructor(parent, invokingState) {
-        super(parent, invokingState);
+    STRING() {
+        return this.getToken(OpraFilterParser.STRING, 0);
+    }
+    get ruleIndex() {
+        return OpraFilterParser.RULE_unit;
+    }
+    enterRule(listener) {
+        if (listener.enterUnit) {
+            listener.enterUnit(this);
+        }
+    }
+    exitRule(listener) {
+        if (listener.exitUnit) {
+            listener.exitUnit(this);
+        }
     }
-    // @Override
-    get ruleIndex() { return OpraFilterParser.RULE_unit; }
     // @Override
     accept(visitor) {
         if (visitor.visitUnit) {
@@ -1673,11 +1833,23 @@ export class UnitContext extends ParserRuleContext {
     }
 }
 export class DateTimePrecisionContext extends ParserRuleContext {
-    constructor(parent, invokingState) {
+    constructor(parser, parent, invokingState) {
         super(parent, invokingState);
+        this.parser = parser;
+    }
+    get ruleIndex() {
+        return OpraFilterParser.RULE_dateTimePrecision;
+    }
+    enterRule(listener) {
+        if (listener.enterDateTimePrecision) {
+            listener.enterDateTimePrecision(this);
+        }
+    }
+    exitRule(listener) {
+        if (listener.exitDateTimePrecision) {
+            listener.exitDateTimePrecision(this);
+        }
     }
-    // @Override
-    get ruleIndex() { return OpraFilterParser.RULE_dateTimePrecision; }
     // @Override
     accept(visitor) {
         if (visitor.visitDateTimePrecision) {
@@ -1689,11 +1861,23 @@ export class DateTimePrecisionContext extends ParserRuleContext {
     }
 }
 export class PluralDateTimePrecisionContext extends ParserRuleContext {
-    constructor(parent, invokingState) {
+    constructor(parser, parent, invokingState) {
         super(parent, invokingState);
+        this.parser = parser;
+    }
+    get ruleIndex() {
+        return OpraFilterParser.RULE_pluralDateTimePrecision;
+    }
+    enterRule(listener) {
+        if (listener.enterPluralDateTimePrecision) {
+            listener.enterPluralDateTimePrecision(this);
+        }
+    }
+    exitRule(listener) {
+        if (listener.exitPluralDateTimePrecision) {
+            listener.exitPluralDateTimePrecision(this);
+        }
     }
-    // @Override
-    get ruleIndex() { return OpraFilterParser.RULE_pluralDateTimePrecision; }
     // @Override
     accept(visitor) {
         if (visitor.visitPluralDateTimePrecision) {
@@ -1705,20 +1889,30 @@ export class PluralDateTimePrecisionContext extends ParserRuleContext {
     }
 }
 export class QualifiedIdentifierContext extends ParserRuleContext {
+    constructor(parser, parent, invokingState) {
+        super(parent, invokingState);
+        this.parser = parser;
+    }
+    identifier_list() {
+        return this.getTypedRuleContexts(IdentifierContext);
+    }
     identifier(i) {
-        if (i === undefined) {
-            return this.getRuleContexts(IdentifierContext);
-        }
-        else {
-            return this.getRuleContext(i, IdentifierContext);
+        return this.getTypedRuleContext(IdentifierContext, i);
+    }
+    get ruleIndex() {
+        return OpraFilterParser.RULE_qualifiedIdentifier;
+    }
+    enterRule(listener) {
+        if (listener.enterQualifiedIdentifier) {
+            listener.enterQualifiedIdentifier(this);
         }
     }
-    constructor(parent, invokingState) {
-        super(parent, invokingState);
+    exitRule(listener) {
+        if (listener.exitQualifiedIdentifier) {
+            listener.exitQualifiedIdentifier(this);
+        }
     }
     // @Override
-    get ruleIndex() { return OpraFilterParser.RULE_qualifiedIdentifier; }
-    // @Override
     accept(visitor) {
         if (visitor.visitQualifiedIdentifier) {
             return visitor.visitQualifiedIdentifier(this);
@@ -1729,13 +1923,29 @@ export class QualifiedIdentifierContext extends ParserRuleContext {
     }
 }
 export class ExternalConstantContext extends ParserRuleContext {
-    IDENTIFIER() { return this.tryGetToken(OpraFilterParser.IDENTIFIER, 0); }
-    STRING() { return this.tryGetToken(OpraFilterParser.STRING, 0); }
-    constructor(parent, invokingState) {
+    constructor(parser, parent, invokingState) {
         super(parent, invokingState);
+        this.parser = parser;
+    }
+    IDENTIFIER() {
+        return this.getToken(OpraFilterParser.IDENTIFIER, 0);
+    }
+    STRING() {
+        return this.getToken(OpraFilterParser.STRING, 0);
+    }
+    get ruleIndex() {
+        return OpraFilterParser.RULE_externalConstant;
+    }
+    enterRule(listener) {
+        if (listener.enterExternalConstant) {
+            listener.enterExternalConstant(this);
+        }
+    }
+    exitRule(listener) {
+        if (listener.exitExternalConstant) {
+            listener.exitExternalConstant(this);
+        }
     }
-    // @Override
-    get ruleIndex() { return OpraFilterParser.RULE_externalConstant; }
     // @Override
     accept(visitor) {
         if (visitor.visitExternalConstant) {
@@ -1747,12 +1957,26 @@ export class ExternalConstantContext extends ParserRuleContext {
     }
 }
 export class IdentifierContext extends ParserRuleContext {
-    IDENTIFIER() { return this.getToken(OpraFilterParser.IDENTIFIER, 0); }
-    constructor(parent, invokingState) {
+    constructor(parser, parent, invokingState) {
         super(parent, invokingState);
+        this.parser = parser;
+    }
+    IDENTIFIER() {
+        return this.getToken(OpraFilterParser.IDENTIFIER, 0);
+    }
+    get ruleIndex() {
+        return OpraFilterParser.RULE_identifier;
+    }
+    enterRule(listener) {
+        if (listener.enterIdentifier) {
+            listener.enterIdentifier(this);
+        }
+    }
+    exitRule(listener) {
+        if (listener.exitIdentifier) {
+            listener.exitIdentifier(this);
+        }
     }
-    // @Override
-    get ruleIndex() { return OpraFilterParser.RULE_identifier; }
     // @Override
     accept(visitor) {
         if (visitor.visitIdentifier) {
@@ -1764,79 +1988,123 @@ export class IdentifierContext extends ParserRuleContext {
     }
 }
 export class LiteralContext extends ParserRuleContext {
-    constructor(parent, invokingState) {
+    constructor(parser, parent, invokingState) {
         super(parent, invokingState);
+        this.parser = parser;
+    }
+    get ruleIndex() {
+        return OpraFilterParser.RULE_literal;
     }
-    // @Override
-    get ruleIndex() { return OpraFilterParser.RULE_literal; }
     copyFrom(ctx) {
         super.copyFrom(ctx);
     }
 }
-export class NumberLiteralContext extends LiteralContext {
-    NUMBER() { return this.getToken(OpraFilterParser.NUMBER, 0); }
-    constructor(ctx) {
-        super(ctx.parent, ctx.invokingState);
-        this.copyFrom(ctx);
+export class TimeLiteralContext extends LiteralContext {
+    constructor(parser, ctx) {
+        super(parser, ctx.parentCtx, ctx.invokingState);
+        super.copyFrom(ctx);
+    }
+    TIME() {
+        return this.getToken(OpraFilterParser.TIME, 0);
+    }
+    enterRule(listener) {
+        if (listener.enterTimeLiteral) {
+            listener.enterTimeLiteral(this);
+        }
+    }
+    exitRule(listener) {
+        if (listener.exitTimeLiteral) {
+            listener.exitTimeLiteral(this);
+        }
     }
     // @Override
     accept(visitor) {
-        if (visitor.visitNumberLiteral) {
-            return visitor.visitNumberLiteral(this);
+        if (visitor.visitTimeLiteral) {
+            return visitor.visitTimeLiteral(this);
         }
         else {
             return visitor.visitChildren(this);
         }
     }
 }
-export class InfinityLiteralContext extends LiteralContext {
-    infinity() {
-        return this.getRuleContext(0, InfinityContext);
+export class NullLiteralContext extends LiteralContext {
+    constructor(parser, ctx) {
+        super(parser, ctx.parentCtx, ctx.invokingState);
+        super.copyFrom(ctx);
     }
-    constructor(ctx) {
-        super(ctx.parent, ctx.invokingState);
-        this.copyFrom(ctx);
+    null_() {
+        return this.getTypedRuleContext(NullContext, 0);
+    }
+    enterRule(listener) {
+        if (listener.enterNullLiteral) {
+            listener.enterNullLiteral(this);
+        }
+    }
+    exitRule(listener) {
+        if (listener.exitNullLiteral) {
+            listener.exitNullLiteral(this);
+        }
     }
     // @Override
     accept(visitor) {
-        if (visitor.visitInfinityLiteral) {
-            return visitor.visitInfinityLiteral(this);
+        if (visitor.visitNullLiteral) {
+            return visitor.visitNullLiteral(this);
         }
         else {
             return visitor.visitChildren(this);
         }
     }
 }
-export class BooleanLiteralContext extends LiteralContext {
-    boolean() {
-        return this.getRuleContext(0, BooleanContext);
+export class DateTimeLiteralContext extends LiteralContext {
+    constructor(parser, ctx) {
+        super(parser, ctx.parentCtx, ctx.invokingState);
+        super.copyFrom(ctx);
+    }
+    DATETIME() {
+        return this.getToken(OpraFilterParser.DATETIME, 0);
     }
-    constructor(ctx) {
-        super(ctx.parent, ctx.invokingState);
-        this.copyFrom(ctx);
+    enterRule(listener) {
+        if (listener.enterDateTimeLiteral) {
+            listener.enterDateTimeLiteral(this);
+        }
+    }
+    exitRule(listener) {
+        if (listener.exitDateTimeLiteral) {
+            listener.exitDateTimeLiteral(this);
+        }
     }
     // @Override
     accept(visitor) {
-        if (visitor.visitBooleanLiteral) {
-            return visitor.visitBooleanLiteral(this);
+        if (visitor.visitDateTimeLiteral) {
+            return visitor.visitDateTimeLiteral(this);
         }
         else {
             return visitor.visitChildren(this);
         }
     }
 }
-export class NullLiteralContext extends LiteralContext {
-    null() {
-        return this.getRuleContext(0, NullContext);
+export class StringLiteralContext extends LiteralContext {
+    constructor(parser, ctx) {
+        super(parser, ctx.parentCtx, ctx.invokingState);
+        super.copyFrom(ctx);
+    }
+    STRING() {
+        return this.getToken(OpraFilterParser.STRING, 0);
     }
-    constructor(ctx) {
-        super(ctx.parent, ctx.invokingState);
-        this.copyFrom(ctx);
+    enterRule(listener) {
+        if (listener.enterStringLiteral) {
+            listener.enterStringLiteral(this);
+        }
+    }
+    exitRule(listener) {
+        if (listener.exitStringLiteral) {
+            listener.exitStringLiteral(this);
+        }
     }
     // @Override
     accept(visitor) {
-        if (visitor.visitNullLiteral) {
-            return visitor.visitNullLiteral(this);
+        if (visitor.visitStringLiteral) {
+            return visitor.visitStringLiteral(this);
         }
         else {
             return visitor.visitChildren(this);
@@ -1844,10 +2112,22 @@ export class NullLiteralContext extends LiteralContext {
     }
 }
 export class DateLiteralContext extends LiteralContext {
-    DATE() { return this.getToken(OpraFilterParser.DATE, 0); }
-    constructor(ctx) {
-        super(ctx.parent, ctx.invokingState);
-        this.copyFrom(ctx);
+    constructor(parser, ctx) {
+        super(parser, ctx.parentCtx, ctx.invokingState);
+        super.copyFrom(ctx);
+    }
+    DATE() {
+        return this.getToken(OpraFilterParser.DATE, 0);
+    }
+    enterRule(listener) {
+        if (listener.enterDateLiteral) {
+            listener.enterDateLiteral(this);
+        }
+    }
+    exitRule(listener) {
+        if (listener.exitDateLiteral) {
+            listener.exitDateLiteral(this);
+        }
     }
     // @Override
     accept(visitor) {
@@ -1859,48 +2139,84 @@ export class DateLiteralContext extends LiteralContext {
         }
     }
 }
-export class DateTimeLiteralContext extends LiteralContext {
-    DATETIME() { return this.getToken(OpraFilterParser.DATETIME, 0); }
-    constructor(ctx) {
-        super(ctx.parent, ctx.invokingState);
-        this.copyFrom(ctx);
+export class InfinityLiteralContext extends LiteralContext {
+    constructor(parser, ctx) {
+        super(parser, ctx.parentCtx, ctx.invokingState);
+        super.copyFrom(ctx);
+    }
+    infinity() {
+        return this.getTypedRuleContext(InfinityContext, 0);
+    }
+    enterRule(listener) {
+        if (listener.enterInfinityLiteral) {
+            listener.enterInfinityLiteral(this);
+        }
+    }
+    exitRule(listener) {
+        if (listener.exitInfinityLiteral) {
+            listener.exitInfinityLiteral(this);
+        }
     }
     // @Override
     accept(visitor) {
-        if (visitor.visitDateTimeLiteral) {
-            return visitor.visitDateTimeLiteral(this);
+        if (visitor.visitInfinityLiteral) {
+            return visitor.visitInfinityLiteral(this);
         }
         else {
             return visitor.visitChildren(this);
         }
     }
 }
-export class TimeLiteralContext extends LiteralContext {
-    TIME() { return this.getToken(OpraFilterParser.TIME, 0); }
-    constructor(ctx) {
-        super(ctx.parent, ctx.invokingState);
-        this.copyFrom(ctx);
+export class BooleanLiteralContext extends LiteralContext {
+    constructor(parser, ctx) {
+        super(parser, ctx.parentCtx, ctx.invokingState);
+        super.copyFrom(ctx);
+    }
+    boolean_() {
+        return this.getTypedRuleContext(BooleanContext, 0);
+    }
+    enterRule(listener) {
+        if (listener.enterBooleanLiteral) {
+            listener.enterBooleanLiteral(this);
+        }
+    }
+    exitRule(listener) {
+        if (listener.exitBooleanLiteral) {
+            listener.exitBooleanLiteral(this);
+        }
     }
     // @Override
     accept(visitor) {
-        if (visitor.visitTimeLiteral) {
-            return visitor.visitTimeLiteral(this);
+        if (visitor.visitBooleanLiteral) {
+            return visitor.visitBooleanLiteral(this);
         }
         else {
             return visitor.visitChildren(this);
         }
     }
 }
-export class StringLiteralContext extends LiteralContext {
-    STRING() { return this.getToken(OpraFilterParser.STRING, 0); }
-    constructor(ctx) {
-        super(ctx.parent, ctx.invokingState);
-        this.copyFrom(ctx);
+export class NumberLiteralContext extends LiteralContext {
+    constructor(parser, ctx) {
+        super(parser, ctx.parentCtx, ctx.invokingState);
+        super.copyFrom(ctx);
+    }
+    NUMBER() {
+        return this.getToken(OpraFilterParser.NUMBER, 0);
+    }
+    enterRule(listener) {
+        if (listener.enterNumberLiteral) {
+            listener.enterNumberLiteral(this);
+        }
+    }
+    exitRule(listener) {
+        if (listener.exitNumberLiteral) {
+            listener.exitNumberLiteral(this);
+        }
     }
     // @Override
     accept(visitor) {
-        if (visitor.visitStringLiteral) {
-            return visitor.visitStringLiteral(this);
+        if (visitor.visitNumberLiteral) {
+            return visitor.visitNumberLiteral(this);
         }
         else {
             return visitor.visitChildren(this);
@@ -1908,11 +2224,23 @@ export class StringLiteralContext extends LiteralContext {
     }
 }
 export class CompOpContext extends ParserRuleContext {
-    constructor(parent, invokingState) {
+    constructor(parser, parent, invokingState) {
         super(parent, invokingState);
+        this.parser = parser;
+    }
+    get ruleIndex() {
+        return OpraFilterParser.RULE_compOp;
+    }
+    enterRule(listener) {
+        if (listener.enterCompOp) {
+            listener.enterCompOp(this);
+        }
+    }
+    exitRule(listener) {
+        if (listener.exitCompOp) {
+            listener.exitCompOp(this);
+        }
     }
-    // @Override
-    get ruleIndex() { return OpraFilterParser.RULE_compOp; }
     // @Override
     accept(visitor) {
         if (visitor.visitCompOp) {
@@ -1924,11 +2252,23 @@ export class CompOpContext extends ParserRuleContext {
     }
 }
 export class ArthOpContext extends ParserRuleContext {
-    constructor(parent, invokingState) {
+    constructor(parser, parent, invokingState) {
         super(parent, invokingState);
+        this.parser = parser;
+    }
+    get ruleIndex() {
+        return OpraFilterParser.RULE_arthOp;
+    }
+    enterRule(listener) {
+        if (listener.enterArthOp) {
+            listener.enterArthOp(this);
+        }
+    }
+    exitRule(listener) {
+        if (listener.exitArthOp) {
+            listener.exitArthOp(this);
+        }
     }
-    // @Override
-    get ruleIndex() { return OpraFilterParser.RULE_arthOp; }
     // @Override
     accept(visitor) {
         if (visitor.visitArthOp) {
@@ -1940,11 +2280,23 @@ export class ArthOpContext extends ParserRuleContext {
     }
 }
 export class PolarOpContext extends ParserRuleContext {
-    constructor(parent, invokingState) {
+    constructor(parser, parent, invokingState) {
         super(parent, invokingState);
+        this.parser = parser;
+    }
+    get ruleIndex() {
+        return OpraFilterParser.RULE_polarOp;
+    }
+    enterRule(listener) {
+        if (listener.enterPolarOp) {
+            listener.enterPolarOp(this);
+        }
+    }
+    exitRule(listener) {
+        if (listener.exitPolarOp) {
+            listener.exitPolarOp(this);
+        }
     }
-    // @Override
-    get ruleIndex() { return OpraFilterParser.RULE_polarOp; }
     // @Override
     accept(visitor) {
         if (visitor.visitPolarOp) {
@@ -1956,11 +2308,23 @@ export class PolarOpContext extends ParserRuleContext {
     }
 }
 export class LogOpContext extends ParserRuleContext {
-    constructor(parent, invokingState) {
+    constructor(parser, parent, invokingState) {
         super(parent, invokingState);
+        this.parser = parser;
+    }
+    get ruleIndex() {
+        return OpraFilterParser.RULE_logOp;
+    }
+    enterRule(listener) {
+        if (listener.enterLogOp) {
+            listener.enterLogOp(this);
+        }
+    }
+    exitRule(listener) {
+        if (listener.exitLogOp) {
+            listener.exitLogOp(this);
+        }
     }
-    // @Override
-    get ruleIndex() { return OpraFilterParser.RULE_logOp; }
     // @Override
     accept(visitor) {
         if (visitor.visitLogOp) {
@@ -1972,11 +2336,23 @@ export class LogOpContext extends ParserRuleContext {
     }
 }
 export class BooleanContext extends ParserRuleContext {
-    constructor(parent, invokingState) {
+    constructor(parser, parent, invokingState) {
         super(parent, invokingState);
+        this.parser = parser;
+    }
+    get ruleIndex() {
+        return OpraFilterParser.RULE_boolean;
+    }
+    enterRule(listener) {
+        if (listener.enterBoolean) {
+            listener.enterBoolean(this);
+        }
+    }
+    exitRule(listener) {
+        if (listener.exitBoolean) {
+            listener.exitBoolean(this);
+        }
     }
-    // @Override
-    get ruleIndex() { return OpraFilterParser.RULE_boolean; }
     // @Override
     accept(visitor) {
         if (visitor.visitBoolean) {
@@ -1988,11 +2364,23 @@ export class BooleanContext extends ParserRuleContext {
     }
 }
 export class NullContext extends ParserRuleContext {
-    constructor(parent, invokingState) {
+    constructor(parser, parent, invokingState) {
         super(parent, invokingState);
+        this.parser = parser;
+    }
+    get ruleIndex() {
+        return OpraFilterParser.RULE_null;
+    }
+    enterRule(listener) {
+        if (listener.enterNull) {
+            listener.enterNull(this);
+        }
+    }
+    exitRule(listener) {
+        if (listener.exitNull) {
+            listener.exitNull(this);
+        }
     }
-    // @Override
-    get ruleIndex() { return OpraFilterParser.RULE_null; }
     // @Override
     accept(visitor) {
         if (visitor.visitNull) {
@@ -2004,11 +2392,23 @@ export class NullContext extends ParserRuleContext {
     }
 }
 export class InfinityContext extends ParserRuleContext {
-    constructor(parent, invokingState) {
+    constructor(parser, parent, invokingState) {
         super(parent, invokingState);
+        this.parser = parser;
+    }
+    get ruleIndex() {
+        return OpraFilterParser.RULE_infinity;
+    }
+    enterRule(listener) {
+        if (listener.enterInfinity) {
+            listener.enterInfinity(this);
+        }
+    }
+    exitRule(listener) {
+        if (listener.exitInfinity) {
+            listener.exitInfinity(this);
+        }
     }
-    // @Override
-    get ruleIndex() { return OpraFilterParser.RULE_infinity; }
     // @Override
     accept(visitor) {
         if (visitor.visitInfinity) {