@opra/common 0.17.0 → 0.17.2

package/cjs/filter/antlr/OpraFilterParser.js

@@ -1,10 +1,9 @@
 "use strict";
-/* eslint-disable */
-// Generated from ./src/filter/antlr/OpraFilter.g4 by ANTLR 4.11.2-SNAPSHOT
-// noinspection ES6UnusedImports,JSUnusedGlobalSymbols,JSUnusedLocalSymbols,SpellCheckingInspection
-// @ts-nocheck
+/* eslint-disable camelcase,no-bitwise */
+// Generated from ./src/filter/antlr/OpraFilter.g4 by ANTLR 4.12.0
+// noinspection ES6UnusedImports,JSUnusedGlobalSymbols,JSUnusedLocalSymbols
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.InfinityContext = exports.NullContext = exports.BooleanContext = exports.LogOpContext = exports.PolarOpContext = exports.ArthOpContext = exports.CompOpContext = exports.NumberLiteralContext = exports.BooleanLiteralContext = exports.InfinityLiteralContext = exports.DateLiteralContext = exports.StringLiteralContext = exports.DateTimeLiteralContext = exports.NullLiteralContext = exports.TimeLiteralContext = exports.LiteralContext = exports.IdentifierContext = exports.ExternalConstantContext = exports.QualifiedIdentifierContext = exports.PluralDateTimePrecisionContext = exports.DateTimePrecisionContext = exports.UnitContext = exports.ParamListContext = exports.FunctionContext = exports.MemberIndexContext = exports.NumberIndexContext = exports.IndexerContext = exports.MemberInvocationContext = exports.InvocationContext = exports.InvocableContext = exports.QualifiedIdentifierTermContext = exports.LiteralTermContext = exports.ExternalConstantTermContext = exports.TermContext = exports.TermExpressionContext = exports.LogicalExpressionContext = exports.ArithmeticExpressionContext = exports.ComparisonExpressionContext = exports.PolarityExpressionContext = exports.ArrayExpressionContext = exports.ParenthesizedExpressionContext = exports.ExpressionContext = exports.RootContext = void 0;
+exports.PolarityOperatorContext = exports.LogicalOperatorContext = exports.ComparisonOperatorContext = exports.ArithmeticOperatorContext = exports.InfinityContext = exports.NullContext = exports.BooleanContext = exports.ArrayValueContext = exports.IdentifierContext = exports.ExternalConstantContext = exports.QualifiedIdentifierContext = exports.NumberLiteralContext = exports.BooleanLiteralContext = exports.InfinityLiteralContext = exports.DateLiteralContext = exports.StringLiteralContext = exports.DateTimeLiteralContext = exports.NullLiteralContext = exports.TimeLiteralContext = exports.ValueContext = exports.ParenthesizedItemContext = exports.ComparisonRightContext = exports.ComparisonLeftContext = exports.LogicalExpressionContext = exports.ComparisonExpressionContext = exports.NegativeExpressionContext = exports.ParenthesizedExpressionContext = exports.ExpressionContext = exports.RootContext = void 0;
 const antlr4_1 = require("@browsery/antlr4");
 class OpraFilterParser extends antlr4_1.Parser {
     get grammarFileName() {
@@ -31,14 +30,14 @@ class OpraFilterParser extends antlr4_1.Parser {
     }
     // @RuleVersion(0)
     root() {
-        let localctx = new RootContext(this, this._ctx, this.state);
+        const localctx = new RootContext(this, this._ctx, this.state);
         this.enterRule(localctx, 0, OpraFilterParser.RULE_root);
         try {
             this.enterOuterAlt(localctx, 1);
             {
-                this.state = 44;
+                this.state = 34;
                 this.expression(0);
-                this.state = 45;
+                this.state = 35;
                 this.match(OpraFilterParser.EOF);
             }
         }
@@ -62,50 +61,31 @@ class OpraFilterParser extends antlr4_1.Parser {
         if (_p === undefined) {
             _p = 0;
         }
-        let _parentctx = this._ctx;
-        let _parentState = this.state;
+        const _parentctx = this._ctx;
+        const _parentState = this.state;
         let localctx = new ExpressionContext(this, this._ctx, _parentState);
         let _prevctx = localctx;
-        let _startState = 2;
+        const _startState = 2;
         this.enterRecursionRule(localctx, 2, OpraFilterParser.RULE_expression, _p);
         let _la;
         try {
             let _alt;
             this.enterOuterAlt(localctx, 1);
             {
-                this.state = 67;
+                this.state = 48;
                 this._errHandler.sync(this);
                 switch (this._input.LA(1)) {
-                    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(this, localctx);
-                            this._ctx = localctx;
-                            _prevctx = localctx;
-                            this.state = 48;
-                            this.term();
-                        }
-                        break;
-                    case 36:
-                    case 37:
+                    case 35:
                         {
-                            localctx = new PolarityExpressionContext(this, localctx);
+                            localctx = new ComparisonExpressionContext(this, localctx);
                             this._ctx = localctx;
                             _prevctx = localctx;
-                            this.state = 49;
-                            this.polarOp();
-                            this.state = 50;
-                            this.expression(6);
+                            this.state = 38;
+                            localctx._left = this.comparisonLeft();
+                            this.state = 39;
+                            localctx._operator = this.comparisonOperator();
+                            this.state = 40;
+                            localctx._right = this.comparisonRight();
                         }
                         break;
                     case 1:
@@ -113,108 +93,65 @@ class OpraFilterParser extends antlr4_1.Parser {
                             localctx = new ParenthesizedExpressionContext(this, localctx);
                             this._ctx = localctx;
                             _prevctx = localctx;
-                            this.state = 52;
+                            this.state = 42;
                             this.match(OpraFilterParser.T__0);
-                            this.state = 53;
-                            this.expression(0);
-                            this.state = 54;
+                            this.state = 43;
+                            this.parenthesizedItem();
+                            this.state = 44;
                             this.match(OpraFilterParser.T__1);
                         }
                         break;
                     case 3:
+                    case 4:
                         {
-                            localctx = new ArrayExpressionContext(this, localctx);
+                            localctx = new NegativeExpressionContext(this, localctx);
                             this._ctx = localctx;
                             _prevctx = localctx;
-                            this.state = 56;
-                            this.match(OpraFilterParser.T__2);
-                            this.state = 57;
-                            this.expression(0);
-                            this.state = 62;
-                            this._errHandler.sync(this);
+                            this.state = 46;
                             _la = this._input.LA(1);
-                            while (_la === 4) {
-                                {
-                                    {
-                                        this.state = 58;
-                                        this.match(OpraFilterParser.T__3);
-                                        this.state = 59;
-                                        this.expression(0);
-                                    }
-                                }
-                                this.state = 64;
-                                this._errHandler.sync(this);
-                                _la = this._input.LA(1);
+                            if (!(_la === 3 || _la === 4)) {
+                                this._errHandler.recoverInline(this);
+                            }
+                            else {
+                                this._errHandler.reportMatch(this);
+                                this.consume();
                             }
-                            this.state = 65;
-                            this.match(OpraFilterParser.T__4);
+                            this.state = 47;
+                            this.expression(1);
                         }
                         break;
                     default:
                         throw new antlr4_1.NoViableAltException(this);
                 }
                 this._ctx.stop = this._input.LT(-1);
-                this.state = 83;
+                this.state = 56;
                 this._errHandler.sync(this);
-                _alt = this._interp.adaptivePredict(this._input, 3, this._ctx);
+                _alt = this._interp.adaptivePredict(this._input, 1, this._ctx);
                 while (_alt !== 2 && _alt !== antlr4_1.ATN.INVALID_ALT_NUMBER) {
                     if (_alt === 1) {
                         if (this._parseListeners != null) {
                             this.triggerExitRuleEvent();
                         }
+                        // eslint-disable-next-line @typescript-eslint/no-unused-vars
                         _prevctx = localctx;
                         {
-                            this.state = 81;
-                            this._errHandler.sync(this);
-                            switch (this._interp.adaptivePredict(this._input, 2, this._ctx)) {
-                                case 1:
-                                    {
-                                        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)");
-                                        }
-                                        this.state = 70;
-                                        this.arthOp();
-                                        this.state = 71;
-                                        this.expression(6);
-                                    }
-                                    break;
-                                case 2:
-                                    {
-                                        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)");
-                                        }
-                                        this.state = 74;
-                                        this.compOp();
-                                        this.state = 75;
-                                        this.expression(5);
-                                    }
-                                    break;
-                                case 3:
-                                    {
-                                        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)");
-                                        }
-                                        this.state = 78;
-                                        this.logOp();
-                                        this.state = 79;
-                                        this.expression(4);
-                                    }
-                                    break;
+                            {
+                                localctx = new LogicalExpressionContext(this, new ExpressionContext(this, _parentctx, _parentState));
+                                this.pushNewRecursionContext(localctx, _startState, OpraFilterParser.RULE_expression);
+                                this.state = 50;
+                                if (!(this.precpred(this._ctx, 3))) {
+                                    throw this.createFailedPredicateException("this.precpred(this._ctx, 3)");
+                                }
+                                this.state = 51;
+                                localctx._op = this.logicalOperator();
+                                this.state = 52;
+                                this.expression(4);
                             }
                         }
                     }
-                    this.state = 85;
+                    this.state = 58;
                     this._errHandler.sync(this);
-                    _alt = this._interp.adaptivePredict(this._input, 3, this._ctx);
+                    _alt = this._interp.adaptivePredict(this._input, 1, this._ctx);
                 }
             }
         }
@@ -234,46 +171,195 @@ class OpraFilterParser extends antlr4_1.Parser {
         return localctx;
     }
     // @RuleVersion(0)
-    term() {
-        let localctx = new TermContext(this, this._ctx, this.state);
-        this.enterRule(localctx, 4, OpraFilterParser.RULE_term);
+    comparisonLeft() {
+        const localctx = new ComparisonLeftContext(this, this._ctx, this.state);
+        this.enterRule(localctx, 4, OpraFilterParser.RULE_comparisonLeft);
+        try {
+            this.enterOuterAlt(localctx, 1);
+            {
+                this.state = 59;
+                this.qualifiedIdentifier();
+            }
+        }
+        catch (re) {
+            if (re instanceof antlr4_1.RecognitionException) {
+                localctx.exception = re;
+                this._errHandler.reportError(this, re);
+                this._errHandler.recover(this, re);
+            }
+            else {
+                throw re;
+            }
+        }
+        finally {
+            this.exitRule();
+        }
+        return localctx;
+    }
+    // @RuleVersion(0)
+    comparisonRight() {
+        const localctx = new ComparisonRightContext(this, this._ctx, this.state);
+        this.enterRule(localctx, 6, OpraFilterParser.RULE_comparisonRight);
         try {
-            this.state = 89;
+            this.state = 65;
             this._errHandler.sync(this);
             switch (this._input.LA(1)) {
+                case 10:
+                case 11:
+                case 12:
+                case 13:
+                case 14:
+                case 37:
+                case 38:
+                case 39:
+                case 40:
                 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();
+                        this.state = 61;
+                        this.value();
                     }
                     break;
-                case 50:
-                    localctx = new QualifiedIdentifierTermContext(this, localctx);
+                case 35:
                     this.enterOuterAlt(localctx, 2);
                     {
-                        this.state = 87;
+                        this.state = 62;
                         this.qualifiedIdentifier();
                     }
                     break;
-                case 23:
-                    localctx = new ExternalConstantTermContext(this, localctx);
+                case 6:
                     this.enterOuterAlt(localctx, 3);
                     {
-                        this.state = 88;
+                        this.state = 63;
                         this.externalConstant();
                     }
                     break;
+                case 7:
+                    this.enterOuterAlt(localctx, 4);
+                    {
+                        this.state = 64;
+                        this.arrayValue();
+                    }
+                    break;
+                default:
+                    throw new antlr4_1.NoViableAltException(this);
+            }
+        }
+        catch (re) {
+            if (re instanceof antlr4_1.RecognitionException) {
+                localctx.exception = re;
+                this._errHandler.reportError(this, re);
+                this._errHandler.recover(this, re);
+            }
+            else {
+                throw re;
+            }
+        }
+        finally {
+            this.exitRule();
+        }
+        return localctx;
+    }
+    // @RuleVersion(0)
+    parenthesizedItem() {
+        const localctx = new ParenthesizedItemContext(this, this._ctx, this.state);
+        this.enterRule(localctx, 8, OpraFilterParser.RULE_parenthesizedItem);
+        try {
+            this.enterOuterAlt(localctx, 1);
+            {
+                this.state = 67;
+                this.expression(0);
+            }
+        }
+        catch (re) {
+            if (re instanceof antlr4_1.RecognitionException) {
+                localctx.exception = re;
+                this._errHandler.reportError(this, re);
+                this._errHandler.recover(this, re);
+            }
+            else {
+                throw re;
+            }
+        }
+        finally {
+            this.exitRule();
+        }
+        return localctx;
+    }
+    // @RuleVersion(0)
+    value() {
+        let localctx = new ValueContext(this, this._ctx, this.state);
+        this.enterRule(localctx, 10, OpraFilterParser.RULE_value);
+        try {
+            this.state = 77;
+            this._errHandler.sync(this);
+            switch (this._input.LA(1)) {
+                case 40:
+                    localctx = new NumberLiteralContext(this, localctx);
+                    this.enterOuterAlt(localctx, 1);
+                    {
+                        this.state = 69;
+                        this.match(OpraFilterParser.NUMBER);
+                    }
+                    break;
+                case 13:
+                case 14:
+                    localctx = new InfinityLiteralContext(this, localctx);
+                    this.enterOuterAlt(localctx, 2);
+                    {
+                        this.state = 70;
+                        this.infinity();
+                    }
+                    break;
+                case 10:
+                case 11:
+                    localctx = new BooleanLiteralContext(this, localctx);
+                    this.enterOuterAlt(localctx, 3);
+                    {
+                        this.state = 71;
+                        this.boolean_();
+                    }
+                    break;
+                case 12:
+                    localctx = new NullLiteralContext(this, localctx);
+                    this.enterOuterAlt(localctx, 4);
+                    {
+                        this.state = 72;
+                        this.null_();
+                    }
+                    break;
+                case 37:
+                    localctx = new DateLiteralContext(this, localctx);
+                    this.enterOuterAlt(localctx, 5);
+                    {
+                        this.state = 73;
+                        this.match(OpraFilterParser.DATE);
+                    }
+                    break;
+                case 38:
+                    localctx = new DateTimeLiteralContext(this, localctx);
+                    this.enterOuterAlt(localctx, 6);
+                    {
+                        this.state = 74;
+                        this.match(OpraFilterParser.DATETIME);
+                    }
+                    break;
+                case 39:
+                    localctx = new TimeLiteralContext(this, localctx);
+                    this.enterOuterAlt(localctx, 7);
+                    {
+                        this.state = 75;
+                        this.match(OpraFilterParser.TIME);
+                    }
+                    break;
+                case 42:
+                    localctx = new StringLiteralContext(this, localctx);
+                    this.enterOuterAlt(localctx, 8);
+                    {
+                        this.state = 76;
+                        this.match(OpraFilterParser.STRING);
+                    }
+                    break;
                 default:
                     throw new antlr4_1.NoViableAltException(this);
             }
@@ -294,14 +380,33 @@ class OpraFilterParser extends antlr4_1.Parser {
         return localctx;
     }
     // @RuleVersion(0)
-    invocable() {
-        let localctx = new InvocableContext(this, this._ctx, this.state);
-        this.enterRule(localctx, 6, OpraFilterParser.RULE_invocable);
+    qualifiedIdentifier() {
+        const localctx = new QualifiedIdentifierContext(this, this._ctx, this.state);
+        this.enterRule(localctx, 12, OpraFilterParser.RULE_qualifiedIdentifier);
         try {
+            let _alt;
             this.enterOuterAlt(localctx, 1);
             {
-                this.state = 91;
-                this.function_();
+                this.state = 84;
+                this._errHandler.sync(this);
+                _alt = this._interp.adaptivePredict(this._input, 4, this._ctx);
+                while (_alt !== 2 && _alt !== antlr4_1.ATN.INVALID_ALT_NUMBER) {
+                    if (_alt === 1) {
+                        {
+                            {
+                                this.state = 79;
+                                this.identifier();
+                                this.state = 80;
+                                this.match(OpraFilterParser.T__4);
+                            }
+                        }
+                    }
+                    this.state = 86;
+                    this._errHandler.sync(this);
+                    _alt = this._interp.adaptivePredict(this._input, 4, this._ctx);
+                }
+                this.state = 87;
+                this.identifier();
             }
         }
         catch (re) {
@@ -320,14 +425,15 @@ class OpraFilterParser extends antlr4_1.Parser {
         return localctx;
     }
     // @RuleVersion(0)
-    invocation() {
-        let localctx = new InvocationContext(this, this._ctx, this.state);
-        this.enterRule(localctx, 8, OpraFilterParser.RULE_invocation);
+    externalConstant() {
+        const localctx = new ExternalConstantContext(this, this._ctx, this.state);
+        this.enterRule(localctx, 14, OpraFilterParser.RULE_externalConstant);
         try {
-            localctx = new MemberInvocationContext(this, localctx);
             this.enterOuterAlt(localctx, 1);
             {
-                this.state = 93;
+                this.state = 89;
+                this.match(OpraFilterParser.T__5);
+                this.state = 90;
                 this.identifier();
             }
         }
@@ -347,31 +453,14 @@ class OpraFilterParser extends antlr4_1.Parser {
         return localctx;
     }
     // @RuleVersion(0)
-    indexer() {
-        let localctx = new IndexerContext(this, this._ctx, this.state);
-        this.enterRule(localctx, 10, OpraFilterParser.RULE_indexer);
+    identifier() {
+        const localctx = new IdentifierContext(this, this._ctx, this.state);
+        this.enterRule(localctx, 16, OpraFilterParser.RULE_identifier);
         try {
-            this.state = 97;
-            this._errHandler.sync(this);
-            switch (this._input.LA(1)) {
-                case 50:
-                    localctx = new MemberIndexContext(this, localctx);
-                    this.enterOuterAlt(localctx, 1);
-                    {
-                        this.state = 95;
-                        this.identifier();
-                    }
-                    break;
-                case 53:
-                    localctx = new NumberIndexContext(this, localctx);
-                    this.enterOuterAlt(localctx, 2);
-                    {
-                        this.state = 96;
-                        this.match(OpraFilterParser.INTEGER);
-                    }
-                    break;
-                default:
-                    throw new antlr4_1.NoViableAltException(this);
+            this.enterOuterAlt(localctx, 1);
+            {
+                this.state = 92;
+                this.match(OpraFilterParser.IDENTIFIER);
             }
         }
         catch (re) {
@@ -390,28 +479,35 @@ class OpraFilterParser extends antlr4_1.Parser {
         return localctx;
     }
     // @RuleVersion(0)
-    function_() {
-        let localctx = new FunctionContext(this, this._ctx, this.state);
-        this.enterRule(localctx, 12, OpraFilterParser.RULE_function);
+    arrayValue() {
+        const localctx = new ArrayValueContext(this, this._ctx, this.state);
+        this.enterRule(localctx, 18, OpraFilterParser.RULE_arrayValue);
         let _la;
         try {
             this.enterOuterAlt(localctx, 1);
             {
-                this.state = 99;
-                this.identifier();
+                this.state = 94;
+                this.match(OpraFilterParser.T__6);
+                this.state = 95;
+                this.value();
                 this.state = 100;
-                this.match(OpraFilterParser.T__0);
-                this.state = 102;
                 this._errHandler.sync(this);
                 _la = this._input.LA(1);
-                if ((((_la) & ~0x1F) === 0 && ((1 << _la) & 8388618) !== 0) || ((((_la - 36)) & ~0x1F) === 0 && ((1 << (_la - 36)) & 131011) !== 0)) {
+                while (_la === 8) {
                     {
-                        this.state = 101;
-                        this.paramList();
+                        {
+                            this.state = 96;
+                            this.match(OpraFilterParser.T__7);
+                            this.state = 97;
+                            this.value();
+                        }
                     }
+                    this.state = 102;
+                    this._errHandler.sync(this);
+                    _la = this._input.LA(1);
                 }
-                this.state = 104;
-                this.match(OpraFilterParser.T__1);
+                this.state = 103;
+                this.match(OpraFilterParser.T__8);
             }
         }
         catch (re) {
@@ -430,30 +526,21 @@ class OpraFilterParser extends antlr4_1.Parser {
         return localctx;
     }
     // @RuleVersion(0)
-    paramList() {
-        let localctx = new ParamListContext(this, this._ctx, this.state);
-        this.enterRule(localctx, 14, OpraFilterParser.RULE_paramList);
+    boolean_() {
+        const localctx = new BooleanContext(this, this._ctx, this.state);
+        this.enterRule(localctx, 20, OpraFilterParser.RULE_boolean);
         let _la;
         try {
             this.enterOuterAlt(localctx, 1);
             {
-                this.state = 106;
-                this.expression(0);
-                this.state = 111;
-                this._errHandler.sync(this);
+                this.state = 105;
                 _la = this._input.LA(1);
-                while (_la === 4) {
-                    {
-                        {
-                            this.state = 107;
-                            this.match(OpraFilterParser.T__3);
-                            this.state = 108;
-                            this.expression(0);
-                        }
-                    }
-                    this.state = 113;
-                    this._errHandler.sync(this);
-                    _la = this._input.LA(1);
+                if (!(_la === 10 || _la === 11)) {
+                    this._errHandler.recoverInline(this);
+                }
+                else {
+                    this._errHandler.reportMatch(this);
+                    this.consume();
                 }
             }
         }
@@ -473,50 +560,14 @@ class OpraFilterParser extends antlr4_1.Parser {
         return localctx;
     }
     // @RuleVersion(0)
-    unit() {
-        let localctx = new UnitContext(this, this._ctx, this.state);
-        this.enterRule(localctx, 16, OpraFilterParser.RULE_unit);
+    null_() {
+        const localctx = new NullContext(this, this._ctx, this.state);
+        this.enterRule(localctx, 22, OpraFilterParser.RULE_null);
         try {
-            this.state = 117;
-            this._errHandler.sync(this);
-            switch (this._input.LA(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 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 51:
-                    this.enterOuterAlt(localctx, 3);
-                    {
-                        this.state = 116;
-                        this.match(OpraFilterParser.STRING);
-                    }
-                    break;
-                default:
-                    throw new antlr4_1.NoViableAltException(this);
+            this.enterOuterAlt(localctx, 1);
+            {
+                this.state = 107;
+                this.match(OpraFilterParser.T__11);
             }
         }
         catch (re) {
@@ -535,16 +586,16 @@ class OpraFilterParser extends antlr4_1.Parser {
         return localctx;
     }
     // @RuleVersion(0)
-    dateTimePrecision() {
-        let localctx = new DateTimePrecisionContext(this, this._ctx, this.state);
-        this.enterRule(localctx, 18, OpraFilterParser.RULE_dateTimePrecision);
+    infinity() {
+        const localctx = new InfinityContext(this, this._ctx, this.state);
+        this.enterRule(localctx, 24, OpraFilterParser.RULE_infinity);
         let _la;
         try {
             this.enterOuterAlt(localctx, 1);
             {
-                this.state = 119;
+                this.state = 109;
                 _la = this._input.LA(1);
-                if (!((((_la) & ~0x1F) === 0 && ((1 << _la) & 16320) !== 0))) {
+                if (!(_la === 13 || _la === 14)) {
                     this._errHandler.recoverInline(this);
                 }
                 else {
@@ -569,16 +620,16 @@ class OpraFilterParser extends antlr4_1.Parser {
         return localctx;
     }
     // @RuleVersion(0)
-    pluralDateTimePrecision() {
-        let localctx = new PluralDateTimePrecisionContext(this, this._ctx, this.state);
-        this.enterRule(localctx, 20, OpraFilterParser.RULE_pluralDateTimePrecision);
+    arithmeticOperator() {
+        const localctx = new ArithmeticOperatorContext(this, this._ctx, this.state);
+        this.enterRule(localctx, 26, OpraFilterParser.RULE_arithmeticOperator);
         let _la;
         try {
             this.enterOuterAlt(localctx, 1);
             {
-                this.state = 121;
+                this.state = 111;
                 _la = this._input.LA(1);
-                if (!((((_la) & ~0x1F) === 0 && ((1 << _la) & 4177920) !== 0))) {
+                if (!((((_la) & ~0x1F) === 0 && ((1 << _la) & 491520) !== 0))) {
                     this._errHandler.recoverInline(this);
                 }
                 else {
@@ -603,33 +654,22 @@ class OpraFilterParser extends antlr4_1.Parser {
         return localctx;
     }
     // @RuleVersion(0)
-    qualifiedIdentifier() {
-        let localctx = new QualifiedIdentifierContext(this, this._ctx, this.state);
-        this.enterRule(localctx, 22, OpraFilterParser.RULE_qualifiedIdentifier);
+    comparisonOperator() {
+        const localctx = new ComparisonOperatorContext(this, this._ctx, this.state);
+        this.enterRule(localctx, 28, OpraFilterParser.RULE_comparisonOperator);
+        let _la;
         try {
-            let _alt;
             this.enterOuterAlt(localctx, 1);
             {
-                this.state = 128;
-                this._errHandler.sync(this);
-                _alt = this._interp.adaptivePredict(this._input, 9, this._ctx);
-                while (_alt !== 2 && _alt !== antlr4_1.ATN.INVALID_ALT_NUMBER) {
-                    if (_alt === 1) {
-                        {
-                            {
-                                this.state = 123;
-                                this.identifier();
-                                this.state = 124;
-                                this.match(OpraFilterParser.T__21);
-                            }
-                        }
-                    }
-                    this.state = 130;
-                    this._errHandler.sync(this);
-                    _alt = this._interp.adaptivePredict(this._input, 9, this._ctx);
+                this.state = 113;
+                _la = this._input.LA(1);
+                if (!((((_la) & ~0x1F) === 0 && ((1 << _la) & 2146959360) !== 0))) {
+                    this._errHandler.recoverInline(this);
+                }
+                else {
+                    this._errHandler.reportMatch(this);
+                    this.consume();
                 }
-                this.state = 131;
-                this.identifier();
             }
         }
         catch (re) {
@@ -648,18 +688,16 @@ class OpraFilterParser extends antlr4_1.Parser {
         return localctx;
     }
     // @RuleVersion(0)
-    externalConstant() {
-        let localctx = new ExternalConstantContext(this, this._ctx, this.state);
-        this.enterRule(localctx, 24, OpraFilterParser.RULE_externalConstant);
+    logicalOperator() {
+        const localctx = new LogicalOperatorContext(this, this._ctx, this.state);
+        this.enterRule(localctx, 30, OpraFilterParser.RULE_logicalOperator);
         let _la;
         try {
             this.enterOuterAlt(localctx, 1);
             {
-                this.state = 133;
-                this.match(OpraFilterParser.T__22);
-                this.state = 134;
+                this.state = 115;
                 _la = this._input.LA(1);
-                if (!(_la === 50 || _la === 51)) {
+                if (!(((((_la - 31)) & ~0x1F) === 0 && ((1 << (_la - 31)) & 15) !== 0))) {
                     this._errHandler.recoverInline(this);
                 }
                 else {
@@ -684,14 +722,14 @@ class OpraFilterParser extends antlr4_1.Parser {
         return localctx;
     }
     // @RuleVersion(0)
-    identifier() {
-        let localctx = new IdentifierContext(this, this._ctx, this.state);
-        this.enterRule(localctx, 26, OpraFilterParser.RULE_identifier);
+    polarityOperator() {
+        const localctx = new PolarityOperatorContext(this, this._ctx, this.state);
+        this.enterRule(localctx, 32, OpraFilterParser.RULE_polarityOperator);
         try {
             this.enterOuterAlt(localctx, 1);
             {
-                this.state = 136;
-                this.match(OpraFilterParser.IDENTIFIER);
+                this.state = 117;
+                this.match(OpraFilterParser.POLAR_OP);
             }
         }
         catch (re) {
@@ -709,1329 +747,467 @@ class OpraFilterParser extends antlr4_1.Parser {
         }
         return localctx;
     }
-    // @RuleVersion(0)
-    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 52:
-                    localctx = new NumberLiteralContext(this, localctx);
-                    this.enterOuterAlt(localctx, 1);
-                    {
-                        this.state = 138;
-                        this.match(OpraFilterParser.NUMBER);
-                    }
-                    break;
-                case 45:
-                case 46:
-                    localctx = new InfinityLiteralContext(this, localctx);
-                    this.enterOuterAlt(localctx, 2);
-                    {
-                        this.state = 139;
-                        this.infinity();
-                    }
-                    break;
-                case 42:
-                case 43:
-                    localctx = new BooleanLiteralContext(this, localctx);
-                    this.enterOuterAlt(localctx, 3);
-                    {
-                        this.state = 140;
-                        this.boolean_();
-                    }
-                    break;
-                case 44:
-                    localctx = new NullLiteralContext(this, localctx);
-                    this.enterOuterAlt(localctx, 4);
-                    {
-                        this.state = 141;
-                        this.null_();
-                    }
-                    break;
-                case 47:
-                    localctx = new DateLiteralContext(this, localctx);
-                    this.enterOuterAlt(localctx, 5);
-                    {
-                        this.state = 142;
-                        this.match(OpraFilterParser.DATE);
-                    }
-                    break;
-                case 48:
-                    localctx = new DateTimeLiteralContext(this, localctx);
-                    this.enterOuterAlt(localctx, 6);
-                    {
-                        this.state = 143;
-                        this.match(OpraFilterParser.DATETIME);
-                    }
-                    break;
-                case 49:
-                    localctx = new TimeLiteralContext(this, localctx);
-                    this.enterOuterAlt(localctx, 7);
-                    {
-                        this.state = 144;
-                        this.match(OpraFilterParser.TIME);
-                    }
-                    break;
-                case 51:
-                    localctx = new StringLiteralContext(this, localctx);
-                    this.enterOuterAlt(localctx, 8);
-                    {
-                        this.state = 145;
-                        this.match(OpraFilterParser.STRING);
-                    }
-                    break;
-                default:
-                    throw new antlr4_1.NoViableAltException(this);
-            }
-        }
-        catch (re) {
-            if (re instanceof antlr4_1.RecognitionException) {
-                localctx.exception = re;
-                this._errHandler.reportError(this, re);
-                this._errHandler.recover(this, re);
-            }
-            else {
-                throw re;
-            }
-        }
-        finally {
-            this.exitRule();
-        }
-        return localctx;
-    }
-    // @RuleVersion(0)
-    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.state = 148;
-                _la = this._input.LA(1);
-                if (!(((((_la - 24)) & ~0x1F) === 0 && ((1 << (_la - 24)) & 4095) !== 0))) {
-                    this._errHandler.recoverInline(this);
-                }
-                else {
-                    this._errHandler.reportMatch(this);
-                    this.consume();
-                }
-            }
-        }
-        catch (re) {
-            if (re instanceof antlr4_1.RecognitionException) {
-                localctx.exception = re;
-                this._errHandler.reportError(this, re);
-                this._errHandler.recover(this, re);
-            }
-            else {
-                throw re;
-            }
-        }
-        finally {
-            this.exitRule();
-        }
-        return localctx;
-    }
-    // @RuleVersion(0)
-    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.state = 150;
-                _la = this._input.LA(1);
-                if (!(((((_la - 36)) & ~0x1F) === 0 && ((1 << (_la - 36)) & 15) !== 0))) {
-                    this._errHandler.recoverInline(this);
-                }
-                else {
-                    this._errHandler.reportMatch(this);
-                    this.consume();
-                }
-            }
-        }
-        catch (re) {
-            if (re instanceof antlr4_1.RecognitionException) {
-                localctx.exception = re;
-                this._errHandler.reportError(this, re);
-                this._errHandler.recover(this, re);
-            }
-            else {
-                throw re;
-            }
-        }
-        finally {
-            this.exitRule();
-        }
-        return localctx;
-    }
-    // @RuleVersion(0)
-    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.state = 152;
-                _la = this._input.LA(1);
-                if (!(_la === 36 || _la === 37)) {
-                    this._errHandler.recoverInline(this);
-                }
-                else {
-                    this._errHandler.reportMatch(this);
-                    this.consume();
-                }
-            }
-        }
-        catch (re) {
-            if (re instanceof antlr4_1.RecognitionException) {
-                localctx.exception = re;
-                this._errHandler.reportError(this, re);
-                this._errHandler.recover(this, re);
-            }
-            else {
-                throw re;
-            }
-        }
-        finally {
-            this.exitRule();
-        }
-        return localctx;
-    }
-    // @RuleVersion(0)
-    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.state = 154;
-                _la = this._input.LA(1);
-                if (!(_la === 40 || _la === 41)) {
-                    this._errHandler.recoverInline(this);
-                }
-                else {
-                    this._errHandler.reportMatch(this);
-                    this.consume();
-                }
-            }
-        }
-        catch (re) {
-            if (re instanceof antlr4_1.RecognitionException) {
-                localctx.exception = re;
-                this._errHandler.reportError(this, re);
-                this._errHandler.recover(this, re);
-            }
-            else {
-                throw re;
-            }
-        }
-        finally {
-            this.exitRule();
-        }
-        return localctx;
-    }
-    // @RuleVersion(0)
-    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.state = 156;
-                _la = this._input.LA(1);
-                if (!(_la === 42 || _la === 43)) {
-                    this._errHandler.recoverInline(this);
-                }
-                else {
-                    this._errHandler.reportMatch(this);
-                    this.consume();
-                }
-            }
-        }
-        catch (re) {
-            if (re instanceof antlr4_1.RecognitionException) {
-                localctx.exception = re;
-                this._errHandler.reportError(this, re);
-                this._errHandler.recover(this, re);
-            }
-            else {
-                throw re;
-            }
-        }
-        finally {
-            this.exitRule();
-        }
-        return localctx;
-    }
-    // @RuleVersion(0)
-    null_() {
-        let localctx = new NullContext(this, this._ctx, this.state);
-        this.enterRule(localctx, 40, OpraFilterParser.RULE_null);
-        try {
-            this.enterOuterAlt(localctx, 1);
-            {
-                this.state = 158;
-                this.match(OpraFilterParser.T__43);
-            }
-        }
-        catch (re) {
-            if (re instanceof antlr4_1.RecognitionException) {
-                localctx.exception = re;
-                this._errHandler.reportError(this, re);
-                this._errHandler.recover(this, re);
-            }
-            else {
-                throw re;
-            }
-        }
-        finally {
-            this.exitRule();
-        }
-        return localctx;
-    }
-    // @RuleVersion(0)
-    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.state = 160;
-                _la = this._input.LA(1);
-                if (!(_la === 45 || _la === 46)) {
-                    this._errHandler.recoverInline(this);
-                }
-                else {
-                    this._errHandler.reportMatch(this);
-                    this.consume();
-                }
-            }
-        }
-        catch (re) {
-            if (re instanceof antlr4_1.RecognitionException) {
-                localctx.exception = re;
-                this._errHandler.reportError(this, re);
-                this._errHandler.recover(this, re);
-            }
-            else {
-                throw re;
-            }
-        }
-        finally {
-            this.exitRule();
-        }
-        return localctx;
-    }
-    sempred(localctx, ruleIndex, predIndex) {
-        switch (ruleIndex) {
-            case 1:
-                return this.expression_sempred(localctx, predIndex);
-        }
-        return true;
-    }
-    expression_sempred(localctx, predIndex) {
-        switch (predIndex) {
-            case 0:
-                return this.precpred(this._ctx, 5);
-            case 1:
-                return this.precpred(this._ctx, 4);
-            case 2:
-                return this.precpred(this._ctx, 3);
-        }
-        return true;
-    }
-    static get _ATN() {
-        if (!OpraFilterParser.__ATN) {
-            OpraFilterParser.__ATN = new antlr4_1.ATNDeserializer().deserialize(OpraFilterParser._serializedATN);
-        }
-        return OpraFilterParser.__ATN;
-    }
-}
-exports.default = OpraFilterParser;
-OpraFilterParser.T__0 = 1;
-OpraFilterParser.T__1 = 2;
-OpraFilterParser.T__2 = 3;
-OpraFilterParser.T__3 = 4;
-OpraFilterParser.T__4 = 5;
-OpraFilterParser.T__5 = 6;
-OpraFilterParser.T__6 = 7;
-OpraFilterParser.T__7 = 8;
-OpraFilterParser.T__8 = 9;
-OpraFilterParser.T__9 = 10;
-OpraFilterParser.T__10 = 11;
-OpraFilterParser.T__11 = 12;
-OpraFilterParser.T__12 = 13;
-OpraFilterParser.T__13 = 14;
-OpraFilterParser.T__14 = 15;
-OpraFilterParser.T__15 = 16;
-OpraFilterParser.T__16 = 17;
-OpraFilterParser.T__17 = 18;
-OpraFilterParser.T__18 = 19;
-OpraFilterParser.T__19 = 20;
-OpraFilterParser.T__20 = 21;
-OpraFilterParser.T__21 = 22;
-OpraFilterParser.T__22 = 23;
-OpraFilterParser.T__23 = 24;
-OpraFilterParser.T__24 = 25;
-OpraFilterParser.T__25 = 26;
-OpraFilterParser.T__26 = 27;
-OpraFilterParser.T__27 = 28;
-OpraFilterParser.T__28 = 29;
-OpraFilterParser.T__29 = 30;
-OpraFilterParser.T__30 = 31;
-OpraFilterParser.T__31 = 32;
-OpraFilterParser.T__32 = 33;
-OpraFilterParser.T__33 = 34;
-OpraFilterParser.T__34 = 35;
-OpraFilterParser.T__35 = 36;
-OpraFilterParser.T__36 = 37;
-OpraFilterParser.T__37 = 38;
-OpraFilterParser.T__38 = 39;
-OpraFilterParser.T__39 = 40;
-OpraFilterParser.T__40 = 41;
-OpraFilterParser.T__41 = 42;
-OpraFilterParser.T__42 = 43;
-OpraFilterParser.T__43 = 44;
-OpraFilterParser.T__44 = 45;
-OpraFilterParser.T__45 = 46;
-OpraFilterParser.DATE = 47;
-OpraFilterParser.DATETIME = 48;
-OpraFilterParser.TIME = 49;
-OpraFilterParser.IDENTIFIER = 50;
-OpraFilterParser.STRING = 51;
-OpraFilterParser.NUMBER = 52;
-OpraFilterParser.INTEGER = 53;
-OpraFilterParser.WHITESPACE = 54;
-OpraFilterParser.COMMENT = 55;
-OpraFilterParser.LINE_COMMENT = 56;
-OpraFilterParser.EOF = antlr4_1.Token.EOF;
-OpraFilterParser.RULE_root = 0;
-OpraFilterParser.RULE_expression = 1;
-OpraFilterParser.RULE_term = 2;
-OpraFilterParser.RULE_invocable = 3;
-OpraFilterParser.RULE_invocation = 4;
-OpraFilterParser.RULE_indexer = 5;
-OpraFilterParser.RULE_function = 6;
-OpraFilterParser.RULE_paramList = 7;
-OpraFilterParser.RULE_unit = 8;
-OpraFilterParser.RULE_dateTimePrecision = 9;
-OpraFilterParser.RULE_pluralDateTimePrecision = 10;
-OpraFilterParser.RULE_qualifiedIdentifier = 11;
-OpraFilterParser.RULE_externalConstant = 12;
-OpraFilterParser.RULE_identifier = 13;
-OpraFilterParser.RULE_literal = 14;
-OpraFilterParser.RULE_compOp = 15;
-OpraFilterParser.RULE_arthOp = 16;
-OpraFilterParser.RULE_polarOp = 17;
-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",
-    "paramList", "unit", "dateTimePrecision", "pluralDateTimePrecision", "qualifiedIdentifier",
-    "externalConstant", "identifier", "literal", "compOp", "arthOp", "polarOp",
-    "logOp", "boolean", "null", "infinity",
-];
-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 antlr4_1.DFA(ds, index));
-class RootContext extends antlr4_1.ParserRuleContext {
-    constructor(parser, parent, invokingState) {
-        super(parent, invokingState);
-        this.parser = parser;
-    }
-    expression() {
-        return this.getTypedRuleContext(ExpressionContext, 0);
-    }
-    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
-    accept(visitor) {
-        if (visitor.visitRoot) {
-            return visitor.visitRoot(this);
-        }
-        else {
-            return visitor.visitChildren(this);
-        }
-    }
-}
-exports.RootContext = RootContext;
-class ExpressionContext extends antlr4_1.ParserRuleContext {
-    constructor(parser, parent, invokingState) {
-        super(parent, invokingState);
-        this.parser = parser;
-    }
-    get ruleIndex() {
-        return OpraFilterParser.RULE_expression;
-    }
-    copyFrom(ctx) {
-        super.copyFrom(ctx);
-    }
-}
-exports.ExpressionContext = ExpressionContext;
-class ParenthesizedExpressionContext extends ExpressionContext {
-    constructor(parser, ctx) {
-        super(parser, ctx.parentCtx, ctx.invokingState);
-        super.copyFrom(ctx);
-    }
-    expression() {
-        return this.getTypedRuleContext(ExpressionContext, 0);
-    }
-    enterRule(listener) {
-        if (listener.enterParenthesizedExpression) {
-            listener.enterParenthesizedExpression(this);
-        }
-    }
-    exitRule(listener) {
-        if (listener.exitParenthesizedExpression) {
-            listener.exitParenthesizedExpression(this);
-        }
-    }
-    // @Override
-    accept(visitor) {
-        if (visitor.visitParenthesizedExpression) {
-            return visitor.visitParenthesizedExpression(this);
-        }
-        else {
-            return visitor.visitChildren(this);
-        }
-    }
-}
-exports.ParenthesizedExpressionContext = ParenthesizedExpressionContext;
-class ArrayExpressionContext extends ExpressionContext {
-    constructor(parser, ctx) {
-        super(parser, ctx.parentCtx, ctx.invokingState);
-        super.copyFrom(ctx);
-    }
-    expression_list() {
-        return this.getTypedRuleContexts(ExpressionContext);
-    }
-    expression(i) {
-        return this.getTypedRuleContext(ExpressionContext, i);
-    }
-    enterRule(listener) {
-        if (listener.enterArrayExpression) {
-            listener.enterArrayExpression(this);
-        }
-    }
-    exitRule(listener) {
-        if (listener.exitArrayExpression) {
-            listener.exitArrayExpression(this);
-        }
-    }
-    // @Override
-    accept(visitor) {
-        if (visitor.visitArrayExpression) {
-            return visitor.visitArrayExpression(this);
-        }
-        else {
-            return visitor.visitChildren(this);
-        }
-    }
-}
-exports.ArrayExpressionContext = ArrayExpressionContext;
-class PolarityExpressionContext extends ExpressionContext {
-    constructor(parser, ctx) {
-        super(parser, ctx.parentCtx, ctx.invokingState);
-        super.copyFrom(ctx);
-    }
-    polarOp() {
-        return this.getTypedRuleContext(PolarOpContext, 0);
-    }
-    expression() {
-        return this.getTypedRuleContext(ExpressionContext, 0);
-    }
-    enterRule(listener) {
-        if (listener.enterPolarityExpression) {
-            listener.enterPolarityExpression(this);
-        }
-    }
-    exitRule(listener) {
-        if (listener.exitPolarityExpression) {
-            listener.exitPolarityExpression(this);
-        }
-    }
-    // @Override
-    accept(visitor) {
-        if (visitor.visitPolarityExpression) {
-            return visitor.visitPolarityExpression(this);
-        }
-        else {
-            return visitor.visitChildren(this);
-        }
-    }
-}
-exports.PolarityExpressionContext = PolarityExpressionContext;
-class ComparisonExpressionContext extends ExpressionContext {
-    constructor(parser, ctx) {
-        super(parser, ctx.parentCtx, ctx.invokingState);
-        super.copyFrom(ctx);
-    }
-    expression_list() {
-        return this.getTypedRuleContexts(ExpressionContext);
-    }
-    expression(i) {
-        return this.getTypedRuleContext(ExpressionContext, i);
-    }
-    compOp() {
-        return this.getTypedRuleContext(CompOpContext, 0);
-    }
-    enterRule(listener) {
-        if (listener.enterComparisonExpression) {
-            listener.enterComparisonExpression(this);
-        }
-    }
-    exitRule(listener) {
-        if (listener.exitComparisonExpression) {
-            listener.exitComparisonExpression(this);
-        }
-    }
-    // @Override
-    accept(visitor) {
-        if (visitor.visitComparisonExpression) {
-            return visitor.visitComparisonExpression(this);
-        }
-        else {
-            return visitor.visitChildren(this);
-        }
-    }
-}
-exports.ComparisonExpressionContext = ComparisonExpressionContext;
-class ArithmeticExpressionContext extends ExpressionContext {
-    constructor(parser, ctx) {
-        super(parser, ctx.parentCtx, ctx.invokingState);
-        super.copyFrom(ctx);
-    }
-    expression_list() {
-        return this.getTypedRuleContexts(ExpressionContext);
-    }
-    expression(i) {
-        return this.getTypedRuleContext(ExpressionContext, i);
-    }
-    arthOp() {
-        return this.getTypedRuleContext(ArthOpContext, 0);
-    }
-    enterRule(listener) {
-        if (listener.enterArithmeticExpression) {
-            listener.enterArithmeticExpression(this);
-        }
-    }
-    exitRule(listener) {
-        if (listener.exitArithmeticExpression) {
-            listener.exitArithmeticExpression(this);
-        }
-    }
-    // @Override
-    accept(visitor) {
-        if (visitor.visitArithmeticExpression) {
-            return visitor.visitArithmeticExpression(this);
-        }
-        else {
-            return visitor.visitChildren(this);
-        }
-    }
-}
-exports.ArithmeticExpressionContext = ArithmeticExpressionContext;
-class LogicalExpressionContext extends ExpressionContext {
-    constructor(parser, ctx) {
-        super(parser, ctx.parentCtx, ctx.invokingState);
-        super.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.visitLogicalExpression) {
-            return visitor.visitLogicalExpression(this);
-        }
-        else {
-            return visitor.visitChildren(this);
-        }
-    }
-}
-exports.LogicalExpressionContext = LogicalExpressionContext;
-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);
-        }
-    }
-    exitRule(listener) {
-        if (listener.exitTermExpression) {
-            listener.exitTermExpression(this);
-        }
-    }
-    // @Override
-    accept(visitor) {
-        if (visitor.visitTermExpression) {
-            return visitor.visitTermExpression(this);
-        }
-        else {
-            return visitor.visitChildren(this);
-        }
-    }
-}
-exports.TermExpressionContext = TermExpressionContext;
-class TermContext extends antlr4_1.ParserRuleContext {
-    constructor(parser, parent, invokingState) {
-        super(parent, invokingState);
-        this.parser = parser;
-    }
-    get ruleIndex() {
-        return OpraFilterParser.RULE_term;
-    }
-    copyFrom(ctx) {
-        super.copyFrom(ctx);
-    }
-}
-exports.TermContext = TermContext;
-class ExternalConstantTermContext extends TermContext {
-    constructor(parser, ctx) {
-        super(parser, ctx.parentCtx, ctx.invokingState);
-        super.copyFrom(ctx);
-    }
-    externalConstant() {
-        return this.getTypedRuleContext(ExternalConstantContext, 0);
-    }
-    enterRule(listener) {
-        if (listener.enterExternalConstantTerm) {
-            listener.enterExternalConstantTerm(this);
-        }
-    }
-    exitRule(listener) {
-        if (listener.exitExternalConstantTerm) {
-            listener.exitExternalConstantTerm(this);
-        }
-    }
-    // @Override
-    accept(visitor) {
-        if (visitor.visitExternalConstantTerm) {
-            return visitor.visitExternalConstantTerm(this);
-        }
-        else {
-            return visitor.visitChildren(this);
-        }
-    }
-}
-exports.ExternalConstantTermContext = ExternalConstantTermContext;
-class LiteralTermContext extends TermContext {
-    constructor(parser, ctx) {
-        super(parser, ctx.parentCtx, ctx.invokingState);
-        super.copyFrom(ctx);
-    }
-    literal() {
-        return this.getTypedRuleContext(LiteralContext, 0);
-    }
-    enterRule(listener) {
-        if (listener.enterLiteralTerm) {
-            listener.enterLiteralTerm(this);
-        }
-    }
-    exitRule(listener) {
-        if (listener.exitLiteralTerm) {
-            listener.exitLiteralTerm(this);
-        }
-    }
-    // @Override
-    accept(visitor) {
-        if (visitor.visitLiteralTerm) {
-            return visitor.visitLiteralTerm(this);
-        }
-        else {
-            return visitor.visitChildren(this);
-        }
-    }
-}
-exports.LiteralTermContext = LiteralTermContext;
-class QualifiedIdentifierTermContext extends TermContext {
-    constructor(parser, ctx) {
-        super(parser, ctx.parentCtx, ctx.invokingState);
-        super.copyFrom(ctx);
-    }
-    qualifiedIdentifier() {
-        return this.getTypedRuleContext(QualifiedIdentifierContext, 0);
-    }
-    enterRule(listener) {
-        if (listener.enterQualifiedIdentifierTerm) {
-            listener.enterQualifiedIdentifierTerm(this);
-        }
-    }
-    exitRule(listener) {
-        if (listener.exitQualifiedIdentifierTerm) {
-            listener.exitQualifiedIdentifierTerm(this);
-        }
-    }
-    // @Override
-    accept(visitor) {
-        if (visitor.visitQualifiedIdentifierTerm) {
-            return visitor.visitQualifiedIdentifierTerm(this);
-        }
-        else {
-            return visitor.visitChildren(this);
-        }
-    }
-}
-exports.QualifiedIdentifierTermContext = QualifiedIdentifierTermContext;
-class InvocableContext extends antlr4_1.ParserRuleContext {
-    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
-    accept(visitor) {
-        if (visitor.visitInvocable) {
-            return visitor.visitInvocable(this);
-        }
-        else {
-            return visitor.visitChildren(this);
-        }
-    }
-}
-exports.InvocableContext = InvocableContext;
-class InvocationContext extends antlr4_1.ParserRuleContext {
-    constructor(parser, parent, invokingState) {
-        super(parent, invokingState);
-        this.parser = parser;
-    }
-    get ruleIndex() {
-        return OpraFilterParser.RULE_invocation;
-    }
-    copyFrom(ctx) {
-        super.copyFrom(ctx);
-    }
-}
-exports.InvocationContext = InvocationContext;
-class MemberInvocationContext extends InvocationContext {
-    constructor(parser, ctx) {
-        super(parser, ctx.parentCtx, ctx.invokingState);
-        super.copyFrom(ctx);
-    }
-    identifier() {
-        return this.getTypedRuleContext(IdentifierContext, 0);
-    }
-    enterRule(listener) {
-        if (listener.enterMemberInvocation) {
-            listener.enterMemberInvocation(this);
-        }
-    }
-    exitRule(listener) {
-        if (listener.exitMemberInvocation) {
-            listener.exitMemberInvocation(this);
-        }
-    }
-    // @Override
-    accept(visitor) {
-        if (visitor.visitMemberInvocation) {
-            return visitor.visitMemberInvocation(this);
-        }
-        else {
-            return visitor.visitChildren(this);
-        }
-    }
-}
-exports.MemberInvocationContext = MemberInvocationContext;
-class IndexerContext extends antlr4_1.ParserRuleContext {
-    constructor(parser, parent, invokingState) {
-        super(parent, invokingState);
-        this.parser = parser;
-    }
-    get ruleIndex() {
-        return OpraFilterParser.RULE_indexer;
-    }
-    copyFrom(ctx) {
-        super.copyFrom(ctx);
-    }
-}
-exports.IndexerContext = IndexerContext;
-class NumberIndexContext extends IndexerContext {
-    constructor(parser, ctx) {
-        super(parser, ctx.parentCtx, ctx.invokingState);
-        super.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.visitNumberIndex) {
-            return visitor.visitNumberIndex(this);
-        }
-        else {
-            return visitor.visitChildren(this);
-        }
-    }
-}
-exports.NumberIndexContext = NumberIndexContext;
-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);
+    sempred(localctx, ruleIndex, predIndex) {
+        switch (ruleIndex) {
+            case 1:
+                return this.expression_sempred(localctx, predIndex);
         }
+        return true;
     }
-    exitRule(listener) {
-        if (listener.exitMemberIndex) {
-            listener.exitMemberIndex(this);
+    expression_sempred(localctx, predIndex) {
+        switch (predIndex) {
+            case 0:
+                return this.precpred(this._ctx, 3);
         }
+        return true;
     }
-    // @Override
-    accept(visitor) {
-        if (visitor.visitMemberIndex) {
-            return visitor.visitMemberIndex(this);
-        }
-        else {
-            return visitor.visitChildren(this);
+    static get _ATN() {
+        if (!OpraFilterParser.__ATN) {
+            OpraFilterParser.__ATN = new antlr4_1.ATNDeserializer().deserialize(OpraFilterParser._serializedATN);
         }
+        return OpraFilterParser.__ATN;
     }
 }
-exports.MemberIndexContext = MemberIndexContext;
-class FunctionContext extends antlr4_1.ParserRuleContext {
+exports.default = OpraFilterParser;
+OpraFilterParser.T__0 = 1;
+OpraFilterParser.T__1 = 2;
+OpraFilterParser.T__2 = 3;
+OpraFilterParser.T__3 = 4;
+OpraFilterParser.T__4 = 5;
+OpraFilterParser.T__5 = 6;
+OpraFilterParser.T__6 = 7;
+OpraFilterParser.T__7 = 8;
+OpraFilterParser.T__8 = 9;
+OpraFilterParser.T__9 = 10;
+OpraFilterParser.T__10 = 11;
+OpraFilterParser.T__11 = 12;
+OpraFilterParser.T__12 = 13;
+OpraFilterParser.T__13 = 14;
+OpraFilterParser.T__14 = 15;
+OpraFilterParser.T__15 = 16;
+OpraFilterParser.T__16 = 17;
+OpraFilterParser.T__17 = 18;
+OpraFilterParser.T__18 = 19;
+OpraFilterParser.T__19 = 20;
+OpraFilterParser.T__20 = 21;
+OpraFilterParser.T__21 = 22;
+OpraFilterParser.T__22 = 23;
+OpraFilterParser.T__23 = 24;
+OpraFilterParser.T__24 = 25;
+OpraFilterParser.T__25 = 26;
+OpraFilterParser.T__26 = 27;
+OpraFilterParser.T__27 = 28;
+OpraFilterParser.T__28 = 29;
+OpraFilterParser.T__29 = 30;
+OpraFilterParser.T__30 = 31;
+OpraFilterParser.T__31 = 32;
+OpraFilterParser.T__32 = 33;
+OpraFilterParser.T__33 = 34;
+OpraFilterParser.IDENTIFIER = 35;
+OpraFilterParser.POLAR_OP = 36;
+OpraFilterParser.DATE = 37;
+OpraFilterParser.DATETIME = 38;
+OpraFilterParser.TIME = 39;
+OpraFilterParser.NUMBER = 40;
+OpraFilterParser.INTEGER = 41;
+OpraFilterParser.STRING = 42;
+OpraFilterParser.WHITESPACE = 43;
+OpraFilterParser.EOF = antlr4_1.Token.EOF;
+OpraFilterParser.RULE_root = 0;
+OpraFilterParser.RULE_expression = 1;
+OpraFilterParser.RULE_comparisonLeft = 2;
+OpraFilterParser.RULE_comparisonRight = 3;
+OpraFilterParser.RULE_parenthesizedItem = 4;
+OpraFilterParser.RULE_value = 5;
+OpraFilterParser.RULE_qualifiedIdentifier = 6;
+OpraFilterParser.RULE_externalConstant = 7;
+OpraFilterParser.RULE_identifier = 8;
+OpraFilterParser.RULE_arrayValue = 9;
+OpraFilterParser.RULE_boolean = 10;
+OpraFilterParser.RULE_null = 11;
+OpraFilterParser.RULE_infinity = 12;
+OpraFilterParser.RULE_arithmeticOperator = 13;
+OpraFilterParser.RULE_comparisonOperator = 14;
+OpraFilterParser.RULE_logicalOperator = 15;
+OpraFilterParser.RULE_polarityOperator = 16;
+OpraFilterParser.literalNames = [null, "'('",
+    "')'", "'not'",
+    "'!'", "'.'",
+    "'@'", "'['",
+    "','", "']'",
+    "'true'", "'false'",
+    "'null'", "'Infinity'",
+    "'infinity'",
+    "'+'", "'-'",
+    "'*'", "'/'",
+    "'<='", "'<'",
+    "'>'", "'>='",
+    "'='", "'!='",
+    "'in'", "'!in'",
+    "'like'", "'!like'",
+    "'ilike'", "'!ilike'",
+    "'and'", "'or'",
+    "'&&'", "'||'"];
+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, "IDENTIFIER",
+    "POLAR_OP",
+    "DATE", "DATETIME",
+    "TIME", "NUMBER",
+    "INTEGER",
+    "STRING", "WHITESPACE"];
+// tslint:disable:no-trailing-whitespace
+OpraFilterParser.ruleNames = [
+    "root", "expression", "comparisonLeft", "comparisonRight", "parenthesizedItem",
+    "value", "qualifiedIdentifier", "externalConstant", "identifier", "arrayValue",
+    "boolean", "null", "infinity", "arithmeticOperator", "comparisonOperator",
+    "logicalOperator", "polarityOperator",
+];
+OpraFilterParser._serializedATN = [4, 1, 43, 120, 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, 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, 3, 1, 49, 8, 1, 1, 1, 1, 1,
+    1, 1, 1, 1, 5, 1, 55, 8, 1, 10, 1, 12, 1, 58, 9, 1, 1, 2, 1, 2, 1, 3, 1, 3, 1, 3, 1, 3, 3, 3, 66, 8, 3,
+    1, 4, 1, 4, 1, 5, 1, 5, 1, 5, 1, 5, 1, 5, 1, 5, 1, 5, 1, 5, 3, 5, 78, 8, 5, 1, 6, 1, 6, 1, 6, 5, 6, 83, 8,
+    6, 10, 6, 12, 6, 86, 9, 6, 1, 6, 1, 6, 1, 7, 1, 7, 1, 7, 1, 8, 1, 8, 1, 9, 1, 9, 1, 9, 1, 9, 5, 9, 99, 8,
+    9, 10, 9, 12, 9, 102, 9, 9, 1, 9, 1, 9, 1, 10, 1, 10, 1, 11, 1, 11, 1, 12, 1, 12, 1, 13, 1, 13, 1, 14,
+    1, 14, 1, 15, 1, 15, 1, 16, 1, 16, 1, 16, 0, 1, 2, 17, 0, 2, 4, 6, 8, 10, 12, 14, 16, 18, 20, 22, 24,
+    26, 28, 30, 32, 0, 6, 1, 0, 3, 4, 1, 0, 10, 11, 1, 0, 13, 14, 1, 0, 15, 18, 1, 0, 19, 30, 1, 0, 31,
+    34, 117, 0, 34, 1, 0, 0, 0, 2, 48, 1, 0, 0, 0, 4, 59, 1, 0, 0, 0, 6, 65, 1, 0, 0, 0, 8, 67, 1, 0, 0, 0,
+    10, 77, 1, 0, 0, 0, 12, 84, 1, 0, 0, 0, 14, 89, 1, 0, 0, 0, 16, 92, 1, 0, 0, 0, 18, 94, 1, 0, 0, 0, 20,
+    105, 1, 0, 0, 0, 22, 107, 1, 0, 0, 0, 24, 109, 1, 0, 0, 0, 26, 111, 1, 0, 0, 0, 28, 113, 1, 0, 0, 0,
+    30, 115, 1, 0, 0, 0, 32, 117, 1, 0, 0, 0, 34, 35, 3, 2, 1, 0, 35, 36, 5, 0, 0, 1, 36, 1, 1, 0, 0, 0,
+    37, 38, 6, 1, -1, 0, 38, 39, 3, 4, 2, 0, 39, 40, 3, 28, 14, 0, 40, 41, 3, 6, 3, 0, 41, 49, 1, 0, 0,
+    0, 42, 43, 5, 1, 0, 0, 43, 44, 3, 8, 4, 0, 44, 45, 5, 2, 0, 0, 45, 49, 1, 0, 0, 0, 46, 47, 7, 0, 0, 0,
+    47, 49, 3, 2, 1, 1, 48, 37, 1, 0, 0, 0, 48, 42, 1, 0, 0, 0, 48, 46, 1, 0, 0, 0, 49, 56, 1, 0, 0, 0, 50,
+    51, 10, 3, 0, 0, 51, 52, 3, 30, 15, 0, 52, 53, 3, 2, 1, 4, 53, 55, 1, 0, 0, 0, 54, 50, 1, 0, 0, 0, 55,
+    58, 1, 0, 0, 0, 56, 54, 1, 0, 0, 0, 56, 57, 1, 0, 0, 0, 57, 3, 1, 0, 0, 0, 58, 56, 1, 0, 0, 0, 59, 60,
+    3, 12, 6, 0, 60, 5, 1, 0, 0, 0, 61, 66, 3, 10, 5, 0, 62, 66, 3, 12, 6, 0, 63, 66, 3, 14, 7, 0, 64, 66,
+    3, 18, 9, 0, 65, 61, 1, 0, 0, 0, 65, 62, 1, 0, 0, 0, 65, 63, 1, 0, 0, 0, 65, 64, 1, 0, 0, 0, 66, 7, 1,
+    0, 0, 0, 67, 68, 3, 2, 1, 0, 68, 9, 1, 0, 0, 0, 69, 78, 5, 40, 0, 0, 70, 78, 3, 24, 12, 0, 71, 78, 3,
+    20, 10, 0, 72, 78, 3, 22, 11, 0, 73, 78, 5, 37, 0, 0, 74, 78, 5, 38, 0, 0, 75, 78, 5, 39, 0, 0, 76,
+    78, 5, 42, 0, 0, 77, 69, 1, 0, 0, 0, 77, 70, 1, 0, 0, 0, 77, 71, 1, 0, 0, 0, 77, 72, 1, 0, 0, 0, 77,
+    73, 1, 0, 0, 0, 77, 74, 1, 0, 0, 0, 77, 75, 1, 0, 0, 0, 77, 76, 1, 0, 0, 0, 78, 11, 1, 0, 0, 0, 79, 80,
+    3, 16, 8, 0, 80, 81, 5, 5, 0, 0, 81, 83, 1, 0, 0, 0, 82, 79, 1, 0, 0, 0, 83, 86, 1, 0, 0, 0, 84, 82,
+    1, 0, 0, 0, 84, 85, 1, 0, 0, 0, 85, 87, 1, 0, 0, 0, 86, 84, 1, 0, 0, 0, 87, 88, 3, 16, 8, 0, 88, 13,
+    1, 0, 0, 0, 89, 90, 5, 6, 0, 0, 90, 91, 3, 16, 8, 0, 91, 15, 1, 0, 0, 0, 92, 93, 5, 35, 0, 0, 93, 17,
+    1, 0, 0, 0, 94, 95, 5, 7, 0, 0, 95, 100, 3, 10, 5, 0, 96, 97, 5, 8, 0, 0, 97, 99, 3, 10, 5, 0, 98, 96,
+    1, 0, 0, 0, 99, 102, 1, 0, 0, 0, 100, 98, 1, 0, 0, 0, 100, 101, 1, 0, 0, 0, 101, 103, 1, 0, 0, 0, 102,
+    100, 1, 0, 0, 0, 103, 104, 5, 9, 0, 0, 104, 19, 1, 0, 0, 0, 105, 106, 7, 1, 0, 0, 106, 21, 1, 0, 0,
+    0, 107, 108, 5, 12, 0, 0, 108, 23, 1, 0, 0, 0, 109, 110, 7, 2, 0, 0, 110, 25, 1, 0, 0, 0, 111, 112,
+    7, 3, 0, 0, 112, 27, 1, 0, 0, 0, 113, 114, 7, 4, 0, 0, 114, 29, 1, 0, 0, 0, 115, 116, 7, 5, 0, 0, 116,
+    31, 1, 0, 0, 0, 117, 118, 5, 36, 0, 0, 118, 33, 1, 0, 0, 0, 6, 48, 56, 65, 77, 84, 100];
+OpraFilterParser.DecisionsToDFA = OpraFilterParser._ATN.decisionToState.map((ds, index) => new antlr4_1.DFA(ds, index));
+class RootContext extends antlr4_1.ParserRuleContext {
     constructor(parser, parent, invokingState) {
         super(parent, invokingState);
         this.parser = parser;
     }
-    identifier() {
-        return this.getTypedRuleContext(IdentifierContext, 0);
+    expression() {
+        return this.getTypedRuleContext(ExpressionContext, 0);
     }
-    paramList() {
-        return this.getTypedRuleContext(ParamListContext, 0);
+    EOF() {
+        return this.getToken(OpraFilterParser.EOF, 0);
     }
     get ruleIndex() {
-        return OpraFilterParser.RULE_function;
+        return OpraFilterParser.RULE_root;
     }
     enterRule(listener) {
-        if (listener.enterFunction) {
-            listener.enterFunction(this);
+        if (listener.enterRoot) {
+            listener.enterRoot(this);
         }
     }
     exitRule(listener) {
-        if (listener.exitFunction) {
-            listener.exitFunction(this);
+        if (listener.exitRoot) {
+            listener.exitRoot(this);
         }
     }
     // @Override
     accept(visitor) {
-        if (visitor.visitFunction) {
-            return visitor.visitFunction(this);
+        if (visitor.visitRoot) {
+            return visitor.visitRoot(this);
         }
         else {
             return visitor.visitChildren(this);
         }
     }
 }
-exports.FunctionContext = FunctionContext;
-class ParamListContext extends antlr4_1.ParserRuleContext {
+exports.RootContext = RootContext;
+class ExpressionContext extends antlr4_1.ParserRuleContext {
     constructor(parser, parent, invokingState) {
         super(parent, invokingState);
         this.parser = parser;
     }
-    expression_list() {
-        return this.getTypedRuleContexts(ExpressionContext);
+    get ruleIndex() {
+        return OpraFilterParser.RULE_expression;
     }
-    expression(i) {
-        return this.getTypedRuleContext(ExpressionContext, i);
+    copyFrom(ctx) {
+        super.copyFrom(ctx);
     }
-    get ruleIndex() {
-        return OpraFilterParser.RULE_paramList;
+}
+exports.ExpressionContext = ExpressionContext;
+class ParenthesizedExpressionContext extends ExpressionContext {
+    constructor(parser, ctx) {
+        super(parser, ctx.parentCtx, ctx.invokingState);
+        super.copyFrom(ctx);
+    }
+    parenthesizedItem() {
+        return this.getTypedRuleContext(ParenthesizedItemContext, 0);
     }
     enterRule(listener) {
-        if (listener.enterParamList) {
-            listener.enterParamList(this);
+        if (listener.enterParenthesizedExpression) {
+            listener.enterParenthesizedExpression(this);
         }
     }
     exitRule(listener) {
-        if (listener.exitParamList) {
-            listener.exitParamList(this);
+        if (listener.exitParenthesizedExpression) {
+            listener.exitParenthesizedExpression(this);
         }
     }
     // @Override
     accept(visitor) {
-        if (visitor.visitParamList) {
-            return visitor.visitParamList(this);
+        if (visitor.visitParenthesizedExpression) {
+            return visitor.visitParenthesizedExpression(this);
         }
         else {
             return visitor.visitChildren(this);
         }
     }
 }
-exports.ParamListContext = ParamListContext;
-class UnitContext extends antlr4_1.ParserRuleContext {
-    constructor(parser, parent, invokingState) {
-        super(parent, invokingState);
-        this.parser = parser;
-    }
-    dateTimePrecision() {
-        return this.getTypedRuleContext(DateTimePrecisionContext, 0);
-    }
-    pluralDateTimePrecision() {
-        return this.getTypedRuleContext(PluralDateTimePrecisionContext, 0);
-    }
-    STRING() {
-        return this.getToken(OpraFilterParser.STRING, 0);
+exports.ParenthesizedExpressionContext = ParenthesizedExpressionContext;
+class NegativeExpressionContext extends ExpressionContext {
+    constructor(parser, ctx) {
+        super(parser, ctx.parentCtx, ctx.invokingState);
+        super.copyFrom(ctx);
     }
-    get ruleIndex() {
-        return OpraFilterParser.RULE_unit;
+    expression() {
+        return this.getTypedRuleContext(ExpressionContext, 0);
     }
     enterRule(listener) {
-        if (listener.enterUnit) {
-            listener.enterUnit(this);
+        if (listener.enterNegativeExpression) {
+            listener.enterNegativeExpression(this);
         }
     }
     exitRule(listener) {
-        if (listener.exitUnit) {
-            listener.exitUnit(this);
+        if (listener.exitNegativeExpression) {
+            listener.exitNegativeExpression(this);
         }
     }
     // @Override
     accept(visitor) {
-        if (visitor.visitUnit) {
-            return visitor.visitUnit(this);
+        if (visitor.visitNegativeExpression) {
+            return visitor.visitNegativeExpression(this);
         }
         else {
             return visitor.visitChildren(this);
         }
     }
 }
-exports.UnitContext = UnitContext;
-class DateTimePrecisionContext extends antlr4_1.ParserRuleContext {
-    constructor(parser, parent, invokingState) {
-        super(parent, invokingState);
-        this.parser = parser;
+exports.NegativeExpressionContext = NegativeExpressionContext;
+class ComparisonExpressionContext extends ExpressionContext {
+    constructor(parser, ctx) {
+        super(parser, ctx.parentCtx, ctx.invokingState);
+        super.copyFrom(ctx);
     }
-    get ruleIndex() {
-        return OpraFilterParser.RULE_dateTimePrecision;
+    comparisonLeft() {
+        return this.getTypedRuleContext(ComparisonLeftContext, 0);
+    }
+    comparisonOperator() {
+        return this.getTypedRuleContext(ComparisonOperatorContext, 0);
+    }
+    comparisonRight() {
+        return this.getTypedRuleContext(ComparisonRightContext, 0);
     }
     enterRule(listener) {
-        if (listener.enterDateTimePrecision) {
-            listener.enterDateTimePrecision(this);
+        if (listener.enterComparisonExpression) {
+            listener.enterComparisonExpression(this);
         }
     }
     exitRule(listener) {
-        if (listener.exitDateTimePrecision) {
-            listener.exitDateTimePrecision(this);
+        if (listener.exitComparisonExpression) {
+            listener.exitComparisonExpression(this);
         }
     }
     // @Override
     accept(visitor) {
-        if (visitor.visitDateTimePrecision) {
-            return visitor.visitDateTimePrecision(this);
+        if (visitor.visitComparisonExpression) {
+            return visitor.visitComparisonExpression(this);
         }
         else {
             return visitor.visitChildren(this);
         }
     }
 }
-exports.DateTimePrecisionContext = DateTimePrecisionContext;
-class PluralDateTimePrecisionContext extends antlr4_1.ParserRuleContext {
-    constructor(parser, parent, invokingState) {
-        super(parent, invokingState);
-        this.parser = parser;
+exports.ComparisonExpressionContext = ComparisonExpressionContext;
+class LogicalExpressionContext extends ExpressionContext {
+    constructor(parser, ctx) {
+        super(parser, ctx.parentCtx, ctx.invokingState);
+        super.copyFrom(ctx);
     }
-    get ruleIndex() {
-        return OpraFilterParser.RULE_pluralDateTimePrecision;
+    expression_list() {
+        return this.getTypedRuleContexts(ExpressionContext);
+    }
+    expression(i) {
+        return this.getTypedRuleContext(ExpressionContext, i);
+    }
+    logicalOperator() {
+        return this.getTypedRuleContext(LogicalOperatorContext, 0);
     }
     enterRule(listener) {
-        if (listener.enterPluralDateTimePrecision) {
-            listener.enterPluralDateTimePrecision(this);
+        if (listener.enterLogicalExpression) {
+            listener.enterLogicalExpression(this);
         }
     }
     exitRule(listener) {
-        if (listener.exitPluralDateTimePrecision) {
-            listener.exitPluralDateTimePrecision(this);
+        if (listener.exitLogicalExpression) {
+            listener.exitLogicalExpression(this);
         }
     }
     // @Override
     accept(visitor) {
-        if (visitor.visitPluralDateTimePrecision) {
-            return visitor.visitPluralDateTimePrecision(this);
+        if (visitor.visitLogicalExpression) {
+            return visitor.visitLogicalExpression(this);
         }
         else {
             return visitor.visitChildren(this);
         }
     }
 }
-exports.PluralDateTimePrecisionContext = PluralDateTimePrecisionContext;
-class QualifiedIdentifierContext extends antlr4_1.ParserRuleContext {
+exports.LogicalExpressionContext = LogicalExpressionContext;
+class ComparisonLeftContext extends antlr4_1.ParserRuleContext {
     constructor(parser, parent, invokingState) {
         super(parent, invokingState);
         this.parser = parser;
     }
-    identifier_list() {
-        return this.getTypedRuleContexts(IdentifierContext);
-    }
-    identifier(i) {
-        return this.getTypedRuleContext(IdentifierContext, i);
+    qualifiedIdentifier() {
+        return this.getTypedRuleContext(QualifiedIdentifierContext, 0);
     }
     get ruleIndex() {
-        return OpraFilterParser.RULE_qualifiedIdentifier;
+        return OpraFilterParser.RULE_comparisonLeft;
     }
     enterRule(listener) {
-        if (listener.enterQualifiedIdentifier) {
-            listener.enterQualifiedIdentifier(this);
+        if (listener.enterComparisonLeft) {
+            listener.enterComparisonLeft(this);
         }
     }
     exitRule(listener) {
-        if (listener.exitQualifiedIdentifier) {
-            listener.exitQualifiedIdentifier(this);
+        if (listener.exitComparisonLeft) {
+            listener.exitComparisonLeft(this);
         }
     }
     // @Override
     accept(visitor) {
-        if (visitor.visitQualifiedIdentifier) {
-            return visitor.visitQualifiedIdentifier(this);
+        if (visitor.visitComparisonLeft) {
+            return visitor.visitComparisonLeft(this);
         }
         else {
             return visitor.visitChildren(this);
         }
     }
 }
-exports.QualifiedIdentifierContext = QualifiedIdentifierContext;
-class ExternalConstantContext extends antlr4_1.ParserRuleContext {
+exports.ComparisonLeftContext = ComparisonLeftContext;
+class ComparisonRightContext extends antlr4_1.ParserRuleContext {
     constructor(parser, parent, invokingState) {
         super(parent, invokingState);
         this.parser = parser;
     }
-    IDENTIFIER() {
-        return this.getToken(OpraFilterParser.IDENTIFIER, 0);
+    value() {
+        return this.getTypedRuleContext(ValueContext, 0);
     }
-    STRING() {
-        return this.getToken(OpraFilterParser.STRING, 0);
+    qualifiedIdentifier() {
+        return this.getTypedRuleContext(QualifiedIdentifierContext, 0);
+    }
+    externalConstant() {
+        return this.getTypedRuleContext(ExternalConstantContext, 0);
+    }
+    arrayValue() {
+        return this.getTypedRuleContext(ArrayValueContext, 0);
     }
     get ruleIndex() {
-        return OpraFilterParser.RULE_externalConstant;
+        return OpraFilterParser.RULE_comparisonRight;
     }
     enterRule(listener) {
-        if (listener.enterExternalConstant) {
-            listener.enterExternalConstant(this);
+        if (listener.enterComparisonRight) {
+            listener.enterComparisonRight(this);
         }
     }
     exitRule(listener) {
-        if (listener.exitExternalConstant) {
-            listener.exitExternalConstant(this);
+        if (listener.exitComparisonRight) {
+            listener.exitComparisonRight(this);
         }
     }
     // @Override
     accept(visitor) {
-        if (visitor.visitExternalConstant) {
-            return visitor.visitExternalConstant(this);
+        if (visitor.visitComparisonRight) {
+            return visitor.visitComparisonRight(this);
         }
         else {
             return visitor.visitChildren(this);
         }
     }
 }
-exports.ExternalConstantContext = ExternalConstantContext;
-class IdentifierContext extends antlr4_1.ParserRuleContext {
+exports.ComparisonRightContext = ComparisonRightContext;
+class ParenthesizedItemContext extends antlr4_1.ParserRuleContext {
     constructor(parser, parent, invokingState) {
         super(parent, invokingState);
         this.parser = parser;
     }
-    IDENTIFIER() {
-        return this.getToken(OpraFilterParser.IDENTIFIER, 0);
+    expression() {
+        return this.getTypedRuleContext(ExpressionContext, 0);
     }
     get ruleIndex() {
-        return OpraFilterParser.RULE_identifier;
+        return OpraFilterParser.RULE_parenthesizedItem;
     }
     enterRule(listener) {
-        if (listener.enterIdentifier) {
-            listener.enterIdentifier(this);
+        if (listener.enterParenthesizedItem) {
+            listener.enterParenthesizedItem(this);
         }
     }
     exitRule(listener) {
-        if (listener.exitIdentifier) {
-            listener.exitIdentifier(this);
+        if (listener.exitParenthesizedItem) {
+            listener.exitParenthesizedItem(this);
         }
     }
     // @Override
     accept(visitor) {
-        if (visitor.visitIdentifier) {
-            return visitor.visitIdentifier(this);
+        if (visitor.visitParenthesizedItem) {
+            return visitor.visitParenthesizedItem(this);
         }
         else {
             return visitor.visitChildren(this);
         }
     }
 }
-exports.IdentifierContext = IdentifierContext;
-class LiteralContext extends antlr4_1.ParserRuleContext {
+exports.ParenthesizedItemContext = ParenthesizedItemContext;
+class ValueContext extends antlr4_1.ParserRuleContext {
     constructor(parser, parent, invokingState) {
         super(parent, invokingState);
         this.parser = parser;
     }
     get ruleIndex() {
-        return OpraFilterParser.RULE_literal;
+        return OpraFilterParser.RULE_value;
     }
     copyFrom(ctx) {
         super.copyFrom(ctx);
     }
 }
-exports.LiteralContext = LiteralContext;
-class TimeLiteralContext extends LiteralContext {
+exports.ValueContext = ValueContext;
+class TimeLiteralContext extends ValueContext {
     constructor(parser, ctx) {
         super(parser, ctx.parentCtx, ctx.invokingState);
         super.copyFrom(ctx);
@@ -2060,7 +1236,7 @@ class TimeLiteralContext extends LiteralContext {
     }
 }
 exports.TimeLiteralContext = TimeLiteralContext;
-class NullLiteralContext extends LiteralContext {
+class NullLiteralContext extends ValueContext {
     constructor(parser, ctx) {
         super(parser, ctx.parentCtx, ctx.invokingState);
         super.copyFrom(ctx);
@@ -2089,7 +1265,7 @@ class NullLiteralContext extends LiteralContext {
     }
 }
 exports.NullLiteralContext = NullLiteralContext;
-class DateTimeLiteralContext extends LiteralContext {
+class DateTimeLiteralContext extends ValueContext {
     constructor(parser, ctx) {
         super(parser, ctx.parentCtx, ctx.invokingState);
         super.copyFrom(ctx);
@@ -2118,7 +1294,7 @@ class DateTimeLiteralContext extends LiteralContext {
     }
 }
 exports.DateTimeLiteralContext = DateTimeLiteralContext;
-class StringLiteralContext extends LiteralContext {
+class StringLiteralContext extends ValueContext {
     constructor(parser, ctx) {
         super(parser, ctx.parentCtx, ctx.invokingState);
         super.copyFrom(ctx);
@@ -2147,7 +1323,7 @@ class StringLiteralContext extends LiteralContext {
     }
 }
 exports.StringLiteralContext = StringLiteralContext;
-class DateLiteralContext extends LiteralContext {
+class DateLiteralContext extends ValueContext {
     constructor(parser, ctx) {
         super(parser, ctx.parentCtx, ctx.invokingState);
         super.copyFrom(ctx);
@@ -2176,7 +1352,7 @@ class DateLiteralContext extends LiteralContext {
     }
 }
 exports.DateLiteralContext = DateLiteralContext;
-class InfinityLiteralContext extends LiteralContext {
+class InfinityLiteralContext extends ValueContext {
     constructor(parser, ctx) {
         super(parser, ctx.parentCtx, ctx.invokingState);
         super.copyFrom(ctx);
@@ -2205,7 +1381,7 @@ class InfinityLiteralContext extends LiteralContext {
     }
 }
 exports.InfinityLiteralContext = InfinityLiteralContext;
-class BooleanLiteralContext extends LiteralContext {
+class BooleanLiteralContext extends ValueContext {
     constructor(parser, ctx) {
         super(parser, ctx.parentCtx, ctx.invokingState);
         super.copyFrom(ctx);
@@ -2234,7 +1410,7 @@ class BooleanLiteralContext extends LiteralContext {
     }
 }
 exports.BooleanLiteralContext = BooleanLiteralContext;
-class NumberLiteralContext extends LiteralContext {
+class NumberLiteralContext extends ValueContext {
     constructor(parser, ctx) {
         super(parser, ctx.parentCtx, ctx.invokingState);
         super.copyFrom(ctx);
@@ -2263,122 +1439,140 @@ class NumberLiteralContext extends LiteralContext {
     }
 }
 exports.NumberLiteralContext = NumberLiteralContext;
-class CompOpContext extends antlr4_1.ParserRuleContext {
+class QualifiedIdentifierContext extends antlr4_1.ParserRuleContext {
     constructor(parser, parent, invokingState) {
         super(parent, invokingState);
         this.parser = parser;
     }
+    identifier_list() {
+        return this.getTypedRuleContexts(IdentifierContext);
+    }
+    identifier(i) {
+        return this.getTypedRuleContext(IdentifierContext, i);
+    }
     get ruleIndex() {
-        return OpraFilterParser.RULE_compOp;
+        return OpraFilterParser.RULE_qualifiedIdentifier;
     }
     enterRule(listener) {
-        if (listener.enterCompOp) {
-            listener.enterCompOp(this);
+        if (listener.enterQualifiedIdentifier) {
+            listener.enterQualifiedIdentifier(this);
         }
     }
     exitRule(listener) {
-        if (listener.exitCompOp) {
-            listener.exitCompOp(this);
+        if (listener.exitQualifiedIdentifier) {
+            listener.exitQualifiedIdentifier(this);
         }
     }
     // @Override
     accept(visitor) {
-        if (visitor.visitCompOp) {
-            return visitor.visitCompOp(this);
+        if (visitor.visitQualifiedIdentifier) {
+            return visitor.visitQualifiedIdentifier(this);
         }
         else {
             return visitor.visitChildren(this);
         }
     }
 }
-exports.CompOpContext = CompOpContext;
-class ArthOpContext extends antlr4_1.ParserRuleContext {
+exports.QualifiedIdentifierContext = QualifiedIdentifierContext;
+class ExternalConstantContext extends antlr4_1.ParserRuleContext {
     constructor(parser, parent, invokingState) {
         super(parent, invokingState);
         this.parser = parser;
     }
+    identifier() {
+        return this.getTypedRuleContext(IdentifierContext, 0);
+    }
     get ruleIndex() {
-        return OpraFilterParser.RULE_arthOp;
+        return OpraFilterParser.RULE_externalConstant;
     }
     enterRule(listener) {
-        if (listener.enterArthOp) {
-            listener.enterArthOp(this);
+        if (listener.enterExternalConstant) {
+            listener.enterExternalConstant(this);
         }
     }
     exitRule(listener) {
-        if (listener.exitArthOp) {
-            listener.exitArthOp(this);
+        if (listener.exitExternalConstant) {
+            listener.exitExternalConstant(this);
         }
     }
     // @Override
     accept(visitor) {
-        if (visitor.visitArthOp) {
-            return visitor.visitArthOp(this);
+        if (visitor.visitExternalConstant) {
+            return visitor.visitExternalConstant(this);
         }
         else {
             return visitor.visitChildren(this);
         }
     }
 }
-exports.ArthOpContext = ArthOpContext;
-class PolarOpContext extends antlr4_1.ParserRuleContext {
+exports.ExternalConstantContext = ExternalConstantContext;
+class IdentifierContext extends antlr4_1.ParserRuleContext {
     constructor(parser, parent, invokingState) {
         super(parent, invokingState);
         this.parser = parser;
     }
+    IDENTIFIER() {
+        return this.getToken(OpraFilterParser.IDENTIFIER, 0);
+    }
     get ruleIndex() {
-        return OpraFilterParser.RULE_polarOp;
+        return OpraFilterParser.RULE_identifier;
     }
     enterRule(listener) {
-        if (listener.enterPolarOp) {
-            listener.enterPolarOp(this);
+        if (listener.enterIdentifier) {
+            listener.enterIdentifier(this);
         }
     }
     exitRule(listener) {
-        if (listener.exitPolarOp) {
-            listener.exitPolarOp(this);
+        if (listener.exitIdentifier) {
+            listener.exitIdentifier(this);
         }
     }
     // @Override
     accept(visitor) {
-        if (visitor.visitPolarOp) {
-            return visitor.visitPolarOp(this);
+        if (visitor.visitIdentifier) {
+            return visitor.visitIdentifier(this);
         }
         else {
             return visitor.visitChildren(this);
         }
     }
 }
-exports.PolarOpContext = PolarOpContext;
-class LogOpContext extends antlr4_1.ParserRuleContext {
+exports.IdentifierContext = IdentifierContext;
+class ArrayValueContext extends antlr4_1.ParserRuleContext {
     constructor(parser, parent, invokingState) {
         super(parent, invokingState);
         this.parser = parser;
     }
+    value_list() {
+        return this.getTypedRuleContexts(ValueContext);
+    }
+    value(i) {
+        return this.getTypedRuleContext(ValueContext, i);
+    }
     get ruleIndex() {
-        return OpraFilterParser.RULE_logOp;
+        return OpraFilterParser.RULE_arrayValue;
     }
     enterRule(listener) {
-        if (listener.enterLogOp) {
-            listener.enterLogOp(this);
+        if (listener.enterArrayValue) {
+            listener.enterArrayValue(this);
         }
     }
     exitRule(listener) {
-        if (listener.exitLogOp) {
-            listener.exitLogOp(this);
+        if (listener.exitArrayValue) {
+            listener.exitArrayValue(this);
         }
     }
     // @Override
     accept(visitor) {
-        if (visitor.visitLogOp) {
-            return visitor.visitLogOp(this);
+        if (visitor.visitArrayValue) {
+            return visitor.visitArrayValue(this);
         }
         else {
             return visitor.visitChildren(this);
         }
     }
 }
-exports.LogOpContext = LogOpContext;
+exports.ArrayValueContext = ArrayValueContext;
 class BooleanContext extends antlr4_1.ParserRuleContext {
     constructor(parser, parent, invokingState) {
         super(parent, invokingState);
@@ -2466,3 +1660,122 @@ class InfinityContext extends antlr4_1.ParserRuleContext {
     }
 }
 exports.InfinityContext = InfinityContext;
+class ArithmeticOperatorContext extends antlr4_1.ParserRuleContext {
+    constructor(parser, parent, invokingState) {
+        super(parent, invokingState);
+        this.parser = parser;
+    }
+    get ruleIndex() {
+        return OpraFilterParser.RULE_arithmeticOperator;
+    }
+    enterRule(listener) {
+        if (listener.enterArithmeticOperator) {
+            listener.enterArithmeticOperator(this);
+        }
+    }
+    exitRule(listener) {
+        if (listener.exitArithmeticOperator) {
+            listener.exitArithmeticOperator(this);
+        }
+    }
+    // @Override
+    accept(visitor) {
+        if (visitor.visitArithmeticOperator) {
+            return visitor.visitArithmeticOperator(this);
+        }
+        else {
+            return visitor.visitChildren(this);
+        }
+    }
+}
+exports.ArithmeticOperatorContext = ArithmeticOperatorContext;
+class ComparisonOperatorContext extends antlr4_1.ParserRuleContext {
+    constructor(parser, parent, invokingState) {
+        super(parent, invokingState);
+        this.parser = parser;
+    }
+    get ruleIndex() {
+        return OpraFilterParser.RULE_comparisonOperator;
+    }
+    enterRule(listener) {
+        if (listener.enterComparisonOperator) {
+            listener.enterComparisonOperator(this);
+        }
+    }
+    exitRule(listener) {
+        if (listener.exitComparisonOperator) {
+            listener.exitComparisonOperator(this);
+        }
+    }
+    // @Override
+    accept(visitor) {
+        if (visitor.visitComparisonOperator) {
+            return visitor.visitComparisonOperator(this);
+        }
+        else {
+            return visitor.visitChildren(this);
+        }
+    }
+}
+exports.ComparisonOperatorContext = ComparisonOperatorContext;
+class LogicalOperatorContext extends antlr4_1.ParserRuleContext {
+    constructor(parser, parent, invokingState) {
+        super(parent, invokingState);
+        this.parser = parser;
+    }
+    get ruleIndex() {
+        return OpraFilterParser.RULE_logicalOperator;
+    }
+    enterRule(listener) {
+        if (listener.enterLogicalOperator) {
+            listener.enterLogicalOperator(this);
+        }
+    }
+    exitRule(listener) {
+        if (listener.exitLogicalOperator) {
+            listener.exitLogicalOperator(this);
+        }
+    }
+    // @Override
+    accept(visitor) {
+        if (visitor.visitLogicalOperator) {
+            return visitor.visitLogicalOperator(this);
+        }
+        else {
+            return visitor.visitChildren(this);
+        }
+    }
+}
+exports.LogicalOperatorContext = LogicalOperatorContext;
+class PolarityOperatorContext extends antlr4_1.ParserRuleContext {
+    constructor(parser, parent, invokingState) {
+        super(parent, invokingState);
+        this.parser = parser;
+    }
+    POLAR_OP() {
+        return this.getToken(OpraFilterParser.POLAR_OP, 0);
+    }
+    get ruleIndex() {
+        return OpraFilterParser.RULE_polarityOperator;
+    }
+    enterRule(listener) {
+        if (listener.enterPolarityOperator) {
+            listener.enterPolarityOperator(this);
+        }
+    }
+    exitRule(listener) {
+        if (listener.exitPolarityOperator) {
+            listener.exitPolarityOperator(this);
+        }
+    }
+    // @Override
+    accept(visitor) {
+        if (visitor.visitPolarityOperator) {
+            return visitor.visitPolarityOperator(this);
+        }
+        else {
+            return visitor.visitChildren(this);
+        }
+    }
+}
+exports.PolarityOperatorContext = PolarityOperatorContext;