yini-parser 1.4.3 → 1.6.0

package/dist/grammar/generated/YiniParser.js

@@ -1,8 +1,8 @@
 "use strict";
-// Generated from ./grammar/v1.0.0-rc.3/YiniParser.g4 by ANTLR 4.13.2
+// Generated from ./grammar/v1.0.0-rc.6/YiniParser.g4 by ANTLR 4.13.2
 // noinspection ES6UnusedImports,JSUnusedGlobalSymbols,JSUnusedLocalSymbols
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Bad_memberContext = exports.Bad_meta_textContext = exports.Boolean_literalContext = exports.String_concatContext = exports.String_literalContext = exports.Null_literalContext = exports.Number_literalContext = exports.ElementsContext = exports.List_literalContext = exports.Object_memberContext = exports.Object_membersContext = exports.Object_literalContext = exports.ValueContext = exports.Colon_list_declContext = exports.MemberContext = exports.AssignmentContext = exports.EolContext = exports.AnnotationContext = exports.DirectiveContext = exports.Meta_stmtContext = exports.StmtContext = exports.Terminal_stmtContext = exports.PrologContext = exports.YiniContext = void 0;
+exports.Bad_memberContext = exports.Bad_meta_textContext = exports.Boolean_literalContext = exports.Null_literalContext = exports.Number_literalContext = exports.ElementsContext = exports.List_literalContext = exports.Object_member_separatorContext = exports.Object_memberContext = exports.Object_membersContext = exports.Object_literalContext = exports.String_literalContext = exports.Concat_operandContext = exports.Concat_tailContext = exports.Concat_expressionContext = exports.Scalar_valueContext = exports.ValueContext = exports.MemberContext = exports.AssignmentContext = exports.EolContext = exports.AnnotationContext = exports.Yini_mode_declarationContext = exports.Yini_directiveContext = exports.DirectiveContext = exports.Meta_stmtContext = exports.Invalid_section_stmtContext = exports.Disabled_line_stmtContext = exports.Full_line_comment_stmtContext = exports.StmtContext = exports.Terminal_triviaContext = exports.Terminal_stmtContext = exports.PrologContext = exports.YiniContext = void 0;
 const antlr4_1 = require("antlr4");
 class YiniParser extends antlr4_1.Parser {
     get grammarFileName() { return "YiniParser.g4"; }
@@ -25,40 +25,40 @@ class YiniParser extends antlr4_1.Parser {
         try {
             this.enterOuterAlt(localctx, 1);
             {
-                this.state = 49;
+                this.state = 67;
                 this._errHandler.sync(this);
                 switch (this._interp.adaptivePredict(this._input, 0, this._ctx)) {
                     case 1:
                         {
-                            this.state = 48;
+                            this.state = 66;
                             this.prolog();
                         }
                         break;
                 }
-                this.state = 54;
+                this.state = 72;
                 this._errHandler.sync(this);
                 _la = this._input.LA(1);
-                while ((((_la) & ~0x1F) === 0 && ((1 << _la) & 3741485086) !== 0) || ((((_la - 34)) & ~0x1F) === 0 && ((1 << (_la - 34)) & 107137) !== 0)) {
+                while ((((_la) & ~0x1F) === 0 && ((1 << _la) & 2169012188) !== 0) || ((((_la - 34)) & ~0x1F) === 0 && ((1 << (_la - 34)) & 107) !== 0)) {
                     {
                         {
-                            this.state = 51;
+                            this.state = 69;
                             this.stmt();
                         }
                     }
-                    this.state = 56;
+                    this.state = 74;
                     this._errHandler.sync(this);
                     _la = this._input.LA(1);
                 }
-                this.state = 58;
+                this.state = 76;
                 this._errHandler.sync(this);
                 _la = this._input.LA(1);
                 if (_la === 5) {
                     {
-                        this.state = 57;
+                        this.state = 75;
                         this.terminal_stmt();
                     }
                 }
-                this.state = 60;
+                this.state = 78;
                 this.match(YiniParser.EOF);
             }
         }
@@ -83,37 +83,36 @@ class YiniParser extends antlr4_1.Parser {
         this.enterRule(localctx, 2, YiniParser.RULE_prolog);
         try {
             let _alt;
-            this.state = 74;
+            this.state = 92;
             this._errHandler.sync(this);
             switch (this._input.LA(1)) {
-                case 29:
+                case 1:
                     this.enterOuterAlt(localctx, 1);
                     {
-                        this.state = 62;
+                        this.state = 80;
                         this.match(YiniParser.SHEBANG);
-                        this.state = 66;
+                        this.state = 84;
                         this._errHandler.sync(this);
                         _alt = this._interp.adaptivePredict(this._input, 3, this._ctx);
                         while (_alt !== 2 && _alt !== antlr4_1.ATN.INVALID_ALT_NUMBER) {
                             if (_alt === 1) {
                                 {
                                     {
-                                        this.state = 63;
+                                        this.state = 81;
                                         this.eol();
                                     }
                                 }
                             }
-                            this.state = 68;
+                            this.state = 86;
                             this._errHandler.sync(this);
                             _alt = this._interp.adaptivePredict(this._input, 3, this._ctx);
                         }
                     }
                     break;
-                case 41:
-                case 47:
+                case 31:
                     this.enterOuterAlt(localctx, 2);
                     {
-                        this.state = 70;
+                        this.state = 88;
                         this._errHandler.sync(this);
                         _alt = 1;
                         do {
@@ -121,7 +120,7 @@ class YiniParser extends antlr4_1.Parser {
                                 case 1:
                                     {
                                         {
-                                            this.state = 69;
+                                            this.state = 87;
                                             this.eol();
                                         }
                                     }
@@ -129,7 +128,7 @@ class YiniParser extends antlr4_1.Parser {
                                 default:
                                     throw new antlr4_1.NoViableAltException(this);
                             }
-                            this.state = 72;
+                            this.state = 90;
                             this._errHandler.sync(this);
                             _alt = this._interp.adaptivePredict(this._input, 4, this._ctx);
                         } while (_alt !== 2 && _alt !== antlr4_1.ATN.INVALID_ALT_NUMBER);
@@ -162,35 +161,19 @@ class YiniParser extends antlr4_1.Parser {
         try {
             this.enterOuterAlt(localctx, 1);
             {
-                this.state = 76;
+                this.state = 94;
                 this.match(YiniParser.TERMINAL_TOKEN);
-                this.state = 79;
-                this._errHandler.sync(this);
-                switch (this._interp.adaptivePredict(this._input, 6, this._ctx)) {
-                    case 1:
-                        {
-                            this.state = 77;
-                            this.eol();
-                        }
-                        break;
-                    case 2:
-                        {
-                            this.state = 78;
-                            this.match(YiniParser.INLINE_COMMENT);
-                        }
-                        break;
-                }
-                this.state = 84;
+                this.state = 98;
                 this._errHandler.sync(this);
                 _la = this._input.LA(1);
-                while (_la === 41) {
+                while (_la === 31 || _la === 35) {
                     {
                         {
-                            this.state = 81;
-                            this.match(YiniParser.NL);
+                            this.state = 95;
+                            this.terminal_trivia();
                         }
                     }
-                    this.state = 86;
+                    this.state = 100;
                     this._errHandler.sync(this);
                     _la = this._input.LA(1);
                 }
@@ -212,55 +195,213 @@ class YiniParser extends antlr4_1.Parser {
         return localctx;
     }
     // @RuleVersion(0)
+    terminal_trivia() {
+        let localctx = new Terminal_triviaContext(this, this._ctx, this.state);
+        this.enterRule(localctx, 6, YiniParser.RULE_terminal_trivia);
+        try {
+            this.state = 103;
+            this._errHandler.sync(this);
+            switch (this._input.LA(1)) {
+                case 31:
+                    this.enterOuterAlt(localctx, 1);
+                    {
+                        this.state = 101;
+                        this.eol();
+                    }
+                    break;
+                case 35:
+                    this.enterOuterAlt(localctx, 2);
+                    {
+                        this.state = 102;
+                        this.full_line_comment_stmt();
+                    }
+                    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)
     stmt() {
         let localctx = new StmtContext(this, this._ctx, this.state);
-        this.enterRule(localctx, 6, YiniParser.RULE_stmt);
+        this.enterRule(localctx, 8, YiniParser.RULE_stmt);
         try {
-            this.state = 93;
+            this.state = 113;
             this._errHandler.sync(this);
-            switch (this._interp.adaptivePredict(this._input, 8, this._ctx)) {
-                case 1:
+            switch (this._input.LA(1)) {
+                case 31:
                     this.enterOuterAlt(localctx, 1);
                     {
-                        this.state = 87;
+                        this.state = 105;
                         this.eol();
                     }
                     break;
-                case 2:
+                case 35:
                     this.enterOuterAlt(localctx, 2);
                     {
-                        this.state = 88;
-                        this.match(YiniParser.SECTION_HEAD);
+                        this.state = 106;
+                        this.full_line_comment_stmt();
                     }
                     break;
-                case 3:
+                case 34:
                     this.enterOuterAlt(localctx, 3);
                     {
-                        this.state = 89;
-                        this.assignment();
+                        this.state = 107;
+                        this.disabled_line_stmt();
                     }
                     break;
-                case 4:
+                case 6:
                     this.enterOuterAlt(localctx, 4);
                     {
-                        this.state = 90;
-                        this.colon_list_decl();
+                        this.state = 108;
+                        this.match(YiniParser.SECTION_HEAD);
                     }
                     break;
-                case 5:
+                case 7:
                     this.enterOuterAlt(localctx, 5);
                     {
-                        this.state = 91;
-                        this.meta_stmt();
+                        this.state = 109;
+                        this.invalid_section_stmt();
                     }
                     break;
-                case 6:
+                case 37:
                     this.enterOuterAlt(localctx, 6);
                     {
-                        this.state = 92;
+                        this.state = 110;
+                        this.assignment();
+                    }
+                    break;
+                case 2:
+                case 3:
+                case 4:
+                case 40:
+                    this.enterOuterAlt(localctx, 7);
+                    {
+                        this.state = 111;
+                        this.meta_stmt();
+                    }
+                    break;
+                case 8:
+                case 9:
+                case 10:
+                case 11:
+                case 12:
+                case 13:
+                case 14:
+                case 19:
+                case 22:
+                case 24:
+                case 39:
+                    this.enterOuterAlt(localctx, 8);
+                    {
+                        this.state = 112;
                         this.bad_member();
                     }
                     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)
+    full_line_comment_stmt() {
+        let localctx = new Full_line_comment_stmtContext(this, this._ctx, this.state);
+        this.enterRule(localctx, 10, YiniParser.RULE_full_line_comment_stmt);
+        try {
+            this.enterOuterAlt(localctx, 1);
+            {
+                this.state = 115;
+                this.match(YiniParser.FULL_LINE_COMMENT);
+                this.state = 117;
+                this._errHandler.sync(this);
+                switch (this._interp.adaptivePredict(this._input, 9, this._ctx)) {
+                    case 1:
+                        {
+                            this.state = 116;
+                            this.eol();
+                        }
+                        break;
+                }
+            }
+        }
+        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)
+    disabled_line_stmt() {
+        let localctx = new Disabled_line_stmtContext(this, this._ctx, this.state);
+        this.enterRule(localctx, 12, YiniParser.RULE_disabled_line_stmt);
+        try {
+            this.enterOuterAlt(localctx, 1);
+            {
+                this.state = 119;
+                this.match(YiniParser.DISABLED_LINE);
+            }
+        }
+        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)
+    invalid_section_stmt() {
+        let localctx = new Invalid_section_stmtContext(this, this._ctx, this.state);
+        this.enterRule(localctx, 14, YiniParser.RULE_invalid_section_stmt);
+        try {
+            this.enterOuterAlt(localctx, 1);
+            {
+                this.state = 121;
+                this.match(YiniParser.INVALID_SECTION_HEAD);
             }
         }
         catch (re) {
@@ -281,32 +422,32 @@ class YiniParser extends antlr4_1.Parser {
     // @RuleVersion(0)
     meta_stmt() {
         let localctx = new Meta_stmtContext(this, this._ctx, this.state);
-        this.enterRule(localctx, 8, YiniParser.RULE_meta_stmt);
+        this.enterRule(localctx, 16, YiniParser.RULE_meta_stmt);
         try {
-            this.state = 100;
+            this.state = 128;
             this._errHandler.sync(this);
             switch (this._input.LA(1)) {
-                case 1:
                 case 2:
+                case 3:
                     this.enterOuterAlt(localctx, 1);
                     {
-                        this.state = 95;
+                        this.state = 123;
                         this.directive();
                     }
                     break;
-                case 3:
+                case 4:
                     this.enterOuterAlt(localctx, 2);
                     {
-                        this.state = 96;
+                        this.state = 124;
                         this.annotation();
                     }
                     break;
-                case 50:
+                case 40:
                     this.enterOuterAlt(localctx, 3);
                     {
-                        this.state = 97;
+                        this.state = 125;
                         this.bad_meta_text();
-                        this.state = 98;
+                        this.state = 126;
                         this.eol();
                     }
                     break;
@@ -332,50 +473,34 @@ class YiniParser extends antlr4_1.Parser {
     // @RuleVersion(0)
     directive() {
         let localctx = new DirectiveContext(this, this._ctx, this.state);
-        this.enterRule(localctx, 10, YiniParser.RULE_directive);
+        this.enterRule(localctx, 18, YiniParser.RULE_directive);
         let _la;
         try {
-            this.state = 115;
+            this.state = 136;
             this._errHandler.sync(this);
             switch (this._input.LA(1)) {
-                case 1:
+                case 2:
                     this.enterOuterAlt(localctx, 1);
                     {
-                        this.state = 102;
-                        this.match(YiniParser.YINI_TOKEN);
-                        this.state = 103;
-                        this.eol();
+                        this.state = 130;
+                        this.yini_directive();
                     }
                     break;
-                case 2:
+                case 3:
                     this.enterOuterAlt(localctx, 2);
                     {
-                        this.state = 104;
+                        this.state = 131;
                         this.match(YiniParser.INCLUDE_TOKEN);
-                        this.state = 108;
+                        this.state = 133;
                         this._errHandler.sync(this);
                         _la = this._input.LA(1);
-                        while (_la === 43) {
+                        if (_la === 13) {
                             {
-                                {
-                                    this.state = 105;
-                                    this.match(YiniParser.WS);
-                                }
-                            }
-                            this.state = 110;
-                            this._errHandler.sync(this);
-                            _la = this._input.LA(1);
-                        }
-                        this.state = 112;
-                        this._errHandler.sync(this);
-                        _la = this._input.LA(1);
-                        if (_la === 34) {
-                            {
-                                this.state = 111;
+                                this.state = 132;
                                 this.string_literal();
                             }
                         }
-                        this.state = 114;
+                        this.state = 135;
                         this.eol();
                     }
                     break;
@@ -399,15 +524,79 @@ class YiniParser extends antlr4_1.Parser {
         return localctx;
     }
     // @RuleVersion(0)
+    yini_directive() {
+        let localctx = new Yini_directiveContext(this, this._ctx, this.state);
+        this.enterRule(localctx, 20, YiniParser.RULE_yini_directive);
+        let _la;
+        try {
+            this.enterOuterAlt(localctx, 1);
+            {
+                this.state = 138;
+                this.match(YiniParser.YINI_TOKEN);
+                this.state = 140;
+                this._errHandler.sync(this);
+                _la = this._input.LA(1);
+                if (_la === 37) {
+                    {
+                        this.state = 139;
+                        this.yini_mode_declaration();
+                    }
+                }
+                this.state = 142;
+                this.eol();
+            }
+        }
+        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)
+    yini_mode_declaration() {
+        let localctx = new Yini_mode_declarationContext(this, this._ctx, this.state);
+        this.enterRule(localctx, 22, YiniParser.RULE_yini_mode_declaration);
+        try {
+            this.enterOuterAlt(localctx, 1);
+            {
+                this.state = 144;
+                this.match(YiniParser.KEY);
+            }
+        }
+        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)
     annotation() {
         let localctx = new AnnotationContext(this, this._ctx, this.state);
-        this.enterRule(localctx, 12, YiniParser.RULE_annotation);
+        this.enterRule(localctx, 24, YiniParser.RULE_annotation);
         try {
             this.enterOuterAlt(localctx, 1);
             {
-                this.state = 117;
+                this.state = 146;
                 this.match(YiniParser.DEPRECATED_TOKEN);
-                this.state = 118;
+                this.state = 147;
                 this.eol();
             }
         }
@@ -429,22 +618,12 @@ class YiniParser extends antlr4_1.Parser {
     // @RuleVersion(0)
     eol() {
         let localctx = new EolContext(this, this._ctx, this.state);
-        this.enterRule(localctx, 14, YiniParser.RULE_eol);
-        let _la;
+        this.enterRule(localctx, 26, YiniParser.RULE_eol);
         try {
             let _alt;
             this.enterOuterAlt(localctx, 1);
             {
-                this.state = 121;
-                this._errHandler.sync(this);
-                _la = this._input.LA(1);
-                if (_la === 47) {
-                    {
-                        this.state = 120;
-                        this.match(YiniParser.INLINE_COMMENT);
-                    }
-                }
-                this.state = 124;
+                this.state = 150;
                 this._errHandler.sync(this);
                 _alt = 1;
                 do {
@@ -452,7 +631,7 @@ class YiniParser extends antlr4_1.Parser {
                         case 1:
                             {
                                 {
-                                    this.state = 123;
+                                    this.state = 149;
                                     this.match(YiniParser.NL);
                                 }
                             }
@@ -460,7 +639,7 @@ class YiniParser extends antlr4_1.Parser {
                         default:
                             throw new antlr4_1.NoViableAltException(this);
                     }
-                    this.state = 126;
+                    this.state = 152;
                     this._errHandler.sync(this);
                     _alt = this._interp.adaptivePredict(this._input, 14, this._ctx);
                 } while (_alt !== 2 && _alt !== antlr4_1.ATN.INVALID_ALT_NUMBER);
@@ -484,13 +663,13 @@ class YiniParser extends antlr4_1.Parser {
     // @RuleVersion(0)
     assignment() {
         let localctx = new AssignmentContext(this, this._ctx, this.state);
-        this.enterRule(localctx, 16, YiniParser.RULE_assignment);
+        this.enterRule(localctx, 28, YiniParser.RULE_assignment);
         try {
             this.enterOuterAlt(localctx, 1);
             {
-                this.state = 128;
+                this.state = 154;
                 this.member();
-                this.state = 129;
+                this.state = 155;
                 this.eol();
             }
         }
@@ -512,39 +691,21 @@ class YiniParser extends antlr4_1.Parser {
     // @RuleVersion(0)
     member() {
         let localctx = new MemberContext(this, this._ctx, this.state);
-        this.enterRule(localctx, 18, YiniParser.RULE_member);
+        this.enterRule(localctx, 30, YiniParser.RULE_member);
         let _la;
         try {
             this.enterOuterAlt(localctx, 1);
             {
-                this.state = 131;
+                this.state = 157;
                 this.match(YiniParser.KEY);
-                this.state = 133;
-                this._errHandler.sync(this);
-                _la = this._input.LA(1);
-                if (_la === 43) {
-                    {
-                        this.state = 132;
-                        this.match(YiniParser.WS);
-                    }
-                }
-                this.state = 135;
+                this.state = 158;
                 this.match(YiniParser.EQ);
-                this.state = 137;
+                this.state = 160;
                 this._errHandler.sync(this);
                 _la = this._input.LA(1);
-                if (_la === 43) {
+                if ((((_la) & ~0x1F) === 0 && ((1 << _la) & 21004032) !== 0)) {
                     {
-                        this.state = 136;
-                        this.match(YiniParser.WS);
-                    }
-                }
-                this.state = 140;
-                this._errHandler.sync(this);
-                _la = this._input.LA(1);
-                if (((((_la - 15)) & ~0x1F) === 0 && ((1 << (_la - 15)) & 572933) !== 0)) {
-                    {
-                        this.state = 139;
+                        this.state = 159;
                         this.value();
                     }
                 }
@@ -566,127 +727,41 @@ class YiniParser extends antlr4_1.Parser {
         return localctx;
     }
     // @RuleVersion(0)
-    colon_list_decl() {
-        let localctx = new Colon_list_declContext(this, this._ctx, this.state);
-        this.enterRule(localctx, 20, YiniParser.RULE_colon_list_decl);
-        let _la;
+    value() {
+        let localctx = new ValueContext(this, this._ctx, this.state);
+        this.enterRule(localctx, 32, YiniParser.RULE_value);
         try {
-            let _alt;
-            this.enterOuterAlt(localctx, 1);
-            {
-                this.state = 142;
-                this.match(YiniParser.KEY);
-                this.state = 144;
-                this._errHandler.sync(this);
-                _la = this._input.LA(1);
-                if (_la === 43) {
+            this.state = 166;
+            this._errHandler.sync(this);
+            switch (this._interp.adaptivePredict(this._input, 16, this._ctx)) {
+                case 1:
+                    this.enterOuterAlt(localctx, 1);
                     {
-                        this.state = 143;
-                        this.match(YiniParser.WS);
+                        this.state = 162;
+                        this.concat_expression();
                     }
-                }
-                this.state = 146;
-                this.match(YiniParser.COLON);
-                this.state = 155;
-                this._errHandler.sync(this);
-                _la = this._input.LA(1);
-                while (((((_la - 41)) & ~0x1F) === 0 && ((1 << (_la - 41)) & 69) !== 0)) {
+                    break;
+                case 2:
+                    this.enterOuterAlt(localctx, 2);
                     {
-                        this.state = 153;
-                        this._errHandler.sync(this);
-                        switch (this._input.LA(1)) {
-                            case 41:
-                            case 47:
-                                {
-                                    this.state = 147;
-                                    this.eol();
-                                }
-                                break;
-                            case 43:
-                                {
-                                    this.state = 149;
-                                    this._errHandler.sync(this);
-                                    _alt = 1;
-                                    do {
-                                        switch (_alt) {
-                                            case 1:
-                                                {
-                                                    {
-                                                        this.state = 148;
-                                                        this.match(YiniParser.WS);
-                                                    }
-                                                }
-                                                break;
-                                            default:
-                                                throw new antlr4_1.NoViableAltException(this);
-                                        }
-                                        this.state = 151;
-                                        this._errHandler.sync(this);
-                                        _alt = this._interp.adaptivePredict(this._input, 19, this._ctx);
-                                    } while (_alt !== 2 && _alt !== antlr4_1.ATN.INVALID_ALT_NUMBER);
-                                }
-                                break;
-                            default:
-                                throw new antlr4_1.NoViableAltException(this);
-                        }
+                        this.state = 163;
+                        this.scalar_value();
                     }
-                    this.state = 157;
-                    this._errHandler.sync(this);
-                    _la = this._input.LA(1);
-                }
-                this.state = 158;
-                this.elements();
-                this.state = 167;
-                this._errHandler.sync(this);
-                _alt = this._interp.adaptivePredict(this._input, 24, this._ctx);
-                while (_alt !== 2 && _alt !== antlr4_1.ATN.INVALID_ALT_NUMBER) {
-                    if (_alt === 1) {
-                        {
-                            this.state = 165;
-                            this._errHandler.sync(this);
-                            switch (this._input.LA(1)) {
-                                case 41:
-                                case 47:
-                                    {
-                                        this.state = 159;
-                                        this.eol();
-                                    }
-                                    break;
-                                case 43:
-                                    {
-                                        this.state = 161;
-                                        this._errHandler.sync(this);
-                                        _alt = 1;
-                                        do {
-                                            switch (_alt) {
-                                                case 1:
-                                                    {
-                                                        {
-                                                            this.state = 160;
-                                                            this.match(YiniParser.WS);
-                                                        }
-                                                    }
-                                                    break;
-                                                default:
-                                                    throw new antlr4_1.NoViableAltException(this);
-                                            }
-                                            this.state = 163;
-                                            this._errHandler.sync(this);
-                                            _alt = this._interp.adaptivePredict(this._input, 22, this._ctx);
-                                        } while (_alt !== 2 && _alt !== antlr4_1.ATN.INVALID_ALT_NUMBER);
-                                    }
-                                    break;
-                                default:
-                                    throw new antlr4_1.NoViableAltException(this);
-                            }
-                        }
+                    break;
+                case 3:
+                    this.enterOuterAlt(localctx, 3);
+                    {
+                        this.state = 164;
+                        this.list_literal();
                     }
-                    this.state = 169;
-                    this._errHandler.sync(this);
-                    _alt = this._interp.adaptivePredict(this._input, 24, this._ctx);
-                }
-                this.state = 170;
-                this.eol();
+                    break;
+                case 4:
+                    this.enterOuterAlt(localctx, 4);
+                    {
+                        this.state = 165;
+                        this.object_literal();
+                    }
+                    break;
             }
         }
         catch (re) {
@@ -705,60 +780,188 @@ class YiniParser extends antlr4_1.Parser {
         return localctx;
     }
     // @RuleVersion(0)
-    value() {
-        let localctx = new ValueContext(this, this._ctx, this.state);
-        this.enterRule(localctx, 22, YiniParser.RULE_value);
+    scalar_value() {
+        let localctx = new Scalar_valueContext(this, this._ctx, this.state);
+        this.enterRule(localctx, 34, YiniParser.RULE_scalar_value);
         try {
-            this.state = 178;
+            this.state = 172;
             this._errHandler.sync(this);
             switch (this._input.LA(1)) {
-                case 26:
+                case 10:
                     this.enterOuterAlt(localctx, 1);
                     {
-                        this.state = 172;
+                        this.state = 168;
                         this.null_literal();
                     }
                     break;
-                case 34:
+                case 13:
                     this.enterOuterAlt(localctx, 2);
                     {
-                        this.state = 173;
+                        this.state = 169;
                         this.string_literal();
                     }
                     break;
-                case 30:
+                case 14:
                     this.enterOuterAlt(localctx, 3);
                     {
-                        this.state = 174;
+                        this.state = 170;
                         this.number_literal();
                     }
                     break;
-                case 24:
-                case 25:
+                case 8:
+                case 9:
                     this.enterOuterAlt(localctx, 4);
                     {
-                        this.state = 175;
+                        this.state = 171;
                         this.boolean_literal();
                     }
                     break;
-                case 15:
-                case 28:
-                    this.enterOuterAlt(localctx, 5);
+                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)
+    concat_expression() {
+        let localctx = new Concat_expressionContext(this, this._ctx, this.state);
+        this.enterRule(localctx, 36, YiniParser.RULE_concat_expression);
+        let _la;
+        try {
+            this.enterOuterAlt(localctx, 1);
+            {
+                this.state = 174;
+                this.match(YiniParser.STRING);
+                this.state = 176;
+                this._errHandler.sync(this);
+                _la = this._input.LA(1);
+                do {
                     {
-                        this.state = 176;
-                        this.list_literal();
+                        {
+                            this.state = 175;
+                            this.concat_tail();
+                        }
                     }
-                    break;
-                case 17:
-                case 27:
-                    this.enterOuterAlt(localctx, 6);
+                    this.state = 178;
+                    this._errHandler.sync(this);
+                    _la = this._input.LA(1);
+                } while (_la === 26);
+            }
+        }
+        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)
+    concat_tail() {
+        let localctx = new Concat_tailContext(this, this._ctx, this.state);
+        this.enterRule(localctx, 38, YiniParser.RULE_concat_tail);
+        let _la;
+        try {
+            this.enterOuterAlt(localctx, 1);
+            {
+                this.state = 180;
+                this.match(YiniParser.PLUS);
+                this.state = 184;
+                this._errHandler.sync(this);
+                _la = this._input.LA(1);
+                while (_la === 31) {
                     {
-                        this.state = 177;
-                        this.object_literal();
+                        {
+                            this.state = 181;
+                            this.match(YiniParser.NL);
+                        }
                     }
-                    break;
-                default:
-                    throw new antlr4_1.NoViableAltException(this);
+                    this.state = 186;
+                    this._errHandler.sync(this);
+                    _la = this._input.LA(1);
+                }
+                this.state = 187;
+                this.concat_operand();
+            }
+        }
+        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)
+    concat_operand() {
+        let localctx = new Concat_operandContext(this, this._ctx, this.state);
+        this.enterRule(localctx, 40, YiniParser.RULE_concat_operand);
+        let _la;
+        try {
+            this.enterOuterAlt(localctx, 1);
+            {
+                this.state = 189;
+                _la = this._input.LA(1);
+                if (!((((_la) & ~0x1F) === 0 && ((1 << _la) & 26368) !== 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)
+    string_literal() {
+        let localctx = new String_literalContext(this, this._ctx, this.state);
+        this.enterRule(localctx, 42, YiniParser.RULE_string_literal);
+        try {
+            this.enterOuterAlt(localctx, 1);
+            {
+                this.state = 191;
+                this.match(YiniParser.STRING);
             }
         }
         catch (re) {
@@ -779,97 +982,97 @@ class YiniParser extends antlr4_1.Parser {
     // @RuleVersion(0)
     object_literal() {
         let localctx = new Object_literalContext(this, this._ctx, this.state);
-        this.enterRule(localctx, 24, YiniParser.RULE_object_literal);
+        this.enterRule(localctx, 44, YiniParser.RULE_object_literal);
         let _la;
         try {
             let _alt;
-            this.state = 210;
+            this.state = 223;
             this._errHandler.sync(this);
             switch (this._input.LA(1)) {
-                case 17:
+                case 24:
                     this.enterOuterAlt(localctx, 1);
                     {
-                        this.state = 180;
+                        this.state = 193;
                         this.match(YiniParser.OC);
-                        this.state = 184;
+                        this.state = 197;
                         this._errHandler.sync(this);
-                        _alt = this._interp.adaptivePredict(this._input, 26, this._ctx);
+                        _alt = this._interp.adaptivePredict(this._input, 20, this._ctx);
                         while (_alt !== 2 && _alt !== antlr4_1.ATN.INVALID_ALT_NUMBER) {
                             if (_alt === 1) {
                                 {
                                     {
-                                        this.state = 181;
+                                        this.state = 194;
                                         this.match(YiniParser.NL);
                                     }
                                 }
                             }
-                            this.state = 186;
+                            this.state = 199;
                             this._errHandler.sync(this);
-                            _alt = this._interp.adaptivePredict(this._input, 26, this._ctx);
+                            _alt = this._interp.adaptivePredict(this._input, 20, this._ctx);
                         }
-                        this.state = 188;
+                        this.state = 201;
                         this._errHandler.sync(this);
                         _la = this._input.LA(1);
-                        if (_la === 31) {
+                        if (_la === 37) {
                             {
-                                this.state = 187;
+                                this.state = 200;
                                 this.object_members();
                             }
                         }
-                        this.state = 193;
+                        this.state = 206;
                         this._errHandler.sync(this);
                         _la = this._input.LA(1);
-                        while (_la === 41) {
+                        while (_la === 31) {
                             {
                                 {
-                                    this.state = 190;
+                                    this.state = 203;
                                     this.match(YiniParser.NL);
                                 }
                             }
-                            this.state = 195;
+                            this.state = 208;
                             this._errHandler.sync(this);
                             _la = this._input.LA(1);
                         }
-                        this.state = 196;
+                        this.state = 209;
                         this.match(YiniParser.CC);
-                        this.state = 200;
+                        this.state = 213;
                         this._errHandler.sync(this);
-                        _alt = this._interp.adaptivePredict(this._input, 29, this._ctx);
+                        _alt = this._interp.adaptivePredict(this._input, 23, this._ctx);
                         while (_alt !== 2 && _alt !== antlr4_1.ATN.INVALID_ALT_NUMBER) {
                             if (_alt === 1) {
                                 {
                                     {
-                                        this.state = 197;
+                                        this.state = 210;
                                         this.match(YiniParser.NL);
                                     }
                                 }
                             }
-                            this.state = 202;
+                            this.state = 215;
                             this._errHandler.sync(this);
-                            _alt = this._interp.adaptivePredict(this._input, 29, this._ctx);
+                            _alt = this._interp.adaptivePredict(this._input, 23, this._ctx);
                         }
                     }
                     break;
-                case 27:
+                case 11:
                     this.enterOuterAlt(localctx, 2);
                     {
-                        this.state = 203;
+                        this.state = 216;
                         this.match(YiniParser.EMPTY_OBJECT);
-                        this.state = 207;
+                        this.state = 220;
                         this._errHandler.sync(this);
-                        _alt = this._interp.adaptivePredict(this._input, 30, this._ctx);
+                        _alt = this._interp.adaptivePredict(this._input, 24, this._ctx);
                         while (_alt !== 2 && _alt !== antlr4_1.ATN.INVALID_ALT_NUMBER) {
                             if (_alt === 1) {
                                 {
                                     {
-                                        this.state = 204;
+                                        this.state = 217;
                                         this.match(YiniParser.NL);
                                     }
                                 }
                             }
-                            this.state = 209;
+                            this.state = 222;
                             this._errHandler.sync(this);
-                            _alt = this._interp.adaptivePredict(this._input, 30, this._ctx);
+                            _alt = this._interp.adaptivePredict(this._input, 24, this._ctx);
                         }
                     }
                     break;
@@ -895,52 +1098,52 @@ class YiniParser extends antlr4_1.Parser {
     // @RuleVersion(0)
     object_members() {
         let localctx = new Object_membersContext(this, this._ctx, this.state);
-        this.enterRule(localctx, 26, YiniParser.RULE_object_members);
+        this.enterRule(localctx, 46, YiniParser.RULE_object_members);
         let _la;
         try {
             let _alt;
             this.enterOuterAlt(localctx, 1);
             {
-                this.state = 212;
+                this.state = 225;
                 this.object_member();
-                this.state = 223;
+                this.state = 236;
                 this._errHandler.sync(this);
-                _alt = this._interp.adaptivePredict(this._input, 33, this._ctx);
+                _alt = this._interp.adaptivePredict(this._input, 27, this._ctx);
                 while (_alt !== 2 && _alt !== antlr4_1.ATN.INVALID_ALT_NUMBER) {
                     if (_alt === 1) {
                         {
                             {
-                                this.state = 213;
+                                this.state = 226;
                                 this.match(YiniParser.COMMA);
-                                this.state = 217;
+                                this.state = 230;
                                 this._errHandler.sync(this);
                                 _la = this._input.LA(1);
-                                while (_la === 41) {
+                                while (_la === 31) {
                                     {
                                         {
-                                            this.state = 214;
+                                            this.state = 227;
                                             this.match(YiniParser.NL);
                                         }
                                     }
-                                    this.state = 219;
+                                    this.state = 232;
                                     this._errHandler.sync(this);
                                     _la = this._input.LA(1);
                                 }
-                                this.state = 220;
+                                this.state = 233;
                                 this.object_member();
                             }
                         }
                     }
-                    this.state = 225;
+                    this.state = 238;
                     this._errHandler.sync(this);
-                    _alt = this._interp.adaptivePredict(this._input, 33, this._ctx);
+                    _alt = this._interp.adaptivePredict(this._input, 27, this._ctx);
                 }
-                this.state = 227;
+                this.state = 240;
                 this._errHandler.sync(this);
                 _la = this._input.LA(1);
-                if (_la === 13) {
+                if (_la === 20) {
                     {
-                        this.state = 226;
+                        this.state = 239;
                         this.match(YiniParser.COMMA);
                     }
                 }
@@ -964,40 +1167,50 @@ class YiniParser extends antlr4_1.Parser {
     // @RuleVersion(0)
     object_member() {
         let localctx = new Object_memberContext(this, this._ctx, this.state);
-        this.enterRule(localctx, 28, YiniParser.RULE_object_member);
-        let _la;
+        this.enterRule(localctx, 48, YiniParser.RULE_object_member);
         try {
             this.enterOuterAlt(localctx, 1);
             {
-                this.state = 229;
+                this.state = 242;
                 this.match(YiniParser.KEY);
-                this.state = 231;
-                this._errHandler.sync(this);
+                this.state = 243;
+                this.object_member_separator();
+                this.state = 244;
+                this.value();
+            }
+        }
+        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)
+    object_member_separator() {
+        let localctx = new Object_member_separatorContext(this, this._ctx, this.state);
+        this.enterRule(localctx, 50, YiniParser.RULE_object_member_separator);
+        let _la;
+        try {
+            this.enterOuterAlt(localctx, 1);
+            {
+                this.state = 246;
                 _la = this._input.LA(1);
-                if (_la === 43) {
-                    {
-                        this.state = 230;
-                        this.match(YiniParser.WS);
-                    }
+                if (!(_la === 19 || _la === 21)) {
+                    this._errHandler.recoverInline(this);
                 }
-                this.state = 233;
-                this.match(YiniParser.COLON);
-                this.state = 237;
-                this._errHandler.sync(this);
-                _la = this._input.LA(1);
-                while (_la === 41) {
-                    {
-                        {
-                            this.state = 234;
-                            this.match(YiniParser.NL);
-                        }
-                    }
-                    this.state = 239;
-                    this._errHandler.sync(this);
-                    _la = this._input.LA(1);
+                else {
+                    this._errHandler.reportMatch(this);
+                    this.consume();
                 }
-                this.state = 240;
-                this.value();
             }
         }
         catch (re) {
@@ -1018,97 +1231,97 @@ class YiniParser extends antlr4_1.Parser {
     // @RuleVersion(0)
     list_literal() {
         let localctx = new List_literalContext(this, this._ctx, this.state);
-        this.enterRule(localctx, 30, YiniParser.RULE_list_literal);
+        this.enterRule(localctx, 52, YiniParser.RULE_list_literal);
         let _la;
         try {
             let _alt;
-            this.state = 272;
+            this.state = 278;
             this._errHandler.sync(this);
             switch (this._input.LA(1)) {
-                case 15:
+                case 22:
                     this.enterOuterAlt(localctx, 1);
                     {
-                        this.state = 242;
+                        this.state = 248;
                         this.match(YiniParser.OB);
-                        this.state = 246;
+                        this.state = 252;
                         this._errHandler.sync(this);
-                        _alt = this._interp.adaptivePredict(this._input, 37, this._ctx);
+                        _alt = this._interp.adaptivePredict(this._input, 29, this._ctx);
                         while (_alt !== 2 && _alt !== antlr4_1.ATN.INVALID_ALT_NUMBER) {
                             if (_alt === 1) {
                                 {
                                     {
-                                        this.state = 243;
+                                        this.state = 249;
                                         this.match(YiniParser.NL);
                                     }
                                 }
                             }
-                            this.state = 248;
+                            this.state = 254;
                             this._errHandler.sync(this);
-                            _alt = this._interp.adaptivePredict(this._input, 37, this._ctx);
+                            _alt = this._interp.adaptivePredict(this._input, 29, this._ctx);
                         }
-                        this.state = 250;
+                        this.state = 256;
                         this._errHandler.sync(this);
                         _la = this._input.LA(1);
-                        if (((((_la - 15)) & ~0x1F) === 0 && ((1 << (_la - 15)) & 572933) !== 0)) {
+                        if ((((_la) & ~0x1F) === 0 && ((1 << _la) & 21004032) !== 0)) {
                             {
-                                this.state = 249;
+                                this.state = 255;
                                 this.elements();
                             }
                         }
-                        this.state = 255;
+                        this.state = 261;
                         this._errHandler.sync(this);
                         _la = this._input.LA(1);
-                        while (_la === 41) {
+                        while (_la === 31) {
                             {
                                 {
-                                    this.state = 252;
+                                    this.state = 258;
                                     this.match(YiniParser.NL);
                                 }
                             }
-                            this.state = 257;
+                            this.state = 263;
                             this._errHandler.sync(this);
                             _la = this._input.LA(1);
                         }
-                        this.state = 258;
+                        this.state = 264;
                         this.match(YiniParser.CB);
-                        this.state = 262;
+                        this.state = 268;
                         this._errHandler.sync(this);
-                        _alt = this._interp.adaptivePredict(this._input, 40, this._ctx);
+                        _alt = this._interp.adaptivePredict(this._input, 32, this._ctx);
                         while (_alt !== 2 && _alt !== antlr4_1.ATN.INVALID_ALT_NUMBER) {
                             if (_alt === 1) {
                                 {
                                     {
-                                        this.state = 259;
+                                        this.state = 265;
                                         this.match(YiniParser.NL);
                                     }
                                 }
                             }
-                            this.state = 264;
+                            this.state = 270;
                             this._errHandler.sync(this);
-                            _alt = this._interp.adaptivePredict(this._input, 40, this._ctx);
+                            _alt = this._interp.adaptivePredict(this._input, 32, this._ctx);
                         }
                     }
                     break;
-                case 28:
+                case 12:
                     this.enterOuterAlt(localctx, 2);
                     {
-                        this.state = 265;
+                        this.state = 271;
                         this.match(YiniParser.EMPTY_LIST);
-                        this.state = 269;
+                        this.state = 275;
                         this._errHandler.sync(this);
-                        _alt = this._interp.adaptivePredict(this._input, 41, this._ctx);
+                        _alt = this._interp.adaptivePredict(this._input, 33, this._ctx);
                         while (_alt !== 2 && _alt !== antlr4_1.ATN.INVALID_ALT_NUMBER) {
                             if (_alt === 1) {
                                 {
                                     {
-                                        this.state = 266;
+                                        this.state = 272;
                                         this.match(YiniParser.NL);
                                     }
                                 }
                             }
-                            this.state = 271;
+                            this.state = 277;
                             this._errHandler.sync(this);
-                            _alt = this._interp.adaptivePredict(this._input, 41, this._ctx);
+                            _alt = this._interp.adaptivePredict(this._input, 33, this._ctx);
                         }
                     }
                     break;
@@ -1134,66 +1347,66 @@ class YiniParser extends antlr4_1.Parser {
     // @RuleVersion(0)
     elements() {
         let localctx = new ElementsContext(this, this._ctx, this.state);
-        this.enterRule(localctx, 32, YiniParser.RULE_elements);
+        this.enterRule(localctx, 54, YiniParser.RULE_elements);
         let _la;
         try {
             let _alt;
             this.enterOuterAlt(localctx, 1);
             {
-                this.state = 274;
+                this.state = 280;
                 this.value();
-                this.state = 291;
+                this.state = 297;
                 this._errHandler.sync(this);
-                _alt = this._interp.adaptivePredict(this._input, 45, this._ctx);
+                _alt = this._interp.adaptivePredict(this._input, 37, this._ctx);
                 while (_alt !== 2 && _alt !== antlr4_1.ATN.INVALID_ALT_NUMBER) {
                     if (_alt === 1) {
                         {
                             {
-                                this.state = 278;
+                                this.state = 284;
                                 this._errHandler.sync(this);
                                 _la = this._input.LA(1);
-                                while (_la === 41) {
+                                while (_la === 31) {
                                     {
                                         {
-                                            this.state = 275;
+                                            this.state = 281;
                                             this.match(YiniParser.NL);
                                         }
                                     }
-                                    this.state = 280;
+                                    this.state = 286;
                                     this._errHandler.sync(this);
                                     _la = this._input.LA(1);
                                 }
-                                this.state = 281;
+                                this.state = 287;
                                 this.match(YiniParser.COMMA);
-                                this.state = 285;
+                                this.state = 291;
                                 this._errHandler.sync(this);
                                 _la = this._input.LA(1);
-                                while (_la === 41) {
+                                while (_la === 31) {
                                     {
                                         {
-                                            this.state = 282;
+                                            this.state = 288;
                                             this.match(YiniParser.NL);
                                         }
                                     }
-                                    this.state = 287;
+                                    this.state = 293;
                                     this._errHandler.sync(this);
                                     _la = this._input.LA(1);
                                 }
-                                this.state = 288;
+                                this.state = 294;
                                 this.value();
                             }
                         }
                     }
-                    this.state = 293;
+                    this.state = 299;
                     this._errHandler.sync(this);
-                    _alt = this._interp.adaptivePredict(this._input, 45, this._ctx);
+                    _alt = this._interp.adaptivePredict(this._input, 37, this._ctx);
                 }
-                this.state = 295;
+                this.state = 301;
                 this._errHandler.sync(this);
                 _la = this._input.LA(1);
-                if (_la === 13) {
+                if (_la === 20) {
                     {
-                        this.state = 294;
+                        this.state = 300;
                         this.match(YiniParser.COMMA);
                     }
                 }
@@ -1217,11 +1430,11 @@ class YiniParser extends antlr4_1.Parser {
     // @RuleVersion(0)
     number_literal() {
         let localctx = new Number_literalContext(this, this._ctx, this.state);
-        this.enterRule(localctx, 34, YiniParser.RULE_number_literal);
+        this.enterRule(localctx, 56, YiniParser.RULE_number_literal);
         try {
             this.enterOuterAlt(localctx, 1);
             {
-                this.state = 297;
+                this.state = 303;
                 this.match(YiniParser.NUMBER);
             }
         }
@@ -1243,112 +1456,12 @@ class YiniParser extends antlr4_1.Parser {
     // @RuleVersion(0)
     null_literal() {
         let localctx = new Null_literalContext(this, this._ctx, this.state);
-        this.enterRule(localctx, 36, YiniParser.RULE_null_literal);
-        try {
-            this.enterOuterAlt(localctx, 1);
-            {
-                this.state = 299;
-                this.match(YiniParser.NULL);
-            }
-        }
-        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)
-    string_literal() {
-        let localctx = new String_literalContext(this, this._ctx, this.state);
-        this.enterRule(localctx, 38, YiniParser.RULE_string_literal);
+        this.enterRule(localctx, 58, YiniParser.RULE_null_literal);
         try {
-            let _alt;
             this.enterOuterAlt(localctx, 1);
             {
-                this.state = 301;
-                this.match(YiniParser.STRING);
                 this.state = 305;
-                this._errHandler.sync(this);
-                _alt = this._interp.adaptivePredict(this._input, 47, this._ctx);
-                while (_alt !== 2 && _alt !== antlr4_1.ATN.INVALID_ALT_NUMBER) {
-                    if (_alt === 1) {
-                        {
-                            {
-                                this.state = 302;
-                                this.string_concat();
-                            }
-                        }
-                    }
-                    this.state = 307;
-                    this._errHandler.sync(this);
-                    _alt = this._interp.adaptivePredict(this._input, 47, this._ctx);
-                }
-            }
-        }
-        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)
-    string_concat() {
-        let localctx = new String_concatContext(this, this._ctx, this.state);
-        this.enterRule(localctx, 40, YiniParser.RULE_string_concat);
-        let _la;
-        try {
-            this.enterOuterAlt(localctx, 1);
-            {
-                this.state = 311;
-                this._errHandler.sync(this);
-                _la = this._input.LA(1);
-                while (_la === 41) {
-                    {
-                        {
-                            this.state = 308;
-                            this.match(YiniParser.NL);
-                        }
-                    }
-                    this.state = 313;
-                    this._errHandler.sync(this);
-                    _la = this._input.LA(1);
-                }
-                this.state = 314;
-                this.match(YiniParser.PLUS);
-                this.state = 318;
-                this._errHandler.sync(this);
-                _la = this._input.LA(1);
-                while (_la === 41) {
-                    {
-                        {
-                            this.state = 315;
-                            this.match(YiniParser.NL);
-                        }
-                    }
-                    this.state = 320;
-                    this._errHandler.sync(this);
-                    _la = this._input.LA(1);
-                }
-                this.state = 321;
-                this.match(YiniParser.STRING);
+                this.match(YiniParser.NULL);
             }
         }
         catch (re) {
@@ -1369,14 +1482,14 @@ class YiniParser extends antlr4_1.Parser {
     // @RuleVersion(0)
     boolean_literal() {
         let localctx = new Boolean_literalContext(this, this._ctx, this.state);
-        this.enterRule(localctx, 42, YiniParser.RULE_boolean_literal);
+        this.enterRule(localctx, 60, YiniParser.RULE_boolean_literal);
         let _la;
         try {
             this.enterOuterAlt(localctx, 1);
             {
-                this.state = 323;
+                this.state = 307;
                 _la = this._input.LA(1);
-                if (!(_la === 24 || _la === 25)) {
+                if (!(_la === 8 || _la === 9)) {
                     this._errHandler.recoverInline(this);
                 }
                 else {
@@ -1403,11 +1516,11 @@ class YiniParser extends antlr4_1.Parser {
     // @RuleVersion(0)
     bad_meta_text() {
         let localctx = new Bad_meta_textContext(this, this._ctx, this.state);
-        this.enterRule(localctx, 44, YiniParser.RULE_bad_meta_text);
+        this.enterRule(localctx, 62, YiniParser.RULE_bad_meta_text);
         try {
             this.enterOuterAlt(localctx, 1);
             {
-                this.state = 325;
+                this.state = 309;
                 this.match(YiniParser.META_INVALID);
             }
         }
@@ -1429,93 +1542,72 @@ class YiniParser extends antlr4_1.Parser {
     // @RuleVersion(0)
     bad_member() {
         let localctx = new Bad_memberContext(this, this._ctx, this.state);
-        this.enterRule(localctx, 46, YiniParser.RULE_bad_member);
-        let _la;
+        this.enterRule(localctx, 64, YiniParser.RULE_bad_member);
         try {
             this.enterOuterAlt(localctx, 1);
             {
-                this.state = 328;
-                this._errHandler.sync(this);
-                switch (this._interp.adaptivePredict(this._input, 50, this._ctx)) {
-                    case 1:
-                        {
-                            this.state = 327;
-                            this.match(YiniParser.WS);
-                        }
-                        break;
-                }
-                this.state = 332;
+                this.state = 313;
                 this._errHandler.sync(this);
                 switch (this._input.LA(1)) {
-                    case 49:
+                    case 39:
                         {
-                            this.state = 330;
+                            this.state = 311;
                             this.match(YiniParser.REST);
                         }
                         break;
-                    case 15:
-                    case 17:
+                    case 8:
+                    case 9:
+                    case 10:
+                    case 11:
+                    case 12:
+                    case 13:
+                    case 14:
+                    case 22:
                     case 24:
-                    case 25:
-                    case 26:
-                    case 27:
-                    case 28:
-                    case 30:
-                    case 34:
                         {
-                            this.state = 331;
+                            this.state = 312;
                             this.value();
                         }
                         break;
-                    case 11:
-                    case 43:
+                    case 19:
                         break;
                     default:
                         break;
                 }
-                this.state = 335;
-                this._errHandler.sync(this);
-                _la = this._input.LA(1);
-                if (_la === 43) {
-                    {
-                        this.state = 334;
-                        this.match(YiniParser.WS);
-                    }
-                }
-                this.state = 337;
+                this.state = 315;
                 this.match(YiniParser.EQ);
-                this.state = 340;
+                this.state = 318;
                 this._errHandler.sync(this);
                 switch (this._input.LA(1)) {
-                    case 15:
-                    case 17:
+                    case 8:
+                    case 9:
+                    case 10:
+                    case 11:
+                    case 12:
+                    case 13:
+                    case 14:
+                    case 22:
                     case 24:
-                    case 25:
-                    case 26:
-                    case 27:
-                    case 28:
-                    case 30:
-                    case 34:
                         {
-                            this.state = 338;
+                            this.state = 316;
                             this.value();
                         }
                         break;
-                    case 49:
+                    case 39:
                         {
-                            this.state = 339;
+                            this.state = 317;
                             this.match(YiniParser.REST);
                         }
                         break;
                     default:
                         throw new antlr4_1.NoViableAltException(this);
                 }
-                this.state = 343;
+                this.state = 321;
                 this._errHandler.sync(this);
-                switch (this._interp.adaptivePredict(this._input, 54, this._ctx)) {
+                switch (this._interp.adaptivePredict(this._input, 41, this._ctx)) {
                     case 1:
                         {
-                            this.state = 342;
+                            this.state = 320;
                             this.eol();
                         }
                         break;
@@ -1544,257 +1636,241 @@ class YiniParser extends antlr4_1.Parser {
         return YiniParser.__ATN;
     }
 }
-YiniParser.YINI_TOKEN = 1;
-YiniParser.INCLUDE_TOKEN = 2;
-YiniParser.DEPRECATED_TOKEN = 3;
-YiniParser.SECTION_HEAD = 4;
+YiniParser.SHEBANG = 1;
+YiniParser.YINI_TOKEN = 2;
+YiniParser.INCLUDE_TOKEN = 3;
+YiniParser.DEPRECATED_TOKEN = 4;
 YiniParser.TERMINAL_TOKEN = 5;
-YiniParser.SS = 6;
-YiniParser.EUR = 7;
-YiniParser.CARET = 8;
-YiniParser.GT = 9;
-YiniParser.LT = 10;
-YiniParser.EQ = 11;
-YiniParser.HASH = 12;
-YiniParser.COMMA = 13;
-YiniParser.COLON = 14;
-YiniParser.OB = 15;
-YiniParser.CB = 16;
-YiniParser.OC = 17;
-YiniParser.CC = 18;
-YiniParser.PLUS = 19;
-YiniParser.DOLLAR = 20;
-YiniParser.PC = 21;
-YiniParser.AT = 22;
-YiniParser.SEMICOLON = 23;
-YiniParser.BOOLEAN_FALSE = 24;
-YiniParser.BOOLEAN_TRUE = 25;
-YiniParser.NULL = 26;
-YiniParser.EMPTY_OBJECT = 27;
-YiniParser.EMPTY_LIST = 28;
-YiniParser.SHEBANG = 29;
-YiniParser.NUMBER = 30;
-YiniParser.KEY = 31;
-YiniParser.IDENT = 32;
-YiniParser.IDENT_BACKTICKED = 33;
-YiniParser.STRING = 34;
-YiniParser.TRIPLE_QUOTED_STRING = 35;
-YiniParser.SINGLE_OR_DOUBLE = 36;
-YiniParser.R_AND_C_STRING = 37;
-YiniParser.HYPER_STRING = 38;
-YiniParser.ESC_SEQ = 39;
-YiniParser.ESC_SEQ_BASE = 40;
-YiniParser.NL = 41;
-YiniParser.SINGLE_NL = 42;
-YiniParser.WS = 43;
-YiniParser.BLOCK_COMMENT = 44;
-YiniParser.COMMENT = 45;
-YiniParser.LINE_COMMENT = 46;
-YiniParser.INLINE_COMMENT = 47;
-YiniParser.IDENT_INVALID = 48;
-YiniParser.REST = 49;
-YiniParser.META_INVALID = 50;
+YiniParser.SECTION_HEAD = 6;
+YiniParser.INVALID_SECTION_HEAD = 7;
+YiniParser.BOOLEAN_FALSE = 8;
+YiniParser.BOOLEAN_TRUE = 9;
+YiniParser.NULL = 10;
+YiniParser.EMPTY_OBJECT = 11;
+YiniParser.EMPTY_LIST = 12;
+YiniParser.STRING = 13;
+YiniParser.NUMBER = 14;
+YiniParser.CARET = 15;
+YiniParser.SS = 16;
+YiniParser.GT = 17;
+YiniParser.LT = 18;
+YiniParser.EQ = 19;
+YiniParser.COMMA = 20;
+YiniParser.COLON = 21;
+YiniParser.OB = 22;
+YiniParser.CB = 23;
+YiniParser.OC = 24;
+YiniParser.CC = 25;
+YiniParser.PLUS = 26;
+YiniParser.DOLLAR = 27;
+YiniParser.PC = 28;
+YiniParser.AT = 29;
+YiniParser.SEMICOLON = 30;
+YiniParser.NL = 31;
+YiniParser.WS = 32;
+YiniParser.BLOCK_COMMENT = 33;
+YiniParser.DISABLED_LINE = 34;
+YiniParser.FULL_LINE_COMMENT = 35;
+YiniParser.INLINE_COMMENT = 36;
+YiniParser.KEY = 37;
+YiniParser.IDENT_INVALID = 38;
+YiniParser.REST = 39;
+YiniParser.META_INVALID = 40;
 YiniParser.EOF = antlr4_1.Token.EOF;
 YiniParser.RULE_yini = 0;
 YiniParser.RULE_prolog = 1;
 YiniParser.RULE_terminal_stmt = 2;
-YiniParser.RULE_stmt = 3;
-YiniParser.RULE_meta_stmt = 4;
-YiniParser.RULE_directive = 5;
-YiniParser.RULE_annotation = 6;
-YiniParser.RULE_eol = 7;
-YiniParser.RULE_assignment = 8;
-YiniParser.RULE_member = 9;
-YiniParser.RULE_colon_list_decl = 10;
-YiniParser.RULE_value = 11;
-YiniParser.RULE_object_literal = 12;
-YiniParser.RULE_object_members = 13;
-YiniParser.RULE_object_member = 14;
-YiniParser.RULE_list_literal = 15;
-YiniParser.RULE_elements = 16;
-YiniParser.RULE_number_literal = 17;
-YiniParser.RULE_null_literal = 18;
-YiniParser.RULE_string_literal = 19;
-YiniParser.RULE_string_concat = 20;
-YiniParser.RULE_boolean_literal = 21;
-YiniParser.RULE_bad_meta_text = 22;
-YiniParser.RULE_bad_member = 23;
+YiniParser.RULE_terminal_trivia = 3;
+YiniParser.RULE_stmt = 4;
+YiniParser.RULE_full_line_comment_stmt = 5;
+YiniParser.RULE_disabled_line_stmt = 6;
+YiniParser.RULE_invalid_section_stmt = 7;
+YiniParser.RULE_meta_stmt = 8;
+YiniParser.RULE_directive = 9;
+YiniParser.RULE_yini_directive = 10;
+YiniParser.RULE_yini_mode_declaration = 11;
+YiniParser.RULE_annotation = 12;
+YiniParser.RULE_eol = 13;
+YiniParser.RULE_assignment = 14;
+YiniParser.RULE_member = 15;
+YiniParser.RULE_value = 16;
+YiniParser.RULE_scalar_value = 17;
+YiniParser.RULE_concat_expression = 18;
+YiniParser.RULE_concat_tail = 19;
+YiniParser.RULE_concat_operand = 20;
+YiniParser.RULE_string_literal = 21;
+YiniParser.RULE_object_literal = 22;
+YiniParser.RULE_object_members = 23;
+YiniParser.RULE_object_member = 24;
+YiniParser.RULE_object_member_separator = 25;
+YiniParser.RULE_list_literal = 26;
+YiniParser.RULE_elements = 27;
+YiniParser.RULE_number_literal = 28;
+YiniParser.RULE_null_literal = 29;
+YiniParser.RULE_boolean_literal = 30;
+YiniParser.RULE_bad_meta_text = 31;
+YiniParser.RULE_bad_member = 32;
 YiniParser.literalNames = [null, null,
     null, null,
     null, null,
+    null, null,
+    null, null,
+    null, "'{}'",
+    "'[]'", null,
+    null, "'^'",
     "'\\u00A7'",
-    "'\\u20AC'",
-    "'^'", "'>'",
-    "'<'", "'='",
-    "'#'", "','",
+    "'>'", "'<'",
+    "'='", "','",
     "':'", "'['",
     "']'", "'{'",
     "'}'", "'+'",
     "'$'", "'%'",
-    "'@'", "';'",
-    null, null,
-    null, "'{}'",
-    "'[]'"];
-YiniParser.symbolicNames = [null, "YINI_TOKEN",
+    "'@'", "';'"];
+YiniParser.symbolicNames = [null, "SHEBANG",
+    "YINI_TOKEN",
     "INCLUDE_TOKEN",
     "DEPRECATED_TOKEN",
-    "SECTION_HEAD",
     "TERMINAL_TOKEN",
-    "SS", "EUR",
-    "CARET", "GT",
-    "LT", "EQ",
-    "HASH", "COMMA",
+    "SECTION_HEAD",
+    "INVALID_SECTION_HEAD",
+    "BOOLEAN_FALSE",
+    "BOOLEAN_TRUE",
+    "NULL", "EMPTY_OBJECT",
+    "EMPTY_LIST",
+    "STRING", "NUMBER",
+    "CARET", "SS",
+    "GT", "LT",
+    "EQ", "COMMA",
     "COLON", "OB",
     "CB", "OC",
     "CC", "PLUS",
     "DOLLAR", "PC",
     "AT", "SEMICOLON",
-    "BOOLEAN_FALSE",
-    "BOOLEAN_TRUE",
-    "NULL", "EMPTY_OBJECT",
-    "EMPTY_LIST",
-    "SHEBANG",
-    "NUMBER", "KEY",
-    "IDENT", "IDENT_BACKTICKED",
-    "STRING", "TRIPLE_QUOTED_STRING",
-    "SINGLE_OR_DOUBLE",
-    "R_AND_C_STRING",
-    "HYPER_STRING",
-    "ESC_SEQ",
-    "ESC_SEQ_BASE",
-    "NL", "SINGLE_NL",
-    "WS", "BLOCK_COMMENT",
-    "COMMENT",
-    "LINE_COMMENT",
+    "NL", "WS",
+    "BLOCK_COMMENT",
+    "DISABLED_LINE",
+    "FULL_LINE_COMMENT",
     "INLINE_COMMENT",
-    "IDENT_INVALID",
+    "KEY", "IDENT_INVALID",
     "REST", "META_INVALID"];
 // tslint:disable:no-trailing-whitespace
 YiniParser.ruleNames = [
-    "yini", "prolog", "terminal_stmt", "stmt", "meta_stmt", "directive", "annotation",
-    "eol", "assignment", "member", "colon_list_decl", "value", "object_literal",
-    "object_members", "object_member", "list_literal", "elements", "number_literal",
-    "null_literal", "string_literal", "string_concat", "boolean_literal",
-    "bad_meta_text", "bad_member",
+    "yini", "prolog", "terminal_stmt", "terminal_trivia", "stmt", "full_line_comment_stmt",
+    "disabled_line_stmt", "invalid_section_stmt", "meta_stmt", "directive",
+    "yini_directive", "yini_mode_declaration", "annotation", "eol", "assignment",
+    "member", "value", "scalar_value", "concat_expression", "concat_tail",
+    "concat_operand", "string_literal", "object_literal", "object_members",
+    "object_member", "object_member_separator", "list_literal", "elements",
+    "number_literal", "null_literal", "boolean_literal", "bad_meta_text",
+    "bad_member",
 ];
-YiniParser._serializedATN = [4, 1, 50, 346, 2, 0, 7, 0, 2,
+YiniParser._serializedATN = [4, 1, 40, 324, 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, 2, 22, 7, 22, 2, 23, 7, 23, 1, 0, 3,
-    0, 50, 8, 0, 1, 0, 5, 0, 53, 8, 0, 10, 0, 12, 0, 56, 9, 0, 1, 0, 3, 0, 59, 8, 0, 1, 0, 1, 0, 1, 1, 1, 1,
-    5, 1, 65, 8, 1, 10, 1, 12, 1, 68, 9, 1, 1, 1, 4, 1, 71, 8, 1, 11, 1, 12, 1, 72, 3, 1, 75, 8, 1, 1, 2,
-    1, 2, 1, 2, 3, 2, 80, 8, 2, 1, 2, 5, 2, 83, 8, 2, 10, 2, 12, 2, 86, 9, 2, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3,
-    1, 3, 3, 3, 94, 8, 3, 1, 4, 1, 4, 1, 4, 1, 4, 1, 4, 3, 4, 101, 8, 4, 1, 5, 1, 5, 1, 5, 1, 5, 5, 5, 107,
-    8, 5, 10, 5, 12, 5, 110, 9, 5, 1, 5, 3, 5, 113, 8, 5, 1, 5, 3, 5, 116, 8, 5, 1, 6, 1, 6, 1, 6, 1, 7, 3,
-    7, 122, 8, 7, 1, 7, 4, 7, 125, 8, 7, 11, 7, 12, 7, 126, 1, 8, 1, 8, 1, 8, 1, 9, 1, 9, 3, 9, 134, 8, 9,
-    1, 9, 1, 9, 3, 9, 138, 8, 9, 1, 9, 3, 9, 141, 8, 9, 1, 10, 1, 10, 3, 10, 145, 8, 10, 1, 10, 1, 10, 1,
-    10, 4, 10, 150, 8, 10, 11, 10, 12, 10, 151, 5, 10, 154, 8, 10, 10, 10, 12, 10, 157, 9, 10, 1, 10,
-    1, 10, 1, 10, 4, 10, 162, 8, 10, 11, 10, 12, 10, 163, 5, 10, 166, 8, 10, 10, 10, 12, 10, 169, 9,
-    10, 1, 10, 1, 10, 1, 11, 1, 11, 1, 11, 1, 11, 1, 11, 1, 11, 3, 11, 179, 8, 11, 1, 12, 1, 12, 5, 12,
-    183, 8, 12, 10, 12, 12, 12, 186, 9, 12, 1, 12, 3, 12, 189, 8, 12, 1, 12, 5, 12, 192, 8, 12, 10,
-    12, 12, 12, 195, 9, 12, 1, 12, 1, 12, 5, 12, 199, 8, 12, 10, 12, 12, 12, 202, 9, 12, 1, 12, 1, 12,
-    5, 12, 206, 8, 12, 10, 12, 12, 12, 209, 9, 12, 3, 12, 211, 8, 12, 1, 13, 1, 13, 1, 13, 5, 13, 216,
-    8, 13, 10, 13, 12, 13, 219, 9, 13, 1, 13, 5, 13, 222, 8, 13, 10, 13, 12, 13, 225, 9, 13, 1, 13,
-    3, 13, 228, 8, 13, 1, 14, 1, 14, 3, 14, 232, 8, 14, 1, 14, 1, 14, 5, 14, 236, 8, 14, 10, 14, 12,
-    14, 239, 9, 14, 1, 14, 1, 14, 1, 15, 1, 15, 5, 15, 245, 8, 15, 10, 15, 12, 15, 248, 9, 15, 1, 15,
-    3, 15, 251, 8, 15, 1, 15, 5, 15, 254, 8, 15, 10, 15, 12, 15, 257, 9, 15, 1, 15, 1, 15, 5, 15, 261,
-    8, 15, 10, 15, 12, 15, 264, 9, 15, 1, 15, 1, 15, 5, 15, 268, 8, 15, 10, 15, 12, 15, 271, 9, 15,
-    3, 15, 273, 8, 15, 1, 16, 1, 16, 5, 16, 277, 8, 16, 10, 16, 12, 16, 280, 9, 16, 1, 16, 1, 16, 5,
-    16, 284, 8, 16, 10, 16, 12, 16, 287, 9, 16, 1, 16, 5, 16, 290, 8, 16, 10, 16, 12, 16, 293, 9, 16,
-    1, 16, 3, 16, 296, 8, 16, 1, 17, 1, 17, 1, 18, 1, 18, 1, 19, 1, 19, 5, 19, 304, 8, 19, 10, 19, 12,
-    19, 307, 9, 19, 1, 20, 5, 20, 310, 8, 20, 10, 20, 12, 20, 313, 9, 20, 1, 20, 1, 20, 5, 20, 317,
-    8, 20, 10, 20, 12, 20, 320, 9, 20, 1, 20, 1, 20, 1, 21, 1, 21, 1, 22, 1, 22, 1, 23, 3, 23, 329, 8,
-    23, 1, 23, 1, 23, 3, 23, 333, 8, 23, 1, 23, 3, 23, 336, 8, 23, 1, 23, 1, 23, 1, 23, 3, 23, 341, 8,
-    23, 1, 23, 3, 23, 344, 8, 23, 1, 23, 0, 0, 24, 0, 2, 4, 6, 8, 10, 12, 14, 16, 18, 20, 22, 24, 26,
-    28, 30, 32, 34, 36, 38, 40, 42, 44, 46, 0, 1, 1, 0, 24, 25, 387, 0, 49, 1, 0, 0, 0, 2, 74, 1, 0, 0,
-    0, 4, 76, 1, 0, 0, 0, 6, 93, 1, 0, 0, 0, 8, 100, 1, 0, 0, 0, 10, 115, 1, 0, 0, 0, 12, 117, 1, 0, 0, 0,
-    14, 121, 1, 0, 0, 0, 16, 128, 1, 0, 0, 0, 18, 131, 1, 0, 0, 0, 20, 142, 1, 0, 0, 0, 22, 178, 1, 0,
-    0, 0, 24, 210, 1, 0, 0, 0, 26, 212, 1, 0, 0, 0, 28, 229, 1, 0, 0, 0, 30, 272, 1, 0, 0, 0, 32, 274,
-    1, 0, 0, 0, 34, 297, 1, 0, 0, 0, 36, 299, 1, 0, 0, 0, 38, 301, 1, 0, 0, 0, 40, 311, 1, 0, 0, 0, 42,
-    323, 1, 0, 0, 0, 44, 325, 1, 0, 0, 0, 46, 328, 1, 0, 0, 0, 48, 50, 3, 2, 1, 0, 49, 48, 1, 0, 0, 0, 49,
-    50, 1, 0, 0, 0, 50, 54, 1, 0, 0, 0, 51, 53, 3, 6, 3, 0, 52, 51, 1, 0, 0, 0, 53, 56, 1, 0, 0, 0, 54, 52,
-    1, 0, 0, 0, 54, 55, 1, 0, 0, 0, 55, 58, 1, 0, 0, 0, 56, 54, 1, 0, 0, 0, 57, 59, 3, 4, 2, 0, 58, 57, 1,
-    0, 0, 0, 58, 59, 1, 0, 0, 0, 59, 60, 1, 0, 0, 0, 60, 61, 5, 0, 0, 1, 61, 1, 1, 0, 0, 0, 62, 66, 5, 29,
-    0, 0, 63, 65, 3, 14, 7, 0, 64, 63, 1, 0, 0, 0, 65, 68, 1, 0, 0, 0, 66, 64, 1, 0, 0, 0, 66, 67, 1, 0,
-    0, 0, 67, 75, 1, 0, 0, 0, 68, 66, 1, 0, 0, 0, 69, 71, 3, 14, 7, 0, 70, 69, 1, 0, 0, 0, 71, 72, 1, 0,
-    0, 0, 72, 70, 1, 0, 0, 0, 72, 73, 1, 0, 0, 0, 73, 75, 1, 0, 0, 0, 74, 62, 1, 0, 0, 0, 74, 70, 1, 0, 0,
-    0, 75, 3, 1, 0, 0, 0, 76, 79, 5, 5, 0, 0, 77, 80, 3, 14, 7, 0, 78, 80, 5, 47, 0, 0, 79, 77, 1, 0, 0,
-    0, 79, 78, 1, 0, 0, 0, 79, 80, 1, 0, 0, 0, 80, 84, 1, 0, 0, 0, 81, 83, 5, 41, 0, 0, 82, 81, 1, 0, 0,
-    0, 83, 86, 1, 0, 0, 0, 84, 82, 1, 0, 0, 0, 84, 85, 1, 0, 0, 0, 85, 5, 1, 0, 0, 0, 86, 84, 1, 0, 0, 0,
-    87, 94, 3, 14, 7, 0, 88, 94, 5, 4, 0, 0, 89, 94, 3, 16, 8, 0, 90, 94, 3, 20, 10, 0, 91, 94, 3, 8, 4,
-    0, 92, 94, 3, 46, 23, 0, 93, 87, 1, 0, 0, 0, 93, 88, 1, 0, 0, 0, 93, 89, 1, 0, 0, 0, 93, 90, 1, 0, 0,
-    0, 93, 91, 1, 0, 0, 0, 93, 92, 1, 0, 0, 0, 94, 7, 1, 0, 0, 0, 95, 101, 3, 10, 5, 0, 96, 101, 3, 12,
-    6, 0, 97, 98, 3, 44, 22, 0, 98, 99, 3, 14, 7, 0, 99, 101, 1, 0, 0, 0, 100, 95, 1, 0, 0, 0, 100, 96,
-    1, 0, 0, 0, 100, 97, 1, 0, 0, 0, 101, 9, 1, 0, 0, 0, 102, 103, 5, 1, 0, 0, 103, 116, 3, 14, 7, 0, 104,
-    108, 5, 2, 0, 0, 105, 107, 5, 43, 0, 0, 106, 105, 1, 0, 0, 0, 107, 110, 1, 0, 0, 0, 108, 106, 1,
-    0, 0, 0, 108, 109, 1, 0, 0, 0, 109, 112, 1, 0, 0, 0, 110, 108, 1, 0, 0, 0, 111, 113, 3, 38, 19, 0,
-    112, 111, 1, 0, 0, 0, 112, 113, 1, 0, 0, 0, 113, 114, 1, 0, 0, 0, 114, 116, 3, 14, 7, 0, 115, 102,
-    1, 0, 0, 0, 115, 104, 1, 0, 0, 0, 116, 11, 1, 0, 0, 0, 117, 118, 5, 3, 0, 0, 118, 119, 3, 14, 7, 0,
-    119, 13, 1, 0, 0, 0, 120, 122, 5, 47, 0, 0, 121, 120, 1, 0, 0, 0, 121, 122, 1, 0, 0, 0, 122, 124,
-    1, 0, 0, 0, 123, 125, 5, 41, 0, 0, 124, 123, 1, 0, 0, 0, 125, 126, 1, 0, 0, 0, 126, 124, 1, 0, 0,
-    0, 126, 127, 1, 0, 0, 0, 127, 15, 1, 0, 0, 0, 128, 129, 3, 18, 9, 0, 129, 130, 3, 14, 7, 0, 130,
-    17, 1, 0, 0, 0, 131, 133, 5, 31, 0, 0, 132, 134, 5, 43, 0, 0, 133, 132, 1, 0, 0, 0, 133, 134, 1,
-    0, 0, 0, 134, 135, 1, 0, 0, 0, 135, 137, 5, 11, 0, 0, 136, 138, 5, 43, 0, 0, 137, 136, 1, 0, 0, 0,
-    137, 138, 1, 0, 0, 0, 138, 140, 1, 0, 0, 0, 139, 141, 3, 22, 11, 0, 140, 139, 1, 0, 0, 0, 140, 141,
-    1, 0, 0, 0, 141, 19, 1, 0, 0, 0, 142, 144, 5, 31, 0, 0, 143, 145, 5, 43, 0, 0, 144, 143, 1, 0, 0,
-    0, 144, 145, 1, 0, 0, 0, 145, 146, 1, 0, 0, 0, 146, 155, 5, 14, 0, 0, 147, 154, 3, 14, 7, 0, 148,
-    150, 5, 43, 0, 0, 149, 148, 1, 0, 0, 0, 150, 151, 1, 0, 0, 0, 151, 149, 1, 0, 0, 0, 151, 152, 1,
-    0, 0, 0, 152, 154, 1, 0, 0, 0, 153, 147, 1, 0, 0, 0, 153, 149, 1, 0, 0, 0, 154, 157, 1, 0, 0, 0, 155,
-    153, 1, 0, 0, 0, 155, 156, 1, 0, 0, 0, 156, 158, 1, 0, 0, 0, 157, 155, 1, 0, 0, 0, 158, 167, 3, 32,
-    16, 0, 159, 166, 3, 14, 7, 0, 160, 162, 5, 43, 0, 0, 161, 160, 1, 0, 0, 0, 162, 163, 1, 0, 0, 0,
-    163, 161, 1, 0, 0, 0, 163, 164, 1, 0, 0, 0, 164, 166, 1, 0, 0, 0, 165, 159, 1, 0, 0, 0, 165, 161,
-    1, 0, 0, 0, 166, 169, 1, 0, 0, 0, 167, 165, 1, 0, 0, 0, 167, 168, 1, 0, 0, 0, 168, 170, 1, 0, 0, 0,
-    169, 167, 1, 0, 0, 0, 170, 171, 3, 14, 7, 0, 171, 21, 1, 0, 0, 0, 172, 179, 3, 36, 18, 0, 173, 179,
-    3, 38, 19, 0, 174, 179, 3, 34, 17, 0, 175, 179, 3, 42, 21, 0, 176, 179, 3, 30, 15, 0, 177, 179,
-    3, 24, 12, 0, 178, 172, 1, 0, 0, 0, 178, 173, 1, 0, 0, 0, 178, 174, 1, 0, 0, 0, 178, 175, 1, 0, 0,
-    0, 178, 176, 1, 0, 0, 0, 178, 177, 1, 0, 0, 0, 179, 23, 1, 0, 0, 0, 180, 184, 5, 17, 0, 0, 181, 183,
-    5, 41, 0, 0, 182, 181, 1, 0, 0, 0, 183, 186, 1, 0, 0, 0, 184, 182, 1, 0, 0, 0, 184, 185, 1, 0, 0,
-    0, 185, 188, 1, 0, 0, 0, 186, 184, 1, 0, 0, 0, 187, 189, 3, 26, 13, 0, 188, 187, 1, 0, 0, 0, 188,
-    189, 1, 0, 0, 0, 189, 193, 1, 0, 0, 0, 190, 192, 5, 41, 0, 0, 191, 190, 1, 0, 0, 0, 192, 195, 1,
-    0, 0, 0, 193, 191, 1, 0, 0, 0, 193, 194, 1, 0, 0, 0, 194, 196, 1, 0, 0, 0, 195, 193, 1, 0, 0, 0, 196,
-    200, 5, 18, 0, 0, 197, 199, 5, 41, 0, 0, 198, 197, 1, 0, 0, 0, 199, 202, 1, 0, 0, 0, 200, 198, 1,
-    0, 0, 0, 200, 201, 1, 0, 0, 0, 201, 211, 1, 0, 0, 0, 202, 200, 1, 0, 0, 0, 203, 207, 5, 27, 0, 0,
-    204, 206, 5, 41, 0, 0, 205, 204, 1, 0, 0, 0, 206, 209, 1, 0, 0, 0, 207, 205, 1, 0, 0, 0, 207, 208,
-    1, 0, 0, 0, 208, 211, 1, 0, 0, 0, 209, 207, 1, 0, 0, 0, 210, 180, 1, 0, 0, 0, 210, 203, 1, 0, 0, 0,
-    211, 25, 1, 0, 0, 0, 212, 223, 3, 28, 14, 0, 213, 217, 5, 13, 0, 0, 214, 216, 5, 41, 0, 0, 215,
-    214, 1, 0, 0, 0, 216, 219, 1, 0, 0, 0, 217, 215, 1, 0, 0, 0, 217, 218, 1, 0, 0, 0, 218, 220, 1, 0,
-    0, 0, 219, 217, 1, 0, 0, 0, 220, 222, 3, 28, 14, 0, 221, 213, 1, 0, 0, 0, 222, 225, 1, 0, 0, 0, 223,
-    221, 1, 0, 0, 0, 223, 224, 1, 0, 0, 0, 224, 227, 1, 0, 0, 0, 225, 223, 1, 0, 0, 0, 226, 228, 5, 13,
-    0, 0, 227, 226, 1, 0, 0, 0, 227, 228, 1, 0, 0, 0, 228, 27, 1, 0, 0, 0, 229, 231, 5, 31, 0, 0, 230,
-    232, 5, 43, 0, 0, 231, 230, 1, 0, 0, 0, 231, 232, 1, 0, 0, 0, 232, 233, 1, 0, 0, 0, 233, 237, 5,
-    14, 0, 0, 234, 236, 5, 41, 0, 0, 235, 234, 1, 0, 0, 0, 236, 239, 1, 0, 0, 0, 237, 235, 1, 0, 0, 0,
-    237, 238, 1, 0, 0, 0, 238, 240, 1, 0, 0, 0, 239, 237, 1, 0, 0, 0, 240, 241, 3, 22, 11, 0, 241, 29,
-    1, 0, 0, 0, 242, 246, 5, 15, 0, 0, 243, 245, 5, 41, 0, 0, 244, 243, 1, 0, 0, 0, 245, 248, 1, 0, 0,
-    0, 246, 244, 1, 0, 0, 0, 246, 247, 1, 0, 0, 0, 247, 250, 1, 0, 0, 0, 248, 246, 1, 0, 0, 0, 249, 251,
-    3, 32, 16, 0, 250, 249, 1, 0, 0, 0, 250, 251, 1, 0, 0, 0, 251, 255, 1, 0, 0, 0, 252, 254, 5, 41,
-    0, 0, 253, 252, 1, 0, 0, 0, 254, 257, 1, 0, 0, 0, 255, 253, 1, 0, 0, 0, 255, 256, 1, 0, 0, 0, 256,
-    258, 1, 0, 0, 0, 257, 255, 1, 0, 0, 0, 258, 262, 5, 16, 0, 0, 259, 261, 5, 41, 0, 0, 260, 259, 1,
-    0, 0, 0, 261, 264, 1, 0, 0, 0, 262, 260, 1, 0, 0, 0, 262, 263, 1, 0, 0, 0, 263, 273, 1, 0, 0, 0, 264,
-    262, 1, 0, 0, 0, 265, 269, 5, 28, 0, 0, 266, 268, 5, 41, 0, 0, 267, 266, 1, 0, 0, 0, 268, 271, 1,
-    0, 0, 0, 269, 267, 1, 0, 0, 0, 269, 270, 1, 0, 0, 0, 270, 273, 1, 0, 0, 0, 271, 269, 1, 0, 0, 0, 272,
-    242, 1, 0, 0, 0, 272, 265, 1, 0, 0, 0, 273, 31, 1, 0, 0, 0, 274, 291, 3, 22, 11, 0, 275, 277, 5,
-    41, 0, 0, 276, 275, 1, 0, 0, 0, 277, 280, 1, 0, 0, 0, 278, 276, 1, 0, 0, 0, 278, 279, 1, 0, 0, 0,
-    279, 281, 1, 0, 0, 0, 280, 278, 1, 0, 0, 0, 281, 285, 5, 13, 0, 0, 282, 284, 5, 41, 0, 0, 283, 282,
-    1, 0, 0, 0, 284, 287, 1, 0, 0, 0, 285, 283, 1, 0, 0, 0, 285, 286, 1, 0, 0, 0, 286, 288, 1, 0, 0, 0,
-    287, 285, 1, 0, 0, 0, 288, 290, 3, 22, 11, 0, 289, 278, 1, 0, 0, 0, 290, 293, 1, 0, 0, 0, 291, 289,
-    1, 0, 0, 0, 291, 292, 1, 0, 0, 0, 292, 295, 1, 0, 0, 0, 293, 291, 1, 0, 0, 0, 294, 296, 5, 13, 0,
-    0, 295, 294, 1, 0, 0, 0, 295, 296, 1, 0, 0, 0, 296, 33, 1, 0, 0, 0, 297, 298, 5, 30, 0, 0, 298, 35,
-    1, 0, 0, 0, 299, 300, 5, 26, 0, 0, 300, 37, 1, 0, 0, 0, 301, 305, 5, 34, 0, 0, 302, 304, 3, 40, 20,
-    0, 303, 302, 1, 0, 0, 0, 304, 307, 1, 0, 0, 0, 305, 303, 1, 0, 0, 0, 305, 306, 1, 0, 0, 0, 306, 39,
-    1, 0, 0, 0, 307, 305, 1, 0, 0, 0, 308, 310, 5, 41, 0, 0, 309, 308, 1, 0, 0, 0, 310, 313, 1, 0, 0,
-    0, 311, 309, 1, 0, 0, 0, 311, 312, 1, 0, 0, 0, 312, 314, 1, 0, 0, 0, 313, 311, 1, 0, 0, 0, 314, 318,
-    5, 19, 0, 0, 315, 317, 5, 41, 0, 0, 316, 315, 1, 0, 0, 0, 317, 320, 1, 0, 0, 0, 318, 316, 1, 0, 0,
-    0, 318, 319, 1, 0, 0, 0, 319, 321, 1, 0, 0, 0, 320, 318, 1, 0, 0, 0, 321, 322, 5, 34, 0, 0, 322,
-    41, 1, 0, 0, 0, 323, 324, 7, 0, 0, 0, 324, 43, 1, 0, 0, 0, 325, 326, 5, 50, 0, 0, 326, 45, 1, 0, 0,
-    0, 327, 329, 5, 43, 0, 0, 328, 327, 1, 0, 0, 0, 328, 329, 1, 0, 0, 0, 329, 332, 1, 0, 0, 0, 330,
-    333, 5, 49, 0, 0, 331, 333, 3, 22, 11, 0, 332, 330, 1, 0, 0, 0, 332, 331, 1, 0, 0, 0, 332, 333,
-    1, 0, 0, 0, 333, 335, 1, 0, 0, 0, 334, 336, 5, 43, 0, 0, 335, 334, 1, 0, 0, 0, 335, 336, 1, 0, 0,
-    0, 336, 337, 1, 0, 0, 0, 337, 340, 5, 11, 0, 0, 338, 341, 3, 22, 11, 0, 339, 341, 5, 49, 0, 0, 340,
-    338, 1, 0, 0, 0, 340, 339, 1, 0, 0, 0, 341, 343, 1, 0, 0, 0, 342, 344, 3, 14, 7, 0, 343, 342, 1,
-    0, 0, 0, 343, 344, 1, 0, 0, 0, 344, 47, 1, 0, 0, 0, 55, 49, 54, 58, 66, 72, 74, 79, 84, 93, 100,
-    108, 112, 115, 121, 126, 133, 137, 140, 144, 151, 153, 155, 163, 165, 167, 178, 184, 188,
-    193, 200, 207, 210, 217, 223, 227, 231, 237, 246, 250, 255, 262, 269, 272, 278, 285, 291,
-    295, 305, 311, 318, 328, 332, 335, 340, 343];
+    7, 17, 2, 18, 7, 18, 2, 19, 7, 19, 2, 20, 7, 20, 2, 21, 7, 21, 2, 22, 7, 22, 2, 23, 7, 23, 2, 24, 7,
+    24, 2, 25, 7, 25, 2, 26, 7, 26, 2, 27, 7, 27, 2, 28, 7, 28, 2, 29, 7, 29, 2, 30, 7, 30, 2, 31, 7, 31,
+    2, 32, 7, 32, 1, 0, 3, 0, 68, 8, 0, 1, 0, 5, 0, 71, 8, 0, 10, 0, 12, 0, 74, 9, 0, 1, 0, 3, 0, 77, 8, 0,
+    1, 0, 1, 0, 1, 1, 1, 1, 5, 1, 83, 8, 1, 10, 1, 12, 1, 86, 9, 1, 1, 1, 4, 1, 89, 8, 1, 11, 1, 12, 1, 90,
+    3, 1, 93, 8, 1, 1, 2, 1, 2, 5, 2, 97, 8, 2, 10, 2, 12, 2, 100, 9, 2, 1, 3, 1, 3, 3, 3, 104, 8, 3, 1, 4,
+    1, 4, 1, 4, 1, 4, 1, 4, 1, 4, 1, 4, 1, 4, 3, 4, 114, 8, 4, 1, 5, 1, 5, 3, 5, 118, 8, 5, 1, 6, 1, 6, 1, 7,
+    1, 7, 1, 8, 1, 8, 1, 8, 1, 8, 1, 8, 3, 8, 129, 8, 8, 1, 9, 1, 9, 1, 9, 3, 9, 134, 8, 9, 1, 9, 3, 9, 137,
+    8, 9, 1, 10, 1, 10, 3, 10, 141, 8, 10, 1, 10, 1, 10, 1, 11, 1, 11, 1, 12, 1, 12, 1, 12, 1, 13, 4, 13,
+    151, 8, 13, 11, 13, 12, 13, 152, 1, 14, 1, 14, 1, 14, 1, 15, 1, 15, 1, 15, 3, 15, 161, 8, 15, 1,
+    16, 1, 16, 1, 16, 1, 16, 3, 16, 167, 8, 16, 1, 17, 1, 17, 1, 17, 1, 17, 3, 17, 173, 8, 17, 1, 18,
+    1, 18, 4, 18, 177, 8, 18, 11, 18, 12, 18, 178, 1, 19, 1, 19, 5, 19, 183, 8, 19, 10, 19, 12, 19,
+    186, 9, 19, 1, 19, 1, 19, 1, 20, 1, 20, 1, 21, 1, 21, 1, 22, 1, 22, 5, 22, 196, 8, 22, 10, 22, 12,
+    22, 199, 9, 22, 1, 22, 3, 22, 202, 8, 22, 1, 22, 5, 22, 205, 8, 22, 10, 22, 12, 22, 208, 9, 22,
+    1, 22, 1, 22, 5, 22, 212, 8, 22, 10, 22, 12, 22, 215, 9, 22, 1, 22, 1, 22, 5, 22, 219, 8, 22, 10,
+    22, 12, 22, 222, 9, 22, 3, 22, 224, 8, 22, 1, 23, 1, 23, 1, 23, 5, 23, 229, 8, 23, 10, 23, 12, 23,
+    232, 9, 23, 1, 23, 5, 23, 235, 8, 23, 10, 23, 12, 23, 238, 9, 23, 1, 23, 3, 23, 241, 8, 23, 1, 24,
+    1, 24, 1, 24, 1, 24, 1, 25, 1, 25, 1, 26, 1, 26, 5, 26, 251, 8, 26, 10, 26, 12, 26, 254, 9, 26, 1,
+    26, 3, 26, 257, 8, 26, 1, 26, 5, 26, 260, 8, 26, 10, 26, 12, 26, 263, 9, 26, 1, 26, 1, 26, 5, 26,
+    267, 8, 26, 10, 26, 12, 26, 270, 9, 26, 1, 26, 1, 26, 5, 26, 274, 8, 26, 10, 26, 12, 26, 277, 9,
+    26, 3, 26, 279, 8, 26, 1, 27, 1, 27, 5, 27, 283, 8, 27, 10, 27, 12, 27, 286, 9, 27, 1, 27, 1, 27,
+    5, 27, 290, 8, 27, 10, 27, 12, 27, 293, 9, 27, 1, 27, 5, 27, 296, 8, 27, 10, 27, 12, 27, 299, 9,
+    27, 1, 27, 3, 27, 302, 8, 27, 1, 28, 1, 28, 1, 29, 1, 29, 1, 30, 1, 30, 1, 31, 1, 31, 1, 32, 1, 32,
+    3, 32, 314, 8, 32, 1, 32, 1, 32, 1, 32, 3, 32, 319, 8, 32, 1, 32, 3, 32, 322, 8, 32, 1, 32, 0, 0,
+    33, 0, 2, 4, 6, 8, 10, 12, 14, 16, 18, 20, 22, 24, 26, 28, 30, 32, 34, 36, 38, 40, 42, 44, 46, 48,
+    50, 52, 54, 56, 58, 60, 62, 64, 0, 3, 2, 0, 8, 10, 13, 14, 2, 0, 19, 19, 21, 21, 1, 0, 8, 9, 344,
+    0, 67, 1, 0, 0, 0, 2, 92, 1, 0, 0, 0, 4, 94, 1, 0, 0, 0, 6, 103, 1, 0, 0, 0, 8, 113, 1, 0, 0, 0, 10, 115,
+    1, 0, 0, 0, 12, 119, 1, 0, 0, 0, 14, 121, 1, 0, 0, 0, 16, 128, 1, 0, 0, 0, 18, 136, 1, 0, 0, 0, 20,
+    138, 1, 0, 0, 0, 22, 144, 1, 0, 0, 0, 24, 146, 1, 0, 0, 0, 26, 150, 1, 0, 0, 0, 28, 154, 1, 0, 0, 0,
+    30, 157, 1, 0, 0, 0, 32, 166, 1, 0, 0, 0, 34, 172, 1, 0, 0, 0, 36, 174, 1, 0, 0, 0, 38, 180, 1, 0,
+    0, 0, 40, 189, 1, 0, 0, 0, 42, 191, 1, 0, 0, 0, 44, 223, 1, 0, 0, 0, 46, 225, 1, 0, 0, 0, 48, 242,
+    1, 0, 0, 0, 50, 246, 1, 0, 0, 0, 52, 278, 1, 0, 0, 0, 54, 280, 1, 0, 0, 0, 56, 303, 1, 0, 0, 0, 58,
+    305, 1, 0, 0, 0, 60, 307, 1, 0, 0, 0, 62, 309, 1, 0, 0, 0, 64, 313, 1, 0, 0, 0, 66, 68, 3, 2, 1, 0,
+    67, 66, 1, 0, 0, 0, 67, 68, 1, 0, 0, 0, 68, 72, 1, 0, 0, 0, 69, 71, 3, 8, 4, 0, 70, 69, 1, 0, 0, 0, 71,
+    74, 1, 0, 0, 0, 72, 70, 1, 0, 0, 0, 72, 73, 1, 0, 0, 0, 73, 76, 1, 0, 0, 0, 74, 72, 1, 0, 0, 0, 75, 77,
+    3, 4, 2, 0, 76, 75, 1, 0, 0, 0, 76, 77, 1, 0, 0, 0, 77, 78, 1, 0, 0, 0, 78, 79, 5, 0, 0, 1, 79, 1, 1,
+    0, 0, 0, 80, 84, 5, 1, 0, 0, 81, 83, 3, 26, 13, 0, 82, 81, 1, 0, 0, 0, 83, 86, 1, 0, 0, 0, 84, 82, 1,
+    0, 0, 0, 84, 85, 1, 0, 0, 0, 85, 93, 1, 0, 0, 0, 86, 84, 1, 0, 0, 0, 87, 89, 3, 26, 13, 0, 88, 87, 1,
+    0, 0, 0, 89, 90, 1, 0, 0, 0, 90, 88, 1, 0, 0, 0, 90, 91, 1, 0, 0, 0, 91, 93, 1, 0, 0, 0, 92, 80, 1, 0,
+    0, 0, 92, 88, 1, 0, 0, 0, 93, 3, 1, 0, 0, 0, 94, 98, 5, 5, 0, 0, 95, 97, 3, 6, 3, 0, 96, 95, 1, 0, 0,
+    0, 97, 100, 1, 0, 0, 0, 98, 96, 1, 0, 0, 0, 98, 99, 1, 0, 0, 0, 99, 5, 1, 0, 0, 0, 100, 98, 1, 0, 0,
+    0, 101, 104, 3, 26, 13, 0, 102, 104, 3, 10, 5, 0, 103, 101, 1, 0, 0, 0, 103, 102, 1, 0, 0, 0, 104,
+    7, 1, 0, 0, 0, 105, 114, 3, 26, 13, 0, 106, 114, 3, 10, 5, 0, 107, 114, 3, 12, 6, 0, 108, 114, 5,
+    6, 0, 0, 109, 114, 3, 14, 7, 0, 110, 114, 3, 28, 14, 0, 111, 114, 3, 16, 8, 0, 112, 114, 3, 64,
+    32, 0, 113, 105, 1, 0, 0, 0, 113, 106, 1, 0, 0, 0, 113, 107, 1, 0, 0, 0, 113, 108, 1, 0, 0, 0, 113,
+    109, 1, 0, 0, 0, 113, 110, 1, 0, 0, 0, 113, 111, 1, 0, 0, 0, 113, 112, 1, 0, 0, 0, 114, 9, 1, 0, 0,
+    0, 115, 117, 5, 35, 0, 0, 116, 118, 3, 26, 13, 0, 117, 116, 1, 0, 0, 0, 117, 118, 1, 0, 0, 0, 118,
+    11, 1, 0, 0, 0, 119, 120, 5, 34, 0, 0, 120, 13, 1, 0, 0, 0, 121, 122, 5, 7, 0, 0, 122, 15, 1, 0, 0,
+    0, 123, 129, 3, 18, 9, 0, 124, 129, 3, 24, 12, 0, 125, 126, 3, 62, 31, 0, 126, 127, 3, 26, 13,
+    0, 127, 129, 1, 0, 0, 0, 128, 123, 1, 0, 0, 0, 128, 124, 1, 0, 0, 0, 128, 125, 1, 0, 0, 0, 129, 17,
+    1, 0, 0, 0, 130, 137, 3, 20, 10, 0, 131, 133, 5, 3, 0, 0, 132, 134, 3, 42, 21, 0, 133, 132, 1, 0,
+    0, 0, 133, 134, 1, 0, 0, 0, 134, 135, 1, 0, 0, 0, 135, 137, 3, 26, 13, 0, 136, 130, 1, 0, 0, 0, 136,
+    131, 1, 0, 0, 0, 137, 19, 1, 0, 0, 0, 138, 140, 5, 2, 0, 0, 139, 141, 3, 22, 11, 0, 140, 139, 1,
+    0, 0, 0, 140, 141, 1, 0, 0, 0, 141, 142, 1, 0, 0, 0, 142, 143, 3, 26, 13, 0, 143, 21, 1, 0, 0, 0,
+    144, 145, 5, 37, 0, 0, 145, 23, 1, 0, 0, 0, 146, 147, 5, 4, 0, 0, 147, 148, 3, 26, 13, 0, 148, 25,
+    1, 0, 0, 0, 149, 151, 5, 31, 0, 0, 150, 149, 1, 0, 0, 0, 151, 152, 1, 0, 0, 0, 152, 150, 1, 0, 0,
+    0, 152, 153, 1, 0, 0, 0, 153, 27, 1, 0, 0, 0, 154, 155, 3, 30, 15, 0, 155, 156, 3, 26, 13, 0, 156,
+    29, 1, 0, 0, 0, 157, 158, 5, 37, 0, 0, 158, 160, 5, 19, 0, 0, 159, 161, 3, 32, 16, 0, 160, 159,
+    1, 0, 0, 0, 160, 161, 1, 0, 0, 0, 161, 31, 1, 0, 0, 0, 162, 167, 3, 36, 18, 0, 163, 167, 3, 34, 17,
+    0, 164, 167, 3, 52, 26, 0, 165, 167, 3, 44, 22, 0, 166, 162, 1, 0, 0, 0, 166, 163, 1, 0, 0, 0, 166,
+    164, 1, 0, 0, 0, 166, 165, 1, 0, 0, 0, 167, 33, 1, 0, 0, 0, 168, 173, 3, 58, 29, 0, 169, 173, 3,
+    42, 21, 0, 170, 173, 3, 56, 28, 0, 171, 173, 3, 60, 30, 0, 172, 168, 1, 0, 0, 0, 172, 169, 1, 0,
+    0, 0, 172, 170, 1, 0, 0, 0, 172, 171, 1, 0, 0, 0, 173, 35, 1, 0, 0, 0, 174, 176, 5, 13, 0, 0, 175,
+    177, 3, 38, 19, 0, 176, 175, 1, 0, 0, 0, 177, 178, 1, 0, 0, 0, 178, 176, 1, 0, 0, 0, 178, 179, 1,
+    0, 0, 0, 179, 37, 1, 0, 0, 0, 180, 184, 5, 26, 0, 0, 181, 183, 5, 31, 0, 0, 182, 181, 1, 0, 0, 0,
+    183, 186, 1, 0, 0, 0, 184, 182, 1, 0, 0, 0, 184, 185, 1, 0, 0, 0, 185, 187, 1, 0, 0, 0, 186, 184,
+    1, 0, 0, 0, 187, 188, 3, 40, 20, 0, 188, 39, 1, 0, 0, 0, 189, 190, 7, 0, 0, 0, 190, 41, 1, 0, 0, 0,
+    191, 192, 5, 13, 0, 0, 192, 43, 1, 0, 0, 0, 193, 197, 5, 24, 0, 0, 194, 196, 5, 31, 0, 0, 195, 194,
+    1, 0, 0, 0, 196, 199, 1, 0, 0, 0, 197, 195, 1, 0, 0, 0, 197, 198, 1, 0, 0, 0, 198, 201, 1, 0, 0, 0,
+    199, 197, 1, 0, 0, 0, 200, 202, 3, 46, 23, 0, 201, 200, 1, 0, 0, 0, 201, 202, 1, 0, 0, 0, 202, 206,
+    1, 0, 0, 0, 203, 205, 5, 31, 0, 0, 204, 203, 1, 0, 0, 0, 205, 208, 1, 0, 0, 0, 206, 204, 1, 0, 0,
+    0, 206, 207, 1, 0, 0, 0, 207, 209, 1, 0, 0, 0, 208, 206, 1, 0, 0, 0, 209, 213, 5, 25, 0, 0, 210,
+    212, 5, 31, 0, 0, 211, 210, 1, 0, 0, 0, 212, 215, 1, 0, 0, 0, 213, 211, 1, 0, 0, 0, 213, 214, 1,
+    0, 0, 0, 214, 224, 1, 0, 0, 0, 215, 213, 1, 0, 0, 0, 216, 220, 5, 11, 0, 0, 217, 219, 5, 31, 0, 0,
+    218, 217, 1, 0, 0, 0, 219, 222, 1, 0, 0, 0, 220, 218, 1, 0, 0, 0, 220, 221, 1, 0, 0, 0, 221, 224,
+    1, 0, 0, 0, 222, 220, 1, 0, 0, 0, 223, 193, 1, 0, 0, 0, 223, 216, 1, 0, 0, 0, 224, 45, 1, 0, 0, 0,
+    225, 236, 3, 48, 24, 0, 226, 230, 5, 20, 0, 0, 227, 229, 5, 31, 0, 0, 228, 227, 1, 0, 0, 0, 229,
+    232, 1, 0, 0, 0, 230, 228, 1, 0, 0, 0, 230, 231, 1, 0, 0, 0, 231, 233, 1, 0, 0, 0, 232, 230, 1, 0,
+    0, 0, 233, 235, 3, 48, 24, 0, 234, 226, 1, 0, 0, 0, 235, 238, 1, 0, 0, 0, 236, 234, 1, 0, 0, 0, 236,
+    237, 1, 0, 0, 0, 237, 240, 1, 0, 0, 0, 238, 236, 1, 0, 0, 0, 239, 241, 5, 20, 0, 0, 240, 239, 1,
+    0, 0, 0, 240, 241, 1, 0, 0, 0, 241, 47, 1, 0, 0, 0, 242, 243, 5, 37, 0, 0, 243, 244, 3, 50, 25, 0,
+    244, 245, 3, 32, 16, 0, 245, 49, 1, 0, 0, 0, 246, 247, 7, 1, 0, 0, 247, 51, 1, 0, 0, 0, 248, 252,
+    5, 22, 0, 0, 249, 251, 5, 31, 0, 0, 250, 249, 1, 0, 0, 0, 251, 254, 1, 0, 0, 0, 252, 250, 1, 0, 0,
+    0, 252, 253, 1, 0, 0, 0, 253, 256, 1, 0, 0, 0, 254, 252, 1, 0, 0, 0, 255, 257, 3, 54, 27, 0, 256,
+    255, 1, 0, 0, 0, 256, 257, 1, 0, 0, 0, 257, 261, 1, 0, 0, 0, 258, 260, 5, 31, 0, 0, 259, 258, 1,
+    0, 0, 0, 260, 263, 1, 0, 0, 0, 261, 259, 1, 0, 0, 0, 261, 262, 1, 0, 0, 0, 262, 264, 1, 0, 0, 0, 263,
+    261, 1, 0, 0, 0, 264, 268, 5, 23, 0, 0, 265, 267, 5, 31, 0, 0, 266, 265, 1, 0, 0, 0, 267, 270, 1,
+    0, 0, 0, 268, 266, 1, 0, 0, 0, 268, 269, 1, 0, 0, 0, 269, 279, 1, 0, 0, 0, 270, 268, 1, 0, 0, 0, 271,
+    275, 5, 12, 0, 0, 272, 274, 5, 31, 0, 0, 273, 272, 1, 0, 0, 0, 274, 277, 1, 0, 0, 0, 275, 273, 1,
+    0, 0, 0, 275, 276, 1, 0, 0, 0, 276, 279, 1, 0, 0, 0, 277, 275, 1, 0, 0, 0, 278, 248, 1, 0, 0, 0, 278,
+    271, 1, 0, 0, 0, 279, 53, 1, 0, 0, 0, 280, 297, 3, 32, 16, 0, 281, 283, 5, 31, 0, 0, 282, 281, 1,
+    0, 0, 0, 283, 286, 1, 0, 0, 0, 284, 282, 1, 0, 0, 0, 284, 285, 1, 0, 0, 0, 285, 287, 1, 0, 0, 0, 286,
+    284, 1, 0, 0, 0, 287, 291, 5, 20, 0, 0, 288, 290, 5, 31, 0, 0, 289, 288, 1, 0, 0, 0, 290, 293, 1,
+    0, 0, 0, 291, 289, 1, 0, 0, 0, 291, 292, 1, 0, 0, 0, 292, 294, 1, 0, 0, 0, 293, 291, 1, 0, 0, 0, 294,
+    296, 3, 32, 16, 0, 295, 284, 1, 0, 0, 0, 296, 299, 1, 0, 0, 0, 297, 295, 1, 0, 0, 0, 297, 298, 1,
+    0, 0, 0, 298, 301, 1, 0, 0, 0, 299, 297, 1, 0, 0, 0, 300, 302, 5, 20, 0, 0, 301, 300, 1, 0, 0, 0,
+    301, 302, 1, 0, 0, 0, 302, 55, 1, 0, 0, 0, 303, 304, 5, 14, 0, 0, 304, 57, 1, 0, 0, 0, 305, 306,
+    5, 10, 0, 0, 306, 59, 1, 0, 0, 0, 307, 308, 7, 2, 0, 0, 308, 61, 1, 0, 0, 0, 309, 310, 5, 40, 0, 0,
+    310, 63, 1, 0, 0, 0, 311, 314, 5, 39, 0, 0, 312, 314, 3, 32, 16, 0, 313, 311, 1, 0, 0, 0, 313, 312,
+    1, 0, 0, 0, 313, 314, 1, 0, 0, 0, 314, 315, 1, 0, 0, 0, 315, 318, 5, 19, 0, 0, 316, 319, 3, 32, 16,
+    0, 317, 319, 5, 39, 0, 0, 318, 316, 1, 0, 0, 0, 318, 317, 1, 0, 0, 0, 319, 321, 1, 0, 0, 0, 320,
+    322, 3, 26, 13, 0, 321, 320, 1, 0, 0, 0, 321, 322, 1, 0, 0, 0, 322, 65, 1, 0, 0, 0, 42, 67, 72, 76,
+    84, 90, 92, 98, 103, 113, 117, 128, 133, 136, 140, 152, 160, 166, 172, 178, 184, 197, 201,
+    206, 213, 220, 223, 230, 236, 240, 252, 256, 261, 268, 275, 278, 284, 291, 297, 301, 313,
+    318, 321];
 YiniParser.DecisionsToDFA = YiniParser._ATN.decisionToState.map((ds, index) => new antlr4_1.DFA(ds, index));
 exports.default = YiniParser;
 class YiniContext extends antlr4_1.ParserRuleContext {
@@ -1867,17 +1943,11 @@ class Terminal_stmtContext extends antlr4_1.ParserRuleContext {
     TERMINAL_TOKEN() {
         return this.getToken(YiniParser.TERMINAL_TOKEN, 0);
     }
-    eol() {
-        return this.getTypedRuleContext(EolContext, 0);
-    }
-    INLINE_COMMENT() {
-        return this.getToken(YiniParser.INLINE_COMMENT, 0);
-    }
-    NL_list() {
-        return this.getTokens(YiniParser.NL);
+    terminal_trivia_list() {
+        return this.getTypedRuleContexts(Terminal_triviaContext);
     }
-    NL(i) {
-        return this.getToken(YiniParser.NL, i);
+    terminal_trivia(i) {
+        return this.getTypedRuleContext(Terminal_triviaContext, i);
     }
     get ruleIndex() {
         return YiniParser.RULE_terminal_stmt;
@@ -1893,6 +1963,31 @@ class Terminal_stmtContext extends antlr4_1.ParserRuleContext {
     }
 }
 exports.Terminal_stmtContext = Terminal_stmtContext;
+class Terminal_triviaContext extends antlr4_1.ParserRuleContext {
+    constructor(parser, parent, invokingState) {
+        super(parent, invokingState);
+        this.parser = parser;
+    }
+    eol() {
+        return this.getTypedRuleContext(EolContext, 0);
+    }
+    full_line_comment_stmt() {
+        return this.getTypedRuleContext(Full_line_comment_stmtContext, 0);
+    }
+    get ruleIndex() {
+        return YiniParser.RULE_terminal_trivia;
+    }
+    // @Override
+    accept(visitor) {
+        if (visitor.visitTerminal_trivia) {
+            return visitor.visitTerminal_trivia(this);
+        }
+        else {
+            return visitor.visitChildren(this);
+        }
+    }
+}
+exports.Terminal_triviaContext = Terminal_triviaContext;
 class StmtContext extends antlr4_1.ParserRuleContext {
     constructor(parser, parent, invokingState) {
         super(parent, invokingState);
@@ -1901,15 +1996,21 @@ class StmtContext extends antlr4_1.ParserRuleContext {
     eol() {
         return this.getTypedRuleContext(EolContext, 0);
     }
+    full_line_comment_stmt() {
+        return this.getTypedRuleContext(Full_line_comment_stmtContext, 0);
+    }
+    disabled_line_stmt() {
+        return this.getTypedRuleContext(Disabled_line_stmtContext, 0);
+    }
     SECTION_HEAD() {
         return this.getToken(YiniParser.SECTION_HEAD, 0);
     }
+    invalid_section_stmt() {
+        return this.getTypedRuleContext(Invalid_section_stmtContext, 0);
+    }
     assignment() {
         return this.getTypedRuleContext(AssignmentContext, 0);
     }
-    colon_list_decl() {
-        return this.getTypedRuleContext(Colon_list_declContext, 0);
-    }
     meta_stmt() {
         return this.getTypedRuleContext(Meta_stmtContext, 0);
     }
@@ -1921,15 +2022,84 @@ class StmtContext extends antlr4_1.ParserRuleContext {
     }
     // @Override
     accept(visitor) {
-        if (visitor.visitStmt) {
-            return visitor.visitStmt(this);
+        if (visitor.visitStmt) {
+            return visitor.visitStmt(this);
+        }
+        else {
+            return visitor.visitChildren(this);
+        }
+    }
+}
+exports.StmtContext = StmtContext;
+class Full_line_comment_stmtContext extends antlr4_1.ParserRuleContext {
+    constructor(parser, parent, invokingState) {
+        super(parent, invokingState);
+        this.parser = parser;
+    }
+    FULL_LINE_COMMENT() {
+        return this.getToken(YiniParser.FULL_LINE_COMMENT, 0);
+    }
+    eol() {
+        return this.getTypedRuleContext(EolContext, 0);
+    }
+    get ruleIndex() {
+        return YiniParser.RULE_full_line_comment_stmt;
+    }
+    // @Override
+    accept(visitor) {
+        if (visitor.visitFull_line_comment_stmt) {
+            return visitor.visitFull_line_comment_stmt(this);
+        }
+        else {
+            return visitor.visitChildren(this);
+        }
+    }
+}
+exports.Full_line_comment_stmtContext = Full_line_comment_stmtContext;
+class Disabled_line_stmtContext extends antlr4_1.ParserRuleContext {
+    constructor(parser, parent, invokingState) {
+        super(parent, invokingState);
+        this.parser = parser;
+    }
+    DISABLED_LINE() {
+        return this.getToken(YiniParser.DISABLED_LINE, 0);
+    }
+    get ruleIndex() {
+        return YiniParser.RULE_disabled_line_stmt;
+    }
+    // @Override
+    accept(visitor) {
+        if (visitor.visitDisabled_line_stmt) {
+            return visitor.visitDisabled_line_stmt(this);
+        }
+        else {
+            return visitor.visitChildren(this);
+        }
+    }
+}
+exports.Disabled_line_stmtContext = Disabled_line_stmtContext;
+class Invalid_section_stmtContext extends antlr4_1.ParserRuleContext {
+    constructor(parser, parent, invokingState) {
+        super(parent, invokingState);
+        this.parser = parser;
+    }
+    INVALID_SECTION_HEAD() {
+        return this.getToken(YiniParser.INVALID_SECTION_HEAD, 0);
+    }
+    get ruleIndex() {
+        return YiniParser.RULE_invalid_section_stmt;
+    }
+    // @Override
+    accept(visitor) {
+        if (visitor.visitInvalid_section_stmt) {
+            return visitor.visitInvalid_section_stmt(this);
         }
         else {
             return visitor.visitChildren(this);
         }
     }
 }
-exports.StmtContext = StmtContext;
+exports.Invalid_section_stmtContext = Invalid_section_stmtContext;
 class Meta_stmtContext extends antlr4_1.ParserRuleContext {
     constructor(parser, parent, invokingState) {
         super(parent, invokingState);
@@ -1966,20 +2136,14 @@ class DirectiveContext extends antlr4_1.ParserRuleContext {
         super(parent, invokingState);
         this.parser = parser;
     }
-    YINI_TOKEN() {
-        return this.getToken(YiniParser.YINI_TOKEN, 0);
-    }
-    eol() {
-        return this.getTypedRuleContext(EolContext, 0);
+    yini_directive() {
+        return this.getTypedRuleContext(Yini_directiveContext, 0);
     }
     INCLUDE_TOKEN() {
         return this.getToken(YiniParser.INCLUDE_TOKEN, 0);
     }
-    WS_list() {
-        return this.getTokens(YiniParser.WS);
-    }
-    WS(i) {
-        return this.getToken(YiniParser.WS, i);
+    eol() {
+        return this.getTypedRuleContext(EolContext, 0);
     }
     string_literal() {
         return this.getTypedRuleContext(String_literalContext, 0);
@@ -1998,6 +2162,56 @@ class DirectiveContext extends antlr4_1.ParserRuleContext {
     }
 }
 exports.DirectiveContext = DirectiveContext;
+class Yini_directiveContext extends antlr4_1.ParserRuleContext {
+    constructor(parser, parent, invokingState) {
+        super(parent, invokingState);
+        this.parser = parser;
+    }
+    YINI_TOKEN() {
+        return this.getToken(YiniParser.YINI_TOKEN, 0);
+    }
+    eol() {
+        return this.getTypedRuleContext(EolContext, 0);
+    }
+    yini_mode_declaration() {
+        return this.getTypedRuleContext(Yini_mode_declarationContext, 0);
+    }
+    get ruleIndex() {
+        return YiniParser.RULE_yini_directive;
+    }
+    // @Override
+    accept(visitor) {
+        if (visitor.visitYini_directive) {
+            return visitor.visitYini_directive(this);
+        }
+        else {
+            return visitor.visitChildren(this);
+        }
+    }
+}
+exports.Yini_directiveContext = Yini_directiveContext;
+class Yini_mode_declarationContext extends antlr4_1.ParserRuleContext {
+    constructor(parser, parent, invokingState) {
+        super(parent, invokingState);
+        this.parser = parser;
+    }
+    KEY() {
+        return this.getToken(YiniParser.KEY, 0);
+    }
+    get ruleIndex() {
+        return YiniParser.RULE_yini_mode_declaration;
+    }
+    // @Override
+    accept(visitor) {
+        if (visitor.visitYini_mode_declaration) {
+            return visitor.visitYini_mode_declaration(this);
+        }
+        else {
+            return visitor.visitChildren(this);
+        }
+    }
+}
+exports.Yini_mode_declarationContext = Yini_mode_declarationContext;
 class AnnotationContext extends antlr4_1.ParserRuleContext {
     constructor(parser, parent, invokingState) {
         super(parent, invokingState);
@@ -2028,9 +2242,6 @@ class EolContext extends antlr4_1.ParserRuleContext {
         super(parent, invokingState);
         this.parser = parser;
     }
-    INLINE_COMMENT() {
-        return this.getToken(YiniParser.INLINE_COMMENT, 0);
-    }
     NL_list() {
         return this.getTokens(YiniParser.NL);
     }
@@ -2087,12 +2298,6 @@ class MemberContext extends antlr4_1.ParserRuleContext {
     EQ() {
         return this.getToken(YiniParser.EQ, 0);
     }
-    WS_list() {
-        return this.getTokens(YiniParser.WS);
-    }
-    WS(i) {
-        return this.getToken(YiniParser.WS, i);
-    }
     value() {
         return this.getTypedRuleContext(ValueContext, 0);
     }
@@ -2110,47 +2315,38 @@ class MemberContext extends antlr4_1.ParserRuleContext {
     }
 }
 exports.MemberContext = MemberContext;
-class Colon_list_declContext extends antlr4_1.ParserRuleContext {
+class ValueContext extends antlr4_1.ParserRuleContext {
     constructor(parser, parent, invokingState) {
         super(parent, invokingState);
         this.parser = parser;
     }
-    KEY() {
-        return this.getToken(YiniParser.KEY, 0);
-    }
-    COLON() {
-        return this.getToken(YiniParser.COLON, 0);
-    }
-    elements() {
-        return this.getTypedRuleContext(ElementsContext, 0);
-    }
-    eol_list() {
-        return this.getTypedRuleContexts(EolContext);
+    concat_expression() {
+        return this.getTypedRuleContext(Concat_expressionContext, 0);
     }
-    eol(i) {
-        return this.getTypedRuleContext(EolContext, i);
+    scalar_value() {
+        return this.getTypedRuleContext(Scalar_valueContext, 0);
     }
-    WS_list() {
-        return this.getTokens(YiniParser.WS);
+    list_literal() {
+        return this.getTypedRuleContext(List_literalContext, 0);
     }
-    WS(i) {
-        return this.getToken(YiniParser.WS, i);
+    object_literal() {
+        return this.getTypedRuleContext(Object_literalContext, 0);
     }
     get ruleIndex() {
-        return YiniParser.RULE_colon_list_decl;
+        return YiniParser.RULE_value;
     }
     // @Override
     accept(visitor) {
-        if (visitor.visitColon_list_decl) {
-            return visitor.visitColon_list_decl(this);
+        if (visitor.visitValue) {
+            return visitor.visitValue(this);
         }
         else {
             return visitor.visitChildren(this);
         }
     }
 }
-exports.Colon_list_declContext = Colon_list_declContext;
-class ValueContext extends antlr4_1.ParserRuleContext {
+exports.ValueContext = ValueContext;
+class Scalar_valueContext extends antlr4_1.ParserRuleContext {
     constructor(parser, parent, invokingState) {
         super(parent, invokingState);
         this.parser = parser;
@@ -2167,26 +2363,135 @@ class ValueContext extends antlr4_1.ParserRuleContext {
     boolean_literal() {
         return this.getTypedRuleContext(Boolean_literalContext, 0);
     }
-    list_literal() {
-        return this.getTypedRuleContext(List_literalContext, 0);
+    get ruleIndex() {
+        return YiniParser.RULE_scalar_value;
     }
-    object_literal() {
-        return this.getTypedRuleContext(Object_literalContext, 0);
+    // @Override
+    accept(visitor) {
+        if (visitor.visitScalar_value) {
+            return visitor.visitScalar_value(this);
+        }
+        else {
+            return visitor.visitChildren(this);
+        }
+    }
+}
+exports.Scalar_valueContext = Scalar_valueContext;
+class Concat_expressionContext extends antlr4_1.ParserRuleContext {
+    constructor(parser, parent, invokingState) {
+        super(parent, invokingState);
+        this.parser = parser;
+    }
+    STRING() {
+        return this.getToken(YiniParser.STRING, 0);
+    }
+    concat_tail_list() {
+        return this.getTypedRuleContexts(Concat_tailContext);
+    }
+    concat_tail(i) {
+        return this.getTypedRuleContext(Concat_tailContext, i);
     }
     get ruleIndex() {
-        return YiniParser.RULE_value;
+        return YiniParser.RULE_concat_expression;
     }
     // @Override
     accept(visitor) {
-        if (visitor.visitValue) {
-            return visitor.visitValue(this);
+        if (visitor.visitConcat_expression) {
+            return visitor.visitConcat_expression(this);
         }
         else {
             return visitor.visitChildren(this);
         }
     }
 }
-exports.ValueContext = ValueContext;
+exports.Concat_expressionContext = Concat_expressionContext;
+class Concat_tailContext extends antlr4_1.ParserRuleContext {
+    constructor(parser, parent, invokingState) {
+        super(parent, invokingState);
+        this.parser = parser;
+    }
+    PLUS() {
+        return this.getToken(YiniParser.PLUS, 0);
+    }
+    concat_operand() {
+        return this.getTypedRuleContext(Concat_operandContext, 0);
+    }
+    NL_list() {
+        return this.getTokens(YiniParser.NL);
+    }
+    NL(i) {
+        return this.getToken(YiniParser.NL, i);
+    }
+    get ruleIndex() {
+        return YiniParser.RULE_concat_tail;
+    }
+    // @Override
+    accept(visitor) {
+        if (visitor.visitConcat_tail) {
+            return visitor.visitConcat_tail(this);
+        }
+        else {
+            return visitor.visitChildren(this);
+        }
+    }
+}
+exports.Concat_tailContext = Concat_tailContext;
+class Concat_operandContext extends antlr4_1.ParserRuleContext {
+    constructor(parser, parent, invokingState) {
+        super(parent, invokingState);
+        this.parser = parser;
+    }
+    STRING() {
+        return this.getToken(YiniParser.STRING, 0);
+    }
+    NUMBER() {
+        return this.getToken(YiniParser.NUMBER, 0);
+    }
+    BOOLEAN_TRUE() {
+        return this.getToken(YiniParser.BOOLEAN_TRUE, 0);
+    }
+    BOOLEAN_FALSE() {
+        return this.getToken(YiniParser.BOOLEAN_FALSE, 0);
+    }
+    NULL() {
+        return this.getToken(YiniParser.NULL, 0);
+    }
+    get ruleIndex() {
+        return YiniParser.RULE_concat_operand;
+    }
+    // @Override
+    accept(visitor) {
+        if (visitor.visitConcat_operand) {
+            return visitor.visitConcat_operand(this);
+        }
+        else {
+            return visitor.visitChildren(this);
+        }
+    }
+}
+exports.Concat_operandContext = Concat_operandContext;
+class String_literalContext extends antlr4_1.ParserRuleContext {
+    constructor(parser, parent, invokingState) {
+        super(parent, invokingState);
+        this.parser = parser;
+    }
+    STRING() {
+        return this.getToken(YiniParser.STRING, 0);
+    }
+    get ruleIndex() {
+        return YiniParser.RULE_string_literal;
+    }
+    // @Override
+    accept(visitor) {
+        if (visitor.visitString_literal) {
+            return visitor.visitString_literal(this);
+        }
+        else {
+            return visitor.visitChildren(this);
+        }
+    }
+}
+exports.String_literalContext = String_literalContext;
 class Object_literalContext extends antlr4_1.ParserRuleContext {
     constructor(parser, parent, invokingState) {
         super(parent, invokingState);
@@ -2269,21 +2574,12 @@ class Object_memberContext extends antlr4_1.ParserRuleContext {
     KEY() {
         return this.getToken(YiniParser.KEY, 0);
     }
-    COLON() {
-        return this.getToken(YiniParser.COLON, 0);
+    object_member_separator() {
+        return this.getTypedRuleContext(Object_member_separatorContext, 0);
     }
     value() {
         return this.getTypedRuleContext(ValueContext, 0);
     }
-    WS() {
-        return this.getToken(YiniParser.WS, 0);
-    }
-    NL_list() {
-        return this.getTokens(YiniParser.NL);
-    }
-    NL(i) {
-        return this.getToken(YiniParser.NL, i);
-    }
     get ruleIndex() {
         return YiniParser.RULE_object_member;
     }
@@ -2298,6 +2594,31 @@ class Object_memberContext extends antlr4_1.ParserRuleContext {
     }
 }
 exports.Object_memberContext = Object_memberContext;
+class Object_member_separatorContext extends antlr4_1.ParserRuleContext {
+    constructor(parser, parent, invokingState) {
+        super(parent, invokingState);
+        this.parser = parser;
+    }
+    COLON() {
+        return this.getToken(YiniParser.COLON, 0);
+    }
+    EQ() {
+        return this.getToken(YiniParser.EQ, 0);
+    }
+    get ruleIndex() {
+        return YiniParser.RULE_object_member_separator;
+    }
+    // @Override
+    accept(visitor) {
+        if (visitor.visitObject_member_separator) {
+            return visitor.visitObject_member_separator(this);
+        }
+        else {
+            return visitor.visitChildren(this);
+        }
+    }
+}
+exports.Object_member_separatorContext = Object_member_separatorContext;
 class List_literalContext extends antlr4_1.ParserRuleContext {
     constructor(parser, parent, invokingState) {
         super(parent, invokingState);
@@ -2416,65 +2737,6 @@ class Null_literalContext extends antlr4_1.ParserRuleContext {
     }
 }
 exports.Null_literalContext = Null_literalContext;
-class String_literalContext extends antlr4_1.ParserRuleContext {
-    constructor(parser, parent, invokingState) {
-        super(parent, invokingState);
-        this.parser = parser;
-    }
-    STRING() {
-        return this.getToken(YiniParser.STRING, 0);
-    }
-    string_concat_list() {
-        return this.getTypedRuleContexts(String_concatContext);
-    }
-    string_concat(i) {
-        return this.getTypedRuleContext(String_concatContext, i);
-    }
-    get ruleIndex() {
-        return YiniParser.RULE_string_literal;
-    }
-    // @Override
-    accept(visitor) {
-        if (visitor.visitString_literal) {
-            return visitor.visitString_literal(this);
-        }
-        else {
-            return visitor.visitChildren(this);
-        }
-    }
-}
-exports.String_literalContext = String_literalContext;
-class String_concatContext extends antlr4_1.ParserRuleContext {
-    constructor(parser, parent, invokingState) {
-        super(parent, invokingState);
-        this.parser = parser;
-    }
-    PLUS() {
-        return this.getToken(YiniParser.PLUS, 0);
-    }
-    STRING() {
-        return this.getToken(YiniParser.STRING, 0);
-    }
-    NL_list() {
-        return this.getTokens(YiniParser.NL);
-    }
-    NL(i) {
-        return this.getToken(YiniParser.NL, i);
-    }
-    get ruleIndex() {
-        return YiniParser.RULE_string_concat;
-    }
-    // @Override
-    accept(visitor) {
-        if (visitor.visitString_concat) {
-            return visitor.visitString_concat(this);
-        }
-        else {
-            return visitor.visitChildren(this);
-        }
-    }
-}
-exports.String_concatContext = String_concatContext;
 class Boolean_literalContext extends antlr4_1.ParserRuleContext {
     constructor(parser, parent, invokingState) {
         super(parent, invokingState);
@@ -2542,12 +2804,6 @@ class Bad_memberContext extends antlr4_1.ParserRuleContext {
     REST(i) {
         return this.getToken(YiniParser.REST, i);
     }
-    WS_list() {
-        return this.getTokens(YiniParser.WS);
-    }
-    WS(i) {
-        return this.getToken(YiniParser.WS, i);
-    }
     eol() {
         return this.getTypedRuleContext(EolContext, 0);
     }