@webda/ql 4.0.0-beta.2 → 4.0.0-beta.5

package/lib/WebdaQLParserParser.js

@@ -1,17 +1,166 @@
-// Generated from src/stores/webdaql/WebdaQLParser.g4 by ANTLR 4.9.0-SNAPSHOT
+// Generated from src/WebdaQLParser.g4 by ANTLR 4.9.0-SNAPSHOT
 import { ATN } from "antlr4ts/atn/ATN.js";
 import { ATNDeserializer } from "antlr4ts/atn/ATNDeserializer.js";
-import { ParserATNSimulator } from "antlr4ts/atn/ParserATNSimulator.js";
 import { FailedPredicateException } from "antlr4ts/FailedPredicateException.js";
 import { NoViableAltException } from "antlr4ts/NoViableAltException.js";
 import { Parser } from "antlr4ts/Parser.js";
 import { ParserRuleContext } from "antlr4ts/ParserRuleContext.js";
+import { ParserATNSimulator } from "antlr4ts/atn/ParserATNSimulator.js";
 import { RecognitionException } from "antlr4ts/RecognitionException.js";
-//import { RuleVersion } from "antlr4ts/RuleVersion";
 import { Token } from "antlr4ts/Token.js";
 import { VocabularyImpl } from "antlr4ts/VocabularyImpl.js";
 import * as Utils from "antlr4ts/misc/Utils.js";
 export class WebdaQLParserParser extends Parser {
+    static SPACE = 1;
+    static LR_BRACKET = 2;
+    static RR_BRACKET = 3;
+    static COMMA = 4;
+    static SINGLE_QUOTE_SYMB = 5;
+    static DOUBLE_QUOTE_SYMB = 6;
+    static LR_SQ_BRACKET = 7;
+    static RR_SQ_BRACKET = 8;
+    static AND = 9;
+    static OR = 10;
+    static EQUAL = 11;
+    static NOT_EQUAL = 12;
+    static GREATER = 13;
+    static GREATER_OR_EQUAL = 14;
+    static LESS = 15;
+    static LESS_OR_EQUAL = 16;
+    static LIKE = 17;
+    static IN = 18;
+    static CONTAINS = 19;
+    static IS = 20;
+    static NOT = 21;
+    static NULL = 22;
+    static TRUE = 23;
+    static FALSE = 24;
+    static LIMIT = 25;
+    static OFFSET = 26;
+    static ORDER_BY = 27;
+    static ASC = 28;
+    static DESC = 29;
+    static DQUOTED_STRING_LITERAL = 30;
+    static SQUOTED_STRING_LITERAL = 31;
+    static INTEGER_LITERAL = 32;
+    static NUMBER_LITERAL = 33;
+    static POSITIONAL_PARAMETER = 34;
+    static NAMED_PARAMETER = 35;
+    static IDENTIFIER = 36;
+    static IDENTIFIER_WITH_NUMBER = 37;
+    static FUNCTION_IDENTIFIER_WITH_UNDERSCORE = 38;
+    static RULE_webdaql = 0;
+    static RULE_limitExpression = 1;
+    static RULE_offsetExpression = 2;
+    static RULE_orderFieldExpression = 3;
+    static RULE_orderExpression = 4;
+    static RULE_expression = 5;
+    static RULE_values = 6;
+    static RULE_atom = 7;
+    static RULE_identifier = 8;
+    static RULE_booleanLiteral = 9;
+    static RULE_stringLiteral = 10;
+    static RULE_integerLiteral = 11;
+    static RULE_numberLiteral = 12;
+    static RULE_parameter = 13;
+    static RULE_setExpression = 14;
+    // tslint:disable:no-trailing-whitespace
+    static ruleNames = [
+        "webdaql",
+        "limitExpression",
+        "offsetExpression",
+        "orderFieldExpression",
+        "orderExpression",
+        "expression",
+        "values",
+        "atom",
+        "identifier",
+        "booleanLiteral",
+        "stringLiteral",
+        "integerLiteral",
+        "numberLiteral",
+        "parameter",
+        "setExpression"
+    ];
+    static _LITERAL_NAMES = [
+        undefined,
+        undefined,
+        "'('",
+        "')'",
+        "','",
+        "'''",
+        "'\"'",
+        "'['",
+        "']'",
+        "'AND'",
+        "'OR'",
+        "'='",
+        "'!='",
+        "'>'",
+        "'>='",
+        "'<'",
+        "'<='",
+        "'LIKE'",
+        "'IN'",
+        "'CONTAINS'",
+        "'IS'",
+        "'NOT'",
+        "'NULL'",
+        "'TRUE'",
+        "'FALSE'",
+        "'LIMIT'",
+        "'OFFSET'",
+        "'ORDER BY'",
+        "'ASC'",
+        "'DESC'",
+        undefined,
+        undefined,
+        undefined,
+        undefined,
+        "'?'"
+    ];
+    static _SYMBOLIC_NAMES = [
+        undefined,
+        "SPACE",
+        "LR_BRACKET",
+        "RR_BRACKET",
+        "COMMA",
+        "SINGLE_QUOTE_SYMB",
+        "DOUBLE_QUOTE_SYMB",
+        "LR_SQ_BRACKET",
+        "RR_SQ_BRACKET",
+        "AND",
+        "OR",
+        "EQUAL",
+        "NOT_EQUAL",
+        "GREATER",
+        "GREATER_OR_EQUAL",
+        "LESS",
+        "LESS_OR_EQUAL",
+        "LIKE",
+        "IN",
+        "CONTAINS",
+        "IS",
+        "NOT",
+        "NULL",
+        "TRUE",
+        "FALSE",
+        "LIMIT",
+        "OFFSET",
+        "ORDER_BY",
+        "ASC",
+        "DESC",
+        "DQUOTED_STRING_LITERAL",
+        "SQUOTED_STRING_LITERAL",
+        "INTEGER_LITERAL",
+        "NUMBER_LITERAL",
+        "POSITIONAL_PARAMETER",
+        "NAMED_PARAMETER",
+        "IDENTIFIER",
+        "IDENTIFIER_WITH_NUMBER",
+        "FUNCTION_IDENTIFIER_WITH_UNDERSCORE"
+    ];
+    static VOCABULARY = new VocabularyImpl(WebdaQLParserParser._LITERAL_NAMES, WebdaQLParserParser._SYMBOLIC_NAMES, []);
     // @Override
     // @NotNull
     get vocabulary() {
@@ -39,59 +188,63 @@ export class WebdaQLParserParser extends Parser {
     }
     // @RuleVersion(0)
     webdaql() {
-        const _localctx = new WebdaqlContext(this._ctx, this.state);
+        let _localctx = new WebdaqlContext(this._ctx, this.state);
         this.enterRule(_localctx, 0, WebdaQLParserParser.RULE_webdaql);
         let _la;
         try {
             this.enterOuterAlt(_localctx, 1);
             {
-                this.state = 27;
+                this.state = 31;
                 this._errHandler.sync(this);
                 _la = this._input.LA(1);
-                if ((_la & ~0x1f) === 0 &&
+                if (((_la & ~0x1f) === 0 &&
                     ((1 << _la) &
                         ((1 << WebdaQLParserParser.LR_BRACKET) |
                             (1 << WebdaQLParserParser.TRUE) |
                             (1 << WebdaQLParserParser.FALSE) |
                             (1 << WebdaQLParserParser.DQUOTED_STRING_LITERAL) |
-                            (1 << WebdaQLParserParser.SQUOTED_STRING_LITERAL) |
-                            (1 << WebdaQLParserParser.INTEGER_LITERAL) |
-                            (1 << WebdaQLParserParser.IDENTIFIER) |
-                            (1 << WebdaQLParserParser.IDENTIFIER_WITH_NUMBER))) !==
-                        0) {
+                            (1 << WebdaQLParserParser.SQUOTED_STRING_LITERAL))) !==
+                        0) ||
+                    (((_la - 32) & ~0x1f) === 0 &&
+                        ((1 << (_la - 32)) &
+                            ((1 << (WebdaQLParserParser.INTEGER_LITERAL - 32)) |
+                                (1 << (WebdaQLParserParser.NUMBER_LITERAL - 32)) |
+                                (1 << (WebdaQLParserParser.IDENTIFIER - 32)) |
+                                (1 << (WebdaQLParserParser.IDENTIFIER_WITH_NUMBER - 32)))) !==
+                            0)) {
                     {
-                        this.state = 26;
+                        this.state = 30;
                         this.expression(0);
                     }
                 }
-                this.state = 30;
+                this.state = 34;
                 this._errHandler.sync(this);
                 _la = this._input.LA(1);
                 if (_la === WebdaQLParserParser.ORDER_BY) {
                     {
-                        this.state = 29;
+                        this.state = 33;
                         this.orderExpression();
                     }
                 }
-                this.state = 33;
+                this.state = 37;
                 this._errHandler.sync(this);
                 _la = this._input.LA(1);
                 if (_la === WebdaQLParserParser.LIMIT) {
                     {
-                        this.state = 32;
+                        this.state = 36;
                         this.limitExpression();
                     }
                 }
-                this.state = 36;
+                this.state = 40;
                 this._errHandler.sync(this);
                 _la = this._input.LA(1);
                 if (_la === WebdaQLParserParser.OFFSET) {
                     {
-                        this.state = 35;
+                        this.state = 39;
                         this.offsetExpression();
                     }
                 }
-                this.state = 38;
+                this.state = 42;
                 this.match(WebdaQLParserParser.EOF);
             }
         }
@@ -112,15 +265,32 @@ export class WebdaQLParserParser extends Parser {
     }
     // @RuleVersion(0)
     limitExpression() {
-        const _localctx = new LimitExpressionContext(this._ctx, this.state);
+        let _localctx = new LimitExpressionContext(this._ctx, this.state);
         this.enterRule(_localctx, 2, WebdaQLParserParser.RULE_limitExpression);
         try {
             this.enterOuterAlt(_localctx, 1);
             {
-                this.state = 40;
+                this.state = 44;
                 this.match(WebdaQLParserParser.LIMIT);
-                this.state = 41;
-                this.integerLiteral();
+                this.state = 47;
+                this._errHandler.sync(this);
+                switch (this._input.LA(1)) {
+                    case WebdaQLParserParser.INTEGER_LITERAL:
+                        {
+                            this.state = 45;
+                            this.integerLiteral();
+                        }
+                        break;
+                    case WebdaQLParserParser.POSITIONAL_PARAMETER:
+                    case WebdaQLParserParser.NAMED_PARAMETER:
+                        {
+                            this.state = 46;
+                            this.parameter();
+                        }
+                        break;
+                    default:
+                        throw new NoViableAltException(this);
+                }
             }
         }
         catch (re) {
@@ -140,15 +310,33 @@ export class WebdaQLParserParser extends Parser {
     }
     // @RuleVersion(0)
     offsetExpression() {
-        const _localctx = new OffsetExpressionContext(this._ctx, this.state);
+        let _localctx = new OffsetExpressionContext(this._ctx, this.state);
         this.enterRule(_localctx, 4, WebdaQLParserParser.RULE_offsetExpression);
         try {
             this.enterOuterAlt(_localctx, 1);
             {
-                this.state = 43;
+                this.state = 49;
                 this.match(WebdaQLParserParser.OFFSET);
-                this.state = 44;
-                this.stringLiteral();
+                this.state = 52;
+                this._errHandler.sync(this);
+                switch (this._input.LA(1)) {
+                    case WebdaQLParserParser.DQUOTED_STRING_LITERAL:
+                    case WebdaQLParserParser.SQUOTED_STRING_LITERAL:
+                        {
+                            this.state = 50;
+                            this.stringLiteral();
+                        }
+                        break;
+                    case WebdaQLParserParser.POSITIONAL_PARAMETER:
+                    case WebdaQLParserParser.NAMED_PARAMETER:
+                        {
+                            this.state = 51;
+                            this.parameter();
+                        }
+                        break;
+                    default:
+                        throw new NoViableAltException(this);
+                }
             }
         }
         catch (re) {
@@ -168,20 +356,20 @@ export class WebdaQLParserParser extends Parser {
     }
     // @RuleVersion(0)
     orderFieldExpression() {
-        const _localctx = new OrderFieldExpressionContext(this._ctx, this.state);
+        let _localctx = new OrderFieldExpressionContext(this._ctx, this.state);
         this.enterRule(_localctx, 6, WebdaQLParserParser.RULE_orderFieldExpression);
         let _la;
         try {
             this.enterOuterAlt(_localctx, 1);
             {
-                this.state = 46;
+                this.state = 54;
                 this.identifier();
-                this.state = 48;
+                this.state = 56;
                 this._errHandler.sync(this);
                 _la = this._input.LA(1);
                 if (_la === WebdaQLParserParser.ASC || _la === WebdaQLParserParser.DESC) {
                     {
-                        this.state = 47;
+                        this.state = 55;
                         _la = this._input.LA(1);
                         if (!(_la === WebdaQLParserParser.ASC || _la === WebdaQLParserParser.DESC)) {
                             this._errHandler.recoverInline(this);
@@ -214,29 +402,29 @@ export class WebdaQLParserParser extends Parser {
     }
     // @RuleVersion(0)
     orderExpression() {
-        const _localctx = new OrderExpressionContext(this._ctx, this.state);
+        let _localctx = new OrderExpressionContext(this._ctx, this.state);
         this.enterRule(_localctx, 8, WebdaQLParserParser.RULE_orderExpression);
         let _la;
         try {
             this.enterOuterAlt(_localctx, 1);
             {
-                this.state = 50;
+                this.state = 58;
                 this.match(WebdaQLParserParser.ORDER_BY);
-                this.state = 51;
+                this.state = 59;
                 this.orderFieldExpression();
-                this.state = 56;
+                this.state = 64;
                 this._errHandler.sync(this);
                 _la = this._input.LA(1);
                 while (_la === WebdaQLParserParser.COMMA) {
                     {
                         {
-                            this.state = 52;
+                            this.state = 60;
                             this.match(WebdaQLParserParser.COMMA);
-                            this.state = 53;
+                            this.state = 61;
                             this.orderFieldExpression();
                         }
                     }
-                    this.state = 58;
+                    this.state = 66;
                     this._errHandler.sync(this);
                     _la = this._input.LA(1);
                 }
@@ -262,31 +450,49 @@ export class WebdaQLParserParser extends Parser {
         if (_p === undefined) {
             _p = 0;
         }
-        const _parentctx = this._ctx;
-        const _parentState = this.state;
+        let _parentctx = this._ctx;
+        let _parentState = this.state;
         let _localctx = new ExpressionContext(this._ctx, _parentState);
         let _prevctx = _localctx;
-        const _startState = 10;
+        let _startState = 10;
         this.enterRecursionRule(_localctx, 10, WebdaQLParserParser.RULE_expression, _p);
         let _la;
         try {
             let _alt;
             this.enterOuterAlt(_localctx, 1);
             {
-                this.state = 81;
+                this.state = 106;
                 this._errHandler.sync(this);
-                switch (this.interpreter.adaptivePredict(this._input, 6, this._ctx)) {
+                switch (this.interpreter.adaptivePredict(this._input, 12, this._ctx)) {
                     case 1:
                         {
                             _localctx = new LikeExpressionContext(_localctx);
                             this._ctx = _localctx;
                             _prevctx = _localctx;
-                            this.state = 60;
+                            this.state = 68;
                             this.identifier();
-                            this.state = 61;
+                            this.state = 69;
                             this.match(WebdaQLParserParser.LIKE);
-                            this.state = 62;
-                            this.stringLiteral();
+                            this.state = 72;
+                            this._errHandler.sync(this);
+                            switch (this._input.LA(1)) {
+                                case WebdaQLParserParser.DQUOTED_STRING_LITERAL:
+                                case WebdaQLParserParser.SQUOTED_STRING_LITERAL:
+                                    {
+                                        this.state = 70;
+                                        this.stringLiteral();
+                                    }
+                                    break;
+                                case WebdaQLParserParser.POSITIONAL_PARAMETER:
+                                case WebdaQLParserParser.NAMED_PARAMETER:
+                                    {
+                                        this.state = 71;
+                                        this.parameter();
+                                    }
+                                    break;
+                                default:
+                                    throw new NoViableAltException(this);
+                            }
                         }
                         break;
                     case 2:
@@ -294,12 +500,29 @@ export class WebdaQLParserParser extends Parser {
                             _localctx = new InExpressionContext(_localctx);
                             this._ctx = _localctx;
                             _prevctx = _localctx;
-                            this.state = 64;
+                            this.state = 74;
                             this.identifier();
-                            this.state = 65;
+                            this.state = 75;
                             this.match(WebdaQLParserParser.IN);
-                            this.state = 66;
-                            this.setExpression();
+                            this.state = 78;
+                            this._errHandler.sync(this);
+                            switch (this._input.LA(1)) {
+                                case WebdaQLParserParser.LR_SQ_BRACKET:
+                                    {
+                                        this.state = 76;
+                                        this.setExpression();
+                                    }
+                                    break;
+                                case WebdaQLParserParser.POSITIONAL_PARAMETER:
+                                case WebdaQLParserParser.NAMED_PARAMETER:
+                                    {
+                                        this.state = 77;
+                                        this.parameter();
+                                    }
+                                    break;
+                                default:
+                                    throw new NoViableAltException(this);
+                            }
                         }
                         break;
                     case 3:
@@ -307,22 +530,68 @@ export class WebdaQLParserParser extends Parser {
                             _localctx = new ContainsExpressionContext(_localctx);
                             this._ctx = _localctx;
                             _prevctx = _localctx;
-                            this.state = 68;
+                            this.state = 80;
                             this.identifier();
-                            this.state = 69;
+                            this.state = 81;
                             this.match(WebdaQLParserParser.CONTAINS);
-                            this.state = 70;
-                            this.stringLiteral();
+                            this.state = 84;
+                            this._errHandler.sync(this);
+                            switch (this._input.LA(1)) {
+                                case WebdaQLParserParser.DQUOTED_STRING_LITERAL:
+                                case WebdaQLParserParser.SQUOTED_STRING_LITERAL:
+                                    {
+                                        this.state = 82;
+                                        this.stringLiteral();
+                                    }
+                                    break;
+                                case WebdaQLParserParser.POSITIONAL_PARAMETER:
+                                case WebdaQLParserParser.NAMED_PARAMETER:
+                                    {
+                                        this.state = 83;
+                                        this.parameter();
+                                    }
+                                    break;
+                                default:
+                                    throw new NoViableAltException(this);
+                            }
                         }
                         break;
                     case 4:
+                        {
+                            _localctx = new IsNullExpressionContext(_localctx);
+                            this._ctx = _localctx;
+                            _prevctx = _localctx;
+                            this.state = 86;
+                            this.identifier();
+                            this.state = 87;
+                            this.match(WebdaQLParserParser.IS);
+                            this.state = 88;
+                            this.match(WebdaQLParserParser.NULL);
+                        }
+                        break;
+                    case 5:
+                        {
+                            _localctx = new IsNotNullExpressionContext(_localctx);
+                            this._ctx = _localctx;
+                            _prevctx = _localctx;
+                            this.state = 90;
+                            this.identifier();
+                            this.state = 91;
+                            this.match(WebdaQLParserParser.IS);
+                            this.state = 92;
+                            this.match(WebdaQLParserParser.NOT);
+                            this.state = 93;
+                            this.match(WebdaQLParserParser.NULL);
+                        }
+                        break;
+                    case 6:
                         {
                             _localctx = new BinaryComparisonExpressionContext(_localctx);
                             this._ctx = _localctx;
                             _prevctx = _localctx;
-                            this.state = 72;
+                            this.state = 95;
                             this.identifier();
-                            this.state = 73;
+                            this.state = 96;
                             _la = this._input.LA(1);
                             if (!((_la & ~0x1f) === 0 &&
                                 ((1 << _la) &
@@ -342,37 +611,59 @@ export class WebdaQLParserParser extends Parser {
                                 this._errHandler.reportMatch(this);
                                 this.consume();
                             }
-                            this.state = 74;
-                            this.values();
+                            this.state = 99;
+                            this._errHandler.sync(this);
+                            switch (this._input.LA(1)) {
+                                case WebdaQLParserParser.TRUE:
+                                case WebdaQLParserParser.FALSE:
+                                case WebdaQLParserParser.DQUOTED_STRING_LITERAL:
+                                case WebdaQLParserParser.SQUOTED_STRING_LITERAL:
+                                case WebdaQLParserParser.INTEGER_LITERAL:
+                                case WebdaQLParserParser.NUMBER_LITERAL:
+                                    {
+                                        this.state = 97;
+                                        this.values();
+                                    }
+                                    break;
+                                case WebdaQLParserParser.POSITIONAL_PARAMETER:
+                                case WebdaQLParserParser.NAMED_PARAMETER:
+                                    {
+                                        this.state = 98;
+                                        this.parameter();
+                                    }
+                                    break;
+                                default:
+                                    throw new NoViableAltException(this);
+                            }
                         }
                         break;
-                    case 5:
+                    case 7:
                         {
                             _localctx = new SubExpressionContext(_localctx);
                             this._ctx = _localctx;
                             _prevctx = _localctx;
-                            this.state = 76;
+                            this.state = 101;
                             this.match(WebdaQLParserParser.LR_BRACKET);
-                            this.state = 77;
+                            this.state = 102;
                             this.expression(0);
-                            this.state = 78;
+                            this.state = 103;
                             this.match(WebdaQLParserParser.RR_BRACKET);
                         }
                         break;
-                    case 6:
+                    case 8:
                         {
                             _localctx = new AtomExpressionContext(_localctx);
                             this._ctx = _localctx;
                             _prevctx = _localctx;
-                            this.state = 80;
+                            this.state = 105;
                             this.atom();
                         }
                         break;
                 }
                 this._ctx._stop = this._input.tryLT(-1);
-                this.state = 91;
+                this.state = 116;
                 this._errHandler.sync(this);
-                _alt = this.interpreter.adaptivePredict(this._input, 8, this._ctx);
+                _alt = this.interpreter.adaptivePredict(this._input, 14, this._ctx);
                 while (_alt !== 2 && _alt !== ATN.INVALID_ALT_NUMBER) {
                     if (_alt === 1) {
                         if (this._parseListeners != null) {
@@ -380,20 +671,20 @@ export class WebdaQLParserParser extends Parser {
                         }
                         _prevctx = _localctx;
                         {
-                            this.state = 89;
+                            this.state = 114;
                             this._errHandler.sync(this);
-                            switch (this.interpreter.adaptivePredict(this._input, 7, this._ctx)) {
+                            switch (this.interpreter.adaptivePredict(this._input, 13, this._ctx)) {
                                 case 1:
                                     {
                                         _localctx = new AndLogicExpressionContext(new ExpressionContext(_parentctx, _parentState));
                                         this.pushNewRecursionContext(_localctx, _startState, WebdaQLParserParser.RULE_expression);
-                                        this.state = 83;
+                                        this.state = 108;
                                         if (!this.precpred(this._ctx, 4)) {
                                             throw this.createFailedPredicateException("this.precpred(this._ctx, 4)");
                                         }
-                                        this.state = 84;
+                                        this.state = 109;
                                         this.match(WebdaQLParserParser.AND);
-                                        this.state = 85;
+                                        this.state = 110;
                                         this.expression(5);
                                     }
                                     break;
@@ -401,22 +692,22 @@ export class WebdaQLParserParser extends Parser {
                                     {
                                         _localctx = new OrLogicExpressionContext(new ExpressionContext(_parentctx, _parentState));
                                         this.pushNewRecursionContext(_localctx, _startState, WebdaQLParserParser.RULE_expression);
-                                        this.state = 86;
+                                        this.state = 111;
                                         if (!this.precpred(this._ctx, 3)) {
                                             throw this.createFailedPredicateException("this.precpred(this._ctx, 3)");
                                         }
-                                        this.state = 87;
+                                        this.state = 112;
                                         this.match(WebdaQLParserParser.OR);
-                                        this.state = 88;
+                                        this.state = 113;
                                         this.expression(4);
                                     }
                                     break;
                             }
                         }
                     }
-                    this.state = 93;
+                    this.state = 118;
                     this._errHandler.sync(this);
-                    _alt = this.interpreter.adaptivePredict(this._input, 8, this._ctx);
+                    _alt = this.interpreter.adaptivePredict(this._input, 14, this._ctx);
                 }
             }
         }
@@ -440,7 +731,7 @@ export class WebdaQLParserParser extends Parser {
         let _localctx = new ValuesContext(this._ctx, this.state);
         this.enterRule(_localctx, 12, WebdaQLParserParser.RULE_values);
         try {
-            this.state = 97;
+            this.state = 123;
             this._errHandler.sync(this);
             switch (this._input.LA(1)) {
                 case WebdaQLParserParser.TRUE:
@@ -448,7 +739,7 @@ export class WebdaQLParserParser extends Parser {
                     _localctx = new BooleanAtomContext(_localctx);
                     this.enterOuterAlt(_localctx, 1);
                     {
-                        this.state = 94;
+                        this.state = 119;
                         this.booleanLiteral();
                     }
                     break;
@@ -456,16 +747,24 @@ export class WebdaQLParserParser extends Parser {
                     _localctx = new IntegerAtomContext(_localctx);
                     this.enterOuterAlt(_localctx, 2);
                     {
-                        this.state = 95;
+                        this.state = 120;
                         this.integerLiteral();
                     }
                     break;
+                case WebdaQLParserParser.NUMBER_LITERAL:
+                    _localctx = new NumberAtomContext(_localctx);
+                    this.enterOuterAlt(_localctx, 3);
+                    {
+                        this.state = 121;
+                        this.numberLiteral();
+                    }
+                    break;
                 case WebdaQLParserParser.DQUOTED_STRING_LITERAL:
                 case WebdaQLParserParser.SQUOTED_STRING_LITERAL:
                     _localctx = new StringAtomContext(_localctx);
-                    this.enterOuterAlt(_localctx, 3);
+                    this.enterOuterAlt(_localctx, 4);
                     {
-                        this.state = 96;
+                        this.state = 122;
                         this.stringLiteral();
                     }
                     break;
@@ -493,7 +792,7 @@ export class WebdaQLParserParser extends Parser {
         let _localctx = new AtomContext(this._ctx, this.state);
         this.enterRule(_localctx, 14, WebdaQLParserParser.RULE_atom);
         try {
-            this.state = 101;
+            this.state = 127;
             this._errHandler.sync(this);
             switch (this._input.LA(1)) {
                 case WebdaQLParserParser.TRUE:
@@ -501,10 +800,11 @@ export class WebdaQLParserParser extends Parser {
                 case WebdaQLParserParser.DQUOTED_STRING_LITERAL:
                 case WebdaQLParserParser.SQUOTED_STRING_LITERAL:
                 case WebdaQLParserParser.INTEGER_LITERAL:
+                case WebdaQLParserParser.NUMBER_LITERAL:
                     _localctx = new ValuesAtomContext(_localctx);
                     this.enterOuterAlt(_localctx, 1);
                     {
-                        this.state = 99;
+                        this.state = 125;
                         this.values();
                     }
                     break;
@@ -513,7 +813,7 @@ export class WebdaQLParserParser extends Parser {
                     _localctx = new IdentifierAtomContext(_localctx);
                     this.enterOuterAlt(_localctx, 2);
                     {
-                        this.state = 100;
+                        this.state = 126;
                         this.identifier();
                     }
                     break;
@@ -538,13 +838,13 @@ export class WebdaQLParserParser extends Parser {
     }
     // @RuleVersion(0)
     identifier() {
-        const _localctx = new IdentifierContext(this._ctx, this.state);
+        let _localctx = new IdentifierContext(this._ctx, this.state);
         this.enterRule(_localctx, 16, WebdaQLParserParser.RULE_identifier);
         let _la;
         try {
             this.enterOuterAlt(_localctx, 1);
             {
-                this.state = 103;
+                this.state = 129;
                 _la = this._input.LA(1);
                 if (!(_la === WebdaQLParserParser.IDENTIFIER || _la === WebdaQLParserParser.IDENTIFIER_WITH_NUMBER)) {
                     this._errHandler.recoverInline(this);
@@ -575,13 +875,13 @@ export class WebdaQLParserParser extends Parser {
     }
     // @RuleVersion(0)
     booleanLiteral() {
-        const _localctx = new BooleanLiteralContext(this._ctx, this.state);
+        let _localctx = new BooleanLiteralContext(this._ctx, this.state);
         this.enterRule(_localctx, 18, WebdaQLParserParser.RULE_booleanLiteral);
         let _la;
         try {
             this.enterOuterAlt(_localctx, 1);
             {
-                this.state = 105;
+                this.state = 131;
                 _la = this._input.LA(1);
                 if (!(_la === WebdaQLParserParser.TRUE || _la === WebdaQLParserParser.FALSE)) {
                     this._errHandler.recoverInline(this);
@@ -612,13 +912,13 @@ export class WebdaQLParserParser extends Parser {
     }
     // @RuleVersion(0)
     stringLiteral() {
-        const _localctx = new StringLiteralContext(this._ctx, this.state);
+        let _localctx = new StringLiteralContext(this._ctx, this.state);
         this.enterRule(_localctx, 20, WebdaQLParserParser.RULE_stringLiteral);
         let _la;
         try {
             this.enterOuterAlt(_localctx, 1);
             {
-                this.state = 107;
+                this.state = 133;
                 _la = this._input.LA(1);
                 if (!(_la === WebdaQLParserParser.DQUOTED_STRING_LITERAL || _la === WebdaQLParserParser.SQUOTED_STRING_LITERAL)) {
                     this._errHandler.recoverInline(this);
@@ -649,12 +949,12 @@ export class WebdaQLParserParser extends Parser {
     }
     // @RuleVersion(0)
     integerLiteral() {
-        const _localctx = new IntegerLiteralContext(this._ctx, this.state);
+        let _localctx = new IntegerLiteralContext(this._ctx, this.state);
         this.enterRule(_localctx, 22, WebdaQLParserParser.RULE_integerLiteral);
         try {
             this.enterOuterAlt(_localctx, 1);
             {
-                this.state = 109;
+                this.state = 135;
                 this.match(WebdaQLParserParser.INTEGER_LITERAL);
             }
         }
@@ -674,34 +974,141 @@ export class WebdaQLParserParser extends Parser {
         return _localctx;
     }
     // @RuleVersion(0)
+    numberLiteral() {
+        let _localctx = new NumberLiteralContext(this._ctx, this.state);
+        this.enterRule(_localctx, 24, WebdaQLParserParser.RULE_numberLiteral);
+        try {
+            this.enterOuterAlt(_localctx, 1);
+            {
+                this.state = 137;
+                this.match(WebdaQLParserParser.NUMBER_LITERAL);
+            }
+        }
+        catch (re) {
+            if (re instanceof RecognitionException) {
+                _localctx.exception = re;
+                this._errHandler.reportError(this, re);
+                this._errHandler.recover(this, re);
+            }
+            else {
+                throw re;
+            }
+        }
+        finally {
+            this.exitRule();
+        }
+        return _localctx;
+    }
+    // @RuleVersion(0)
+    parameter() {
+        let _localctx = new ParameterContext(this._ctx, this.state);
+        this.enterRule(_localctx, 26, WebdaQLParserParser.RULE_parameter);
+        let _la;
+        try {
+            this.enterOuterAlt(_localctx, 1);
+            {
+                this.state = 139;
+                _la = this._input.LA(1);
+                if (!(_la === WebdaQLParserParser.POSITIONAL_PARAMETER || _la === WebdaQLParserParser.NAMED_PARAMETER)) {
+                    this._errHandler.recoverInline(this);
+                }
+                else {
+                    if (this._input.LA(1) === Token.EOF) {
+                        this.matchedEOF = true;
+                    }
+                    this._errHandler.reportMatch(this);
+                    this.consume();
+                }
+            }
+        }
+        catch (re) {
+            if (re instanceof RecognitionException) {
+                _localctx.exception = re;
+                this._errHandler.reportError(this, re);
+                this._errHandler.recover(this, re);
+            }
+            else {
+                throw re;
+            }
+        }
+        finally {
+            this.exitRule();
+        }
+        return _localctx;
+    }
+    // @RuleVersion(0)
     setExpression() {
-        const _localctx = new SetExpressionContext(this._ctx, this.state);
-        this.enterRule(_localctx, 24, WebdaQLParserParser.RULE_setExpression);
+        let _localctx = new SetExpressionContext(this._ctx, this.state);
+        this.enterRule(_localctx, 28, WebdaQLParserParser.RULE_setExpression);
         let _la;
         try {
             this.enterOuterAlt(_localctx, 1);
             {
-                this.state = 111;
+                this.state = 141;
                 this.match(WebdaQLParserParser.LR_SQ_BRACKET);
-                this.state = 112;
-                this.values();
-                this.state = 117;
+                this.state = 144;
+                this._errHandler.sync(this);
+                switch (this._input.LA(1)) {
+                    case WebdaQLParserParser.TRUE:
+                    case WebdaQLParserParser.FALSE:
+                    case WebdaQLParserParser.DQUOTED_STRING_LITERAL:
+                    case WebdaQLParserParser.SQUOTED_STRING_LITERAL:
+                    case WebdaQLParserParser.INTEGER_LITERAL:
+                    case WebdaQLParserParser.NUMBER_LITERAL:
+                        {
+                            this.state = 142;
+                            this.values();
+                        }
+                        break;
+                    case WebdaQLParserParser.POSITIONAL_PARAMETER:
+                    case WebdaQLParserParser.NAMED_PARAMETER:
+                        {
+                            this.state = 143;
+                            this.parameter();
+                        }
+                        break;
+                    default:
+                        throw new NoViableAltException(this);
+                }
+                this.state = 153;
                 this._errHandler.sync(this);
                 _la = this._input.LA(1);
                 while (_la === WebdaQLParserParser.COMMA) {
                     {
                         {
-                            this.state = 113;
+                            this.state = 146;
                             this.match(WebdaQLParserParser.COMMA);
-                            this.state = 114;
-                            this.values();
+                            this.state = 149;
+                            this._errHandler.sync(this);
+                            switch (this._input.LA(1)) {
+                                case WebdaQLParserParser.TRUE:
+                                case WebdaQLParserParser.FALSE:
+                                case WebdaQLParserParser.DQUOTED_STRING_LITERAL:
+                                case WebdaQLParserParser.SQUOTED_STRING_LITERAL:
+                                case WebdaQLParserParser.INTEGER_LITERAL:
+                                case WebdaQLParserParser.NUMBER_LITERAL:
+                                    {
+                                        this.state = 147;
+                                        this.values();
+                                    }
+                                    break;
+                                case WebdaQLParserParser.POSITIONAL_PARAMETER:
+                                case WebdaQLParserParser.NAMED_PARAMETER:
+                                    {
+                                        this.state = 148;
+                                        this.parameter();
+                                    }
+                                    break;
+                                default:
+                                    throw new NoViableAltException(this);
+                            }
                         }
                     }
-                    this.state = 119;
+                    this.state = 155;
                     this._errHandler.sync(this);
                     _la = this._input.LA(1);
                 }
-                this.state = 120;
+                this.state = 156;
                 this.match(WebdaQLParserParser.RR_SQ_BRACKET);
             }
         }
@@ -736,6 +1143,75 @@ export class WebdaQLParserParser extends Parser {
         }
         return true;
     }
+    static _serializedATN = "\x03\uC91D\uCABA\u058D\uAFBA\u4F53\u0607\uEA8B\uC241\x03(\xA1\x04\x02" +
+        "\t\x02\x04\x03\t\x03\x04\x04\t\x04\x04\x05\t\x05\x04\x06\t\x06\x04\x07" +
+        "\t\x07\x04\b\t\b\x04\t\t\t\x04\n\t\n\x04\v\t\v\x04\f\t\f\x04\r\t\r\x04" +
+        '\x0E\t\x0E\x04\x0F\t\x0F\x04\x10\t\x10\x03\x02\x05\x02"\n\x02\x03\x02' +
+        "\x05\x02%\n\x02\x03\x02\x05\x02(\n\x02\x03\x02\x05\x02+\n\x02\x03\x02" +
+        "\x03\x02\x03\x03\x03\x03\x03\x03\x05\x032\n\x03\x03\x04\x03\x04\x03\x04" +
+        "\x05\x047\n\x04\x03\x05\x03\x05\x05\x05;\n\x05\x03\x06\x03\x06\x03\x06" +
+        "\x03\x06\x07\x06A\n\x06\f\x06\x0E\x06D\v\x06\x03\x07\x03\x07\x03\x07\x03" +
+        "\x07\x03\x07\x05\x07K\n\x07\x03\x07\x03\x07\x03\x07\x03\x07\x05\x07Q\n" +
+        "\x07\x03\x07\x03\x07\x03\x07\x03\x07\x05\x07W\n\x07\x03\x07\x03\x07\x03" +
+        "\x07\x03\x07\x03\x07\x03\x07\x03\x07\x03\x07\x03\x07\x03\x07\x03\x07\x03" +
+        "\x07\x03\x07\x05\x07f\n\x07\x03\x07\x03\x07\x03\x07\x03\x07\x03\x07\x05" +
+        "\x07m\n\x07\x03\x07\x03\x07\x03\x07\x03\x07\x03\x07\x03\x07\x07\x07u\n" +
+        "\x07\f\x07\x0E\x07x\v\x07\x03\b\x03\b\x03\b\x03\b\x05\b~\n\b\x03\t\x03" +
+        "\t\x05\t\x82\n\t\x03\n\x03\n\x03\v\x03\v\x03\f\x03\f\x03\r\x03\r\x03\x0E" +
+        "\x03\x0E\x03\x0F\x03\x0F\x03\x10\x03\x10\x03\x10\x05\x10\x93\n\x10\x03" +
+        "\x10\x03\x10\x03\x10\x05\x10\x98\n\x10\x07\x10\x9A\n\x10\f\x10\x0E\x10" +
+        "\x9D\v\x10\x03\x10\x03\x10\x03\x10\x02\x02\x03\f\x11\x02\x02\x04\x02\x06" +
+        "\x02\b\x02\n\x02\f\x02\x0E\x02\x10\x02\x12\x02\x14\x02\x16\x02\x18\x02" +
+        "\x1A\x02\x1C\x02\x1E\x02\x02\b\x03\x02\x1E\x1F\x03\x02\r\x12\x03\x02&" +
+        "\'\x03\x02\x19\x1A\x03\x02 !\x03\x02$%\x02\xAD\x02!\x03\x02\x02\x02\x04" +
+        ".\x03\x02\x02\x02\x063\x03\x02\x02\x02\b8\x03\x02\x02\x02\n<\x03\x02\x02" +
+        "\x02\fl\x03\x02\x02\x02\x0E}\x03\x02\x02\x02\x10\x81\x03\x02\x02\x02\x12" +
+        "\x83\x03\x02\x02\x02\x14\x85\x03\x02\x02\x02\x16\x87\x03\x02\x02\x02\x18" +
+        "\x89\x03\x02\x02\x02\x1A\x8B\x03\x02\x02\x02\x1C\x8D\x03\x02\x02\x02\x1E" +
+        '\x8F\x03\x02\x02\x02 "\x05\f\x07\x02! \x03\x02\x02\x02!"\x03\x02\x02' +
+        '\x02"$\x03\x02\x02\x02#%\x05\n\x06\x02$#\x03\x02\x02\x02$%\x03\x02\x02' +
+        "\x02%\'\x03\x02\x02\x02&(\x05\x04\x03\x02\'&\x03\x02\x02\x02\'(\x03\x02" +
+        "\x02\x02(*\x03\x02\x02\x02)+\x05\x06\x04\x02*)\x03\x02\x02\x02*+\x03\x02" +
+        "\x02\x02+,\x03\x02\x02\x02,-\x07\x02\x02\x03-\x03\x03\x02\x02\x02.1\x07" +
+        "\x1B\x02\x02/2\x05\x18\r\x0202\x05\x1C\x0F\x021/\x03\x02\x02\x0210\x03" +
+        "\x02\x02\x022\x05\x03\x02\x02\x0236\x07\x1C\x02\x0247\x05\x16\f\x0257" +
+        "\x05\x1C\x0F\x0264\x03\x02\x02\x0265\x03\x02\x02\x027\x07\x03\x02\x02" +
+        "\x028:\x05\x12\n\x029;\t\x02\x02\x02:9\x03\x02\x02\x02:;\x03\x02\x02\x02" +
+        ";\t\x03\x02\x02\x02<=\x07\x1D\x02\x02=B\x05\b\x05\x02>?\x07\x06\x02\x02" +
+        "?A\x05\b\x05\x02@>\x03\x02\x02\x02AD\x03\x02\x02\x02B@\x03\x02\x02\x02" +
+        "BC\x03\x02\x02\x02C\v\x03\x02\x02\x02DB\x03\x02\x02\x02EF\b\x07\x01\x02" +
+        "FG\x05\x12\n\x02GJ\x07\x13\x02\x02HK\x05\x16\f\x02IK\x05\x1C\x0F\x02J" +
+        "H\x03\x02\x02\x02JI\x03\x02\x02\x02Km\x03\x02\x02\x02LM\x05\x12\n\x02" +
+        "MP\x07\x14\x02\x02NQ\x05\x1E\x10\x02OQ\x05\x1C\x0F\x02PN\x03\x02\x02\x02" +
+        "PO\x03\x02\x02\x02Qm\x03\x02\x02\x02RS\x05\x12\n\x02SV\x07\x15\x02\x02" +
+        "TW\x05\x16\f\x02UW\x05\x1C\x0F\x02VT\x03\x02\x02\x02VU\x03\x02\x02\x02" +
+        "Wm\x03\x02\x02\x02XY\x05\x12\n\x02YZ\x07\x16\x02\x02Z[\x07\x18\x02\x02" +
+        "[m\x03\x02\x02\x02\\]\x05\x12\n\x02]^\x07\x16\x02\x02^_\x07\x17\x02\x02" +
+        "_`\x07\x18\x02\x02`m\x03\x02\x02\x02ab\x05\x12\n\x02be\t\x03\x02\x02c" +
+        "f\x05\x0E\b\x02df\x05\x1C\x0F\x02ec\x03\x02\x02\x02ed\x03\x02\x02\x02" +
+        "fm\x03\x02\x02\x02gh\x07\x04\x02\x02hi\x05\f\x07\x02ij\x07\x05\x02\x02" +
+        "jm\x03\x02\x02\x02km\x05\x10\t\x02lE\x03\x02\x02\x02lL\x03\x02\x02\x02" +
+        "lR\x03\x02\x02\x02lX\x03\x02\x02\x02l\\\x03\x02\x02\x02la\x03\x02\x02" +
+        "\x02lg\x03\x02\x02\x02lk\x03\x02\x02\x02mv\x03\x02\x02\x02no\f\x06\x02" +
+        "\x02op\x07\v\x02\x02pu\x05\f\x07\x07qr\f\x05\x02\x02rs\x07\f\x02\x02s" +
+        "u\x05\f\x07\x06tn\x03\x02\x02\x02tq\x03\x02\x02\x02ux\x03\x02\x02\x02" +
+        "vt\x03\x02\x02\x02vw\x03\x02\x02\x02w\r\x03\x02\x02\x02xv\x03\x02\x02" +
+        "\x02y~\x05\x14\v\x02z~\x05\x18\r\x02{~\x05\x1A\x0E\x02|~\x05\x16\f\x02" +
+        "}y\x03\x02\x02\x02}z\x03\x02\x02\x02}{\x03\x02\x02\x02}|\x03\x02\x02\x02" +
+        "~\x0F\x03\x02\x02\x02\x7F\x82\x05\x0E\b\x02\x80\x82\x05\x12\n\x02\x81" +
+        "\x7F\x03\x02\x02\x02\x81\x80\x03\x02\x02\x02\x82\x11\x03\x02\x02\x02\x83" +
+        "\x84\t\x04\x02\x02\x84\x13\x03\x02\x02\x02\x85\x86\t\x05\x02\x02\x86\x15" +
+        "\x03\x02\x02\x02\x87\x88\t\x06\x02\x02\x88\x17\x03\x02\x02\x02\x89\x8A" +
+        '\x07"\x02\x02\x8A\x19\x03\x02\x02\x02\x8B\x8C\x07#\x02\x02\x8C\x1B\x03' +
+        "\x02\x02\x02\x8D\x8E\t\x07\x02\x02\x8E\x1D\x03\x02\x02\x02\x8F\x92\x07" +
+        "\t\x02\x02\x90\x93\x05\x0E\b\x02\x91\x93\x05\x1C\x0F\x02\x92\x90\x03\x02" +
+        "\x02\x02\x92\x91\x03\x02\x02\x02\x93\x9B\x03\x02\x02\x02\x94\x97\x07\x06" +
+        "\x02\x02\x95\x98\x05\x0E\b\x02\x96\x98\x05\x1C\x0F\x02\x97\x95\x03\x02" +
+        "\x02\x02\x97\x96\x03\x02\x02\x02\x98\x9A\x03\x02\x02\x02\x99\x94\x03\x02" +
+        "\x02\x02\x9A\x9D\x03\x02\x02\x02\x9B\x99\x03\x02\x02\x02\x9B\x9C\x03\x02" +
+        "\x02\x02\x9C\x9E\x03\x02\x02\x02\x9D\x9B\x03\x02\x02\x02\x9E\x9F\x07\n" +
+        "\x02\x02\x9F\x1F\x03\x02\x02\x02\x16!$\'*16:BJPVeltv}\x81\x92\x97\x9B";
+    static __ATN;
     static get _ATN() {
         if (!WebdaQLParserParser.__ATN) {
             WebdaQLParserParser.__ATN = new ATNDeserializer().deserialize(Utils.toCharArray(WebdaQLParserParser._serializedATN));
@@ -743,182 +1219,6 @@ export class WebdaQLParserParser extends Parser {
         return WebdaQLParserParser.__ATN;
     }
 }
-WebdaQLParserParser.SPACE = 1;
-WebdaQLParserParser.LR_BRACKET = 2;
-WebdaQLParserParser.RR_BRACKET = 3;
-WebdaQLParserParser.COMMA = 4;
-WebdaQLParserParser.SINGLE_QUOTE_SYMB = 5;
-WebdaQLParserParser.DOUBLE_QUOTE_SYMB = 6;
-WebdaQLParserParser.LR_SQ_BRACKET = 7;
-WebdaQLParserParser.RR_SQ_BRACKET = 8;
-WebdaQLParserParser.AND = 9;
-WebdaQLParserParser.OR = 10;
-WebdaQLParserParser.EQUAL = 11;
-WebdaQLParserParser.NOT_EQUAL = 12;
-WebdaQLParserParser.GREATER = 13;
-WebdaQLParserParser.GREATER_OR_EQUAL = 14;
-WebdaQLParserParser.LESS = 15;
-WebdaQLParserParser.LESS_OR_EQUAL = 16;
-WebdaQLParserParser.LIKE = 17;
-WebdaQLParserParser.IN = 18;
-WebdaQLParserParser.CONTAINS = 19;
-WebdaQLParserParser.TRUE = 20;
-WebdaQLParserParser.FALSE = 21;
-WebdaQLParserParser.LIMIT = 22;
-WebdaQLParserParser.OFFSET = 23;
-WebdaQLParserParser.ORDER_BY = 24;
-WebdaQLParserParser.ASC = 25;
-WebdaQLParserParser.DESC = 26;
-WebdaQLParserParser.DQUOTED_STRING_LITERAL = 27;
-WebdaQLParserParser.SQUOTED_STRING_LITERAL = 28;
-WebdaQLParserParser.INTEGER_LITERAL = 29;
-WebdaQLParserParser.IDENTIFIER = 30;
-WebdaQLParserParser.IDENTIFIER_WITH_NUMBER = 31;
-WebdaQLParserParser.FUNCTION_IDENTIFIER_WITH_UNDERSCORE = 32;
-WebdaQLParserParser.RULE_webdaql = 0;
-WebdaQLParserParser.RULE_limitExpression = 1;
-WebdaQLParserParser.RULE_offsetExpression = 2;
-WebdaQLParserParser.RULE_orderFieldExpression = 3;
-WebdaQLParserParser.RULE_orderExpression = 4;
-WebdaQLParserParser.RULE_expression = 5;
-WebdaQLParserParser.RULE_values = 6;
-WebdaQLParserParser.RULE_atom = 7;
-WebdaQLParserParser.RULE_identifier = 8;
-WebdaQLParserParser.RULE_booleanLiteral = 9;
-WebdaQLParserParser.RULE_stringLiteral = 10;
-WebdaQLParserParser.RULE_integerLiteral = 11;
-WebdaQLParserParser.RULE_setExpression = 12;
-// tslint:disable:no-trailing-whitespace
-WebdaQLParserParser.ruleNames = [
-    "webdaql",
-    "limitExpression",
-    "offsetExpression",
-    "orderFieldExpression",
-    "orderExpression",
-    "expression",
-    "values",
-    "atom",
-    "identifier",
-    "booleanLiteral",
-    "stringLiteral",
-    "integerLiteral",
-    "setExpression"
-];
-WebdaQLParserParser._LITERAL_NAMES = [
-    undefined,
-    undefined,
-    "'('",
-    "')'",
-    "','",
-    "'''",
-    "'\"'",
-    "'['",
-    "']'",
-    "'AND'",
-    "'OR'",
-    "'='",
-    "'!='",
-    "'>'",
-    "'>='",
-    "'<'",
-    "'<='",
-    "'LIKE'",
-    "'IN'",
-    "'CONTAINS'",
-    "'TRUE'",
-    "'FALSE'",
-    "'LIMIT'",
-    "'OFFSET'",
-    "'ORDER BY'",
-    "'ASC'",
-    "'DESC'"
-];
-WebdaQLParserParser._SYMBOLIC_NAMES = [
-    undefined,
-    "SPACE",
-    "LR_BRACKET",
-    "RR_BRACKET",
-    "COMMA",
-    "SINGLE_QUOTE_SYMB",
-    "DOUBLE_QUOTE_SYMB",
-    "LR_SQ_BRACKET",
-    "RR_SQ_BRACKET",
-    "AND",
-    "OR",
-    "EQUAL",
-    "NOT_EQUAL",
-    "GREATER",
-    "GREATER_OR_EQUAL",
-    "LESS",
-    "LESS_OR_EQUAL",
-    "LIKE",
-    "IN",
-    "CONTAINS",
-    "TRUE",
-    "FALSE",
-    "LIMIT",
-    "OFFSET",
-    "ORDER_BY",
-    "ASC",
-    "DESC",
-    "DQUOTED_STRING_LITERAL",
-    "SQUOTED_STRING_LITERAL",
-    "INTEGER_LITERAL",
-    "IDENTIFIER",
-    "IDENTIFIER_WITH_NUMBER",
-    "FUNCTION_IDENTIFIER_WITH_UNDERSCORE"
-];
-WebdaQLParserParser.VOCABULARY = new VocabularyImpl(WebdaQLParserParser._LITERAL_NAMES, WebdaQLParserParser._SYMBOLIC_NAMES, []);
-WebdaQLParserParser._serializedATN = '\x03\uC91D\uCABA\u058D\uAFBA\u4F53\u0607\uEA8B\uC241\x03"}\x04\x02\t' +
-    "\x02\x04\x03\t\x03\x04\x04\t\x04\x04\x05\t\x05\x04\x06\t\x06\x04\x07\t" +
-    "\x07\x04\b\t\b\x04\t\t\t\x04\n\t\n\x04\v\t\v\x04\f\t\f\x04\r\t\r\x04\x0E" +
-    "\t\x0E\x03\x02\x05\x02\x1E\n\x02\x03\x02\x05\x02!\n\x02\x03\x02\x05\x02" +
-    "$\n\x02\x03\x02\x05\x02'\n\x02\x03\x02\x03\x02\x03\x03\x03\x03\x03\x03" +
-    "\x03\x04\x03\x04\x03\x04\x03\x05\x03\x05\x05\x053\n\x05\x03\x06\x03\x06" +
-    "\x03\x06\x03\x06\x07\x069\n\x06\f\x06\x0E\x06<\v\x06\x03\x07\x03\x07\x03" +
-    "\x07\x03\x07\x03\x07\x03\x07\x03\x07\x03\x07\x03\x07\x03\x07\x03\x07\x03" +
-    "\x07\x03\x07\x03\x07\x03\x07\x03\x07\x03\x07\x03\x07\x03\x07\x03\x07\x03" +
-    "\x07\x03\x07\x05\x07T\n\x07\x03\x07\x03\x07\x03\x07\x03\x07\x03\x07\x03" +
-    "\x07\x07\x07\\\n\x07\f\x07\x0E\x07_\v\x07\x03\b\x03\b\x03\b\x05\bd\n\b" +
-    "\x03\t\x03\t\x05\th\n\t\x03\n\x03\n\x03\v\x03\v\x03\f\x03\f\x03\r\x03" +
-    "\r\x03\x0E\x03\x0E\x03\x0E\x03\x0E\x07\x0Ev\n\x0E\f\x0E\x0E\x0Ey\v\x0E" +
-    "\x03\x0E\x03\x0E\x03\x0E\x02\x02\x03\f\x0F\x02\x02\x04\x02\x06\x02\b\x02" +
-    "\n\x02\f\x02\x0E\x02\x10\x02\x12\x02\x14\x02\x16\x02\x18\x02\x1A\x02\x02" +
-    "\x07\x03\x02\x1B\x1C\x03\x02\r\x12\x03\x02 !\x03\x02\x16\x17\x03\x02\x1D" +
-    "\x1E\x02\x80\x02\x1D\x03\x02\x02\x02\x04*\x03\x02\x02\x02\x06-\x03\x02" +
-    "\x02\x02\b0\x03\x02\x02\x02\n4\x03\x02\x02\x02\fS\x03\x02\x02\x02\x0E" +
-    "c\x03\x02\x02\x02\x10g\x03\x02\x02\x02\x12i\x03\x02\x02\x02\x14k\x03\x02" +
-    "\x02\x02\x16m\x03\x02\x02\x02\x18o\x03\x02\x02\x02\x1Aq\x03\x02\x02\x02" +
-    "\x1C\x1E\x05\f\x07\x02\x1D\x1C\x03\x02\x02\x02\x1D\x1E\x03\x02\x02\x02" +
-    "\x1E \x03\x02\x02\x02\x1F!\x05\n\x06\x02 \x1F\x03\x02\x02\x02 !\x03\x02" +
-    '\x02\x02!#\x03\x02\x02\x02"$\x05\x04\x03\x02#"\x03\x02\x02\x02#$\x03' +
-    "\x02\x02\x02$&\x03\x02\x02\x02%'\x05\x06\x04\x02&%\x03\x02\x02\x02&'" +
-    "\x03\x02\x02\x02'(\x03\x02\x02\x02()\x07\x02\x02\x03)\x03\x03\x02\x02" +
-    "\x02*+\x07\x18\x02\x02+,\x05\x18\r\x02,\x05\x03\x02\x02\x02-.\x07\x19" +
-    "\x02\x02./\x05\x16\f\x02/\x07\x03\x02\x02\x0202\x05\x12\n\x0213\t\x02" +
-    "\x02\x0221\x03\x02\x02\x0223\x03\x02\x02\x023\t\x03\x02\x02\x0245\x07" +
-    "\x1A\x02\x025:\x05\b\x05\x0267\x07\x06\x02\x0279\x05\b\x05\x0286\x03\x02" +
-    "\x02\x029<\x03\x02\x02\x02:8\x03\x02\x02\x02:;\x03\x02\x02\x02;\v\x03" +
-    "\x02\x02\x02<:\x03\x02\x02\x02=>\b\x07\x01\x02>?\x05\x12\n\x02?@\x07\x13" +
-    "\x02\x02@A\x05\x16\f\x02AT\x03\x02\x02\x02BC\x05\x12\n\x02CD\x07\x14\x02" +
-    "\x02DE\x05\x1A\x0E\x02ET\x03\x02\x02\x02FG\x05\x12\n\x02GH\x07\x15\x02" +
-    "\x02HI\x05\x16\f\x02IT\x03\x02\x02\x02JK\x05\x12\n\x02KL\t\x03\x02\x02" +
-    "LM\x05\x0E\b\x02MT\x03\x02\x02\x02NO\x07\x04\x02\x02OP\x05\f\x07\x02P" +
-    "Q\x07\x05\x02\x02QT\x03\x02\x02\x02RT\x05\x10\t\x02S=\x03\x02\x02\x02" +
-    "SB\x03\x02\x02\x02SF\x03\x02\x02\x02SJ\x03\x02\x02\x02SN\x03\x02\x02\x02" +
-    "SR\x03\x02\x02\x02T]\x03\x02\x02\x02UV\f\x06\x02\x02VW\x07\v\x02\x02W" +
-    "\\\x05\f\x07\x07XY\f\x05\x02\x02YZ\x07\f\x02\x02Z\\\x05\f\x07\x06[U\x03" +
-    "\x02\x02\x02[X\x03\x02\x02\x02\\_\x03\x02\x02\x02][\x03\x02\x02\x02]^" +
-    "\x03\x02\x02\x02^\r\x03\x02\x02\x02_]\x03\x02\x02\x02`d\x05\x14\v\x02" +
-    "ad\x05\x18\r\x02bd\x05\x16\f\x02c`\x03\x02\x02\x02ca\x03\x02\x02\x02c" +
-    "b\x03\x02\x02\x02d\x0F\x03\x02\x02\x02eh\x05\x0E\b\x02fh\x05\x12\n\x02" +
-    "ge\x03\x02\x02\x02gf\x03\x02\x02\x02h\x11\x03\x02\x02\x02ij\t\x04\x02" +
-    "\x02j\x13\x03\x02\x02\x02kl\t\x05\x02\x02l\x15\x03\x02\x02\x02mn\t\x06" +
-    "\x02\x02n\x17\x03\x02\x02\x02op\x07\x1F\x02\x02p\x19\x03\x02\x02\x02q" +
-    "r\x07\t\x02\x02rw\x05\x0E\b\x02st\x07\x06\x02\x02tv\x05\x0E\b\x02us\x03" +
-    "\x02\x02\x02vy\x03\x02\x02\x02wu\x03\x02\x02\x02wx\x03\x02\x02\x02xz\x03" +
-    "\x02\x02\x02yw\x03\x02\x02\x02z{\x07\n\x02\x02{\x1B\x03\x02\x02\x02\x0E" +
-    "\x1D #&2:S[]cgw";
 export class WebdaqlContext extends ParserRuleContext {
     EOF() {
         return this.getToken(WebdaQLParserParser.EOF, 0);
@@ -969,7 +1269,10 @@ export class LimitExpressionContext extends ParserRuleContext {
         return this.getToken(WebdaQLParserParser.LIMIT, 0);
     }
     integerLiteral() {
-        return this.getRuleContext(0, IntegerLiteralContext);
+        return this.tryGetRuleContext(0, IntegerLiteralContext);
+    }
+    parameter() {
+        return this.tryGetRuleContext(0, ParameterContext);
     }
     constructor(parent, invokingState) {
         super(parent, invokingState);
@@ -1005,7 +1308,10 @@ export class OffsetExpressionContext extends ParserRuleContext {
         return this.getToken(WebdaQLParserParser.OFFSET, 0);
     }
     stringLiteral() {
-        return this.getRuleContext(0, StringLiteralContext);
+        return this.tryGetRuleContext(0, StringLiteralContext);
+    }
+    parameter() {
+        return this.tryGetRuleContext(0, ParameterContext);
     }
     constructor(parent, invokingState) {
         super(parent, invokingState);
@@ -1144,7 +1450,10 @@ export class LikeExpressionContext extends ExpressionContext {
         return this.getToken(WebdaQLParserParser.LIKE, 0);
     }
     stringLiteral() {
-        return this.getRuleContext(0, StringLiteralContext);
+        return this.tryGetRuleContext(0, StringLiteralContext);
+    }
+    parameter() {
+        return this.tryGetRuleContext(0, ParameterContext);
     }
     constructor(ctx) {
         super(ctx.parent, ctx.invokingState);
@@ -1180,7 +1489,10 @@ export class InExpressionContext extends ExpressionContext {
         return this.getToken(WebdaQLParserParser.IN, 0);
     }
     setExpression() {
-        return this.getRuleContext(0, SetExpressionContext);
+        return this.tryGetRuleContext(0, SetExpressionContext);
+    }
+    parameter() {
+        return this.tryGetRuleContext(0, ParameterContext);
     }
     constructor(ctx) {
         super(ctx.parent, ctx.invokingState);
@@ -1216,7 +1528,10 @@ export class ContainsExpressionContext extends ExpressionContext {
         return this.getToken(WebdaQLParserParser.CONTAINS, 0);
     }
     stringLiteral() {
-        return this.getRuleContext(0, StringLiteralContext);
+        return this.tryGetRuleContext(0, StringLiteralContext);
+    }
+    parameter() {
+        return this.tryGetRuleContext(0, ParameterContext);
     }
     constructor(ctx) {
         super(ctx.parent, ctx.invokingState);
@@ -1244,12 +1559,84 @@ export class ContainsExpressionContext extends ExpressionContext {
         }
     }
 }
-export class BinaryComparisonExpressionContext extends ExpressionContext {
+export class IsNullExpressionContext extends ExpressionContext {
     identifier() {
         return this.getRuleContext(0, IdentifierContext);
     }
-    values() {
-        return this.getRuleContext(0, ValuesContext);
+    IS() {
+        return this.getToken(WebdaQLParserParser.IS, 0);
+    }
+    NULL() {
+        return this.getToken(WebdaQLParserParser.NULL, 0);
+    }
+    constructor(ctx) {
+        super(ctx.parent, ctx.invokingState);
+        this.copyFrom(ctx);
+    }
+    // @Override
+    enterRule(listener) {
+        if (listener.enterIsNullExpression) {
+            listener.enterIsNullExpression(this);
+        }
+    }
+    // @Override
+    exitRule(listener) {
+        if (listener.exitIsNullExpression) {
+            listener.exitIsNullExpression(this);
+        }
+    }
+    // @Override
+    accept(visitor) {
+        if (visitor.visitIsNullExpression) {
+            return visitor.visitIsNullExpression(this);
+        }
+        else {
+            return visitor.visitChildren(this);
+        }
+    }
+}
+export class IsNotNullExpressionContext extends ExpressionContext {
+    identifier() {
+        return this.getRuleContext(0, IdentifierContext);
+    }
+    IS() {
+        return this.getToken(WebdaQLParserParser.IS, 0);
+    }
+    NOT() {
+        return this.getToken(WebdaQLParserParser.NOT, 0);
+    }
+    NULL() {
+        return this.getToken(WebdaQLParserParser.NULL, 0);
+    }
+    constructor(ctx) {
+        super(ctx.parent, ctx.invokingState);
+        this.copyFrom(ctx);
+    }
+    // @Override
+    enterRule(listener) {
+        if (listener.enterIsNotNullExpression) {
+            listener.enterIsNotNullExpression(this);
+        }
+    }
+    // @Override
+    exitRule(listener) {
+        if (listener.exitIsNotNullExpression) {
+            listener.exitIsNotNullExpression(this);
+        }
+    }
+    // @Override
+    accept(visitor) {
+        if (visitor.visitIsNotNullExpression) {
+            return visitor.visitIsNotNullExpression(this);
+        }
+        else {
+            return visitor.visitChildren(this);
+        }
+    }
+}
+export class BinaryComparisonExpressionContext extends ExpressionContext {
+    identifier() {
+        return this.getRuleContext(0, IdentifierContext);
     }
     EQUAL() {
         return this.tryGetToken(WebdaQLParserParser.EQUAL, 0);
@@ -1269,6 +1656,12 @@ export class BinaryComparisonExpressionContext extends ExpressionContext {
     GREATER() {
         return this.tryGetToken(WebdaQLParserParser.GREATER, 0);
     }
+    values() {
+        return this.tryGetRuleContext(0, ValuesContext);
+    }
+    parameter() {
+        return this.tryGetRuleContext(0, ParameterContext);
+    }
     constructor(ctx) {
         super(ctx.parent, ctx.invokingState);
         this.copyFrom(ctx);
@@ -1509,6 +1902,36 @@ export class IntegerAtomContext extends ValuesContext {
         }
     }
 }
+export class NumberAtomContext extends ValuesContext {
+    numberLiteral() {
+        return this.getRuleContext(0, NumberLiteralContext);
+    }
+    constructor(ctx) {
+        super(ctx.parent, ctx.invokingState);
+        this.copyFrom(ctx);
+    }
+    // @Override
+    enterRule(listener) {
+        if (listener.enterNumberAtom) {
+            listener.enterNumberAtom(this);
+        }
+    }
+    // @Override
+    exitRule(listener) {
+        if (listener.exitNumberAtom) {
+            listener.exitNumberAtom(this);
+        }
+    }
+    // @Override
+    accept(visitor) {
+        if (visitor.visitNumberAtom) {
+            return visitor.visitNumberAtom(this);
+        }
+        else {
+            return visitor.visitChildren(this);
+        }
+    }
+}
 export class StringAtomContext extends ValuesContext {
     stringLiteral() {
         return this.getRuleContext(0, StringLiteralContext);
@@ -1752,10 +2175,82 @@ export class IntegerLiteralContext extends ParserRuleContext {
         }
     }
 }
+export class NumberLiteralContext extends ParserRuleContext {
+    NUMBER_LITERAL() {
+        return this.getToken(WebdaQLParserParser.NUMBER_LITERAL, 0);
+    }
+    constructor(parent, invokingState) {
+        super(parent, invokingState);
+    }
+    // @Override
+    get ruleIndex() {
+        return WebdaQLParserParser.RULE_numberLiteral;
+    }
+    // @Override
+    enterRule(listener) {
+        if (listener.enterNumberLiteral) {
+            listener.enterNumberLiteral(this);
+        }
+    }
+    // @Override
+    exitRule(listener) {
+        if (listener.exitNumberLiteral) {
+            listener.exitNumberLiteral(this);
+        }
+    }
+    // @Override
+    accept(visitor) {
+        if (visitor.visitNumberLiteral) {
+            return visitor.visitNumberLiteral(this);
+        }
+        else {
+            return visitor.visitChildren(this);
+        }
+    }
+}
+export class ParameterContext extends ParserRuleContext {
+    POSITIONAL_PARAMETER() {
+        return this.tryGetToken(WebdaQLParserParser.POSITIONAL_PARAMETER, 0);
+    }
+    NAMED_PARAMETER() {
+        return this.tryGetToken(WebdaQLParserParser.NAMED_PARAMETER, 0);
+    }
+    constructor(parent, invokingState) {
+        super(parent, invokingState);
+    }
+    // @Override
+    get ruleIndex() {
+        return WebdaQLParserParser.RULE_parameter;
+    }
+    // @Override
+    enterRule(listener) {
+        if (listener.enterParameter) {
+            listener.enterParameter(this);
+        }
+    }
+    // @Override
+    exitRule(listener) {
+        if (listener.exitParameter) {
+            listener.exitParameter(this);
+        }
+    }
+    // @Override
+    accept(visitor) {
+        if (visitor.visitParameter) {
+            return visitor.visitParameter(this);
+        }
+        else {
+            return visitor.visitChildren(this);
+        }
+    }
+}
 export class SetExpressionContext extends ParserRuleContext {
     LR_SQ_BRACKET() {
         return this.getToken(WebdaQLParserParser.LR_SQ_BRACKET, 0);
     }
+    RR_SQ_BRACKET() {
+        return this.getToken(WebdaQLParserParser.RR_SQ_BRACKET, 0);
+    }
     values(i) {
         if (i === undefined) {
             return this.getRuleContexts(ValuesContext);
@@ -1764,8 +2259,13 @@ export class SetExpressionContext extends ParserRuleContext {
             return this.getRuleContext(i, ValuesContext);
         }
     }
-    RR_SQ_BRACKET() {
-        return this.getToken(WebdaQLParserParser.RR_SQ_BRACKET, 0);
+    parameter(i) {
+        if (i === undefined) {
+            return this.getRuleContexts(ParameterContext);
+        }
+        else {
+            return this.getRuleContext(i, ParameterContext);
+        }
     }
     COMMA(i) {
         if (i === undefined) {