@env-spec/parser 0.3.1 → 0.3.2

package/dist/index.mjs

@@ -1,5 +1,5 @@
-import { __name, ParsedEnvSpecCommentBlock, ParsedEnvSpecDivider, ParsedEnvSpecComment, ParsedEnvSpecBlankLine, ParsedEnvSpecDecoratorComment, ParsedEnvSpecConfigItem, ParsedEnvSpecFile, ParsedEnvSpecDecorator, ParsedEnvSpecFunctionCall, ParsedEnvSpecKeyValuePair, ParsedEnvSpecFunctionArgs, ParsedEnvSpecStaticValue } from './chunk-AVMDB47P.mjs';
-export { ParsedEnvSpecBlankLine, ParsedEnvSpecComment, ParsedEnvSpecCommentBlock, ParsedEnvSpecConfigItem, ParsedEnvSpecDecorator, ParsedEnvSpecDecoratorComment, ParsedEnvSpecDivider, ParsedEnvSpecFile, ParsedEnvSpecFunctionArgs, ParsedEnvSpecFunctionCall, ParsedEnvSpecKeyValuePair, ParsedEnvSpecStaticValue, expand } from './chunk-AVMDB47P.mjs';
+import { __name, ParsedEnvSpecCommentBlock, ParsedEnvSpecDivider, ParsedEnvSpecComment, ParsedEnvSpecBlankLine, ParsedEnvSpecDecoratorComment, ParsedEnvSpecConfigItem, ParsedEnvSpecFile, ParsedEnvSpecDecorator, ParsedEnvSpecFunctionCall, ParsedEnvSpecKeyValuePair, ParsedEnvSpecFunctionArgs, ParsedEnvSpecStaticValue } from './chunk-N4D6RSUR.mjs';
+export { ParsedEnvSpecBlankLine, ParsedEnvSpecComment, ParsedEnvSpecCommentBlock, ParsedEnvSpecConfigItem, ParsedEnvSpecDecorator, ParsedEnvSpecDecoratorComment, ParsedEnvSpecDivider, ParsedEnvSpecFile, ParsedEnvSpecFunctionArgs, ParsedEnvSpecFunctionCall, ParsedEnvSpecKeyValuePair, ParsedEnvSpecStaticValue, expand } from './chunk-N4D6RSUR.mjs';
 
 // src/updater.ts
 function ensureHeader(file, newHeaderContents) {
@@ -246,25 +246,24 @@ function peg$parse(input, options) {
   const peg$c2 = "=";
   const peg$c3 = "#";
   const peg$c4 = "@";
-  const peg$c5 = ":";
-  const peg$c6 = "(";
-  const peg$c7 = ",";
-  const peg$c8 = ")";
-  const peg$c9 = '\\"';
-  const peg$c10 = "\\'";
-  const peg$c11 = "\\`";
-  const peg$c12 = '"""';
-  const peg$c13 = '\\"""';
-  const peg$c14 = "```";
-  const peg$c15 = "\\```";
+  const peg$c5 = "(";
+  const peg$c6 = ",";
+  const peg$c7 = ")";
+  const peg$c8 = '\\"';
+  const peg$c9 = "\\'";
+  const peg$c10 = "\\`";
+  const peg$c11 = '"""';
+  const peg$c12 = '\\"""';
+  const peg$c13 = "```";
+  const peg$c14 = "\\```";
   const peg$r0 = /^[a-zA-Z_]/;
   const peg$r1 = /^[a-zA-Z0-9_.\-]/;
   const peg$r2 = /^[^\n]/;
   const peg$r3 = /^[a-zA-Z]/;
-  const peg$r4 = /^[@#]/;
-  const peg$r5 = /^[a-zA-Z0-9_]/;
-  const peg$r6 = /^[^ \n,)]/;
-  const peg$r7 = /^[ \t]/;
+  const peg$r4 = /^[^ \t\n=()#@]/;
+  const peg$r5 = /^[^ \n,)]/;
+  const peg$r6 = /^[ \t]/;
+  const peg$r7 = /^[a-zA-Z0-9_]/;
   const peg$r8 = /^[ \t\n]/;
   const peg$r9 = /^[\-=*#]/;
   const peg$r10 = /^['"`]/;
@@ -285,33 +284,32 @@ function peg$parse(input, options) {
   const peg$e6 = peg$literalExpectation("@", false);
   const peg$e7 = peg$classExpectation(["\n"], true, false, false);
   const peg$e8 = peg$classExpectation([["a", "z"], ["A", "Z"]], false, false, false);
-  const peg$e9 = peg$literalExpectation(":", false);
-  const peg$e10 = peg$classExpectation(["@", "#"], false, false, false);
-  const peg$e11 = peg$classExpectation([["a", "z"], ["A", "Z"], ["0", "9"], "_"], false, false, false);
-  const peg$e12 = peg$literalExpectation("(", false);
-  const peg$e13 = peg$literalExpectation(",", false);
-  const peg$e14 = peg$literalExpectation(")", false);
-  const peg$e15 = peg$classExpectation([" ", "\n", ",", ")"], true, false, false);
-  const peg$e16 = peg$classExpectation([" ", "	"], false, false, false);
-  const peg$e17 = peg$classExpectation([" ", "	", "\n"], false, false, false);
-  const peg$e18 = peg$classExpectation(["-", "=", "*", "#"], false, false, false);
-  const peg$e19 = peg$classExpectation(["'", '"', "`"], false, false, false);
-  const peg$e20 = peg$classExpectation(["#", "\n"], true, false, false);
-  const peg$e21 = peg$classExpectation(["#", " ", "\n"], true, false, false);
-  const peg$e22 = peg$classExpectation(['"'], false, false, false);
-  const peg$e23 = peg$literalExpectation('\\"', false);
-  const peg$e24 = peg$classExpectation(['"', "\n"], true, false, false);
-  const peg$e25 = peg$classExpectation(["'"], false, false, false);
-  const peg$e26 = peg$literalExpectation("\\'", false);
-  const peg$e27 = peg$classExpectation(["'", "\n"], true, false, false);
-  const peg$e28 = peg$classExpectation(["`"], false, false, false);
-  const peg$e29 = peg$literalExpectation("\\`", false);
-  const peg$e30 = peg$classExpectation(["`", "\n"], true, false, false);
-  const peg$e31 = peg$literalExpectation('"""', false);
-  const peg$e32 = peg$literalExpectation('\\"""', false);
-  const peg$e33 = peg$literalExpectation("```", false);
-  const peg$e34 = peg$literalExpectation("\\```", false);
-  const peg$e35 = peg$anyExpectation();
+  const peg$e9 = peg$classExpectation([" ", "	", "\n", "=", "(", ")", "#", "@"], true, false, false);
+  const peg$e10 = peg$literalExpectation("(", false);
+  const peg$e11 = peg$literalExpectation(",", false);
+  const peg$e12 = peg$literalExpectation(")", false);
+  const peg$e13 = peg$classExpectation([" ", "\n", ",", ")"], true, false, false);
+  const peg$e14 = peg$classExpectation([" ", "	"], false, false, false);
+  const peg$e15 = peg$classExpectation([["a", "z"], ["A", "Z"], ["0", "9"], "_"], false, false, false);
+  const peg$e16 = peg$classExpectation([" ", "	", "\n"], false, false, false);
+  const peg$e17 = peg$classExpectation(["-", "=", "*", "#"], false, false, false);
+  const peg$e18 = peg$classExpectation(["'", '"', "`"], false, false, false);
+  const peg$e19 = peg$classExpectation(["#", "\n"], true, false, false);
+  const peg$e20 = peg$classExpectation(["#", " ", "\n"], true, false, false);
+  const peg$e21 = peg$classExpectation(['"'], false, false, false);
+  const peg$e22 = peg$literalExpectation('\\"', false);
+  const peg$e23 = peg$classExpectation(['"', "\n"], true, false, false);
+  const peg$e24 = peg$classExpectation(["'"], false, false, false);
+  const peg$e25 = peg$literalExpectation("\\'", false);
+  const peg$e26 = peg$classExpectation(["'", "\n"], true, false, false);
+  const peg$e27 = peg$classExpectation(["`"], false, false, false);
+  const peg$e28 = peg$literalExpectation("\\`", false);
+  const peg$e29 = peg$classExpectation(["`", "\n"], true, false, false);
+  const peg$e30 = peg$literalExpectation('"""', false);
+  const peg$e31 = peg$literalExpectation('\\"""', false);
+  const peg$e32 = peg$literalExpectation("```", false);
+  const peg$e33 = peg$literalExpectation("\\```", false);
+  const peg$e34 = peg$anyExpectation();
   function peg$f0() {
     return new ParsedEnvSpecBlankLine({ _location: location() });
   }
@@ -346,20 +344,27 @@ function peg$parse(input, options) {
     });
   }
   __name(peg$f4, "peg$f4");
-  function peg$f5(leadingSpace, contents) {
-    return new ParsedEnvSpecComment({ contents, leadingSpace, _location: location() });
-  }
-  __name(peg$f5, "peg$f5");
-  function peg$f6(leadingSpace, first, rest, postComment) {
+  function peg$f5(leadingSpace, first, rest, trailingText) {
+    const allDecorators = [first, ...rest];
+    let postComment;
+    if (trailingText) {
+      if (trailingText.startsWith("#")) {
+        postComment = trailingText;
+      } else {
+        const lastDec = allDecorators[allDecorators.length - 1];
+        lastDec.data.warning = `Unexpected trailing text after @${lastDec.name}`;
+        postComment = trailingText;
+      }
+    }
     return new ParsedEnvSpecDecoratorComment({
-      decorators: [first, ...rest],
+      decorators: allDecorators,
       leadingSpace,
       postComment,
       _location: location()
     });
   }
-  __name(peg$f6, "peg$f6");
-  function peg$f7(name, val) {
+  __name(peg$f5, "peg$f5");
+  function peg$f6(name, val) {
     return new ParsedEnvSpecDecorator({
       name,
       value: Array.isArray(val) ? val[1] : val,
@@ -367,67 +372,71 @@ function peg$parse(input, options) {
       _location: location()
     });
   }
-  __name(peg$f7, "peg$f7");
-  function peg$f8(name, args) {
+  __name(peg$f6, "peg$f6");
+  function peg$f7(name, args) {
     return new ParsedEnvSpecFunctionCall({
       name,
       args,
       _location: location()
     });
   }
-  __name(peg$f8, "peg$f8");
-  function peg$f9(key, val) {
+  __name(peg$f7, "peg$f7");
+  function peg$f8(key, val) {
     return new ParsedEnvSpecKeyValuePair({ key, val });
   }
-  __name(peg$f9, "peg$f9");
-  function peg$f10(values) {
+  __name(peg$f8, "peg$f8");
+  function peg$f9(values) {
     return new ParsedEnvSpecFunctionArgs({
       values: values || [],
       _location: location()
     });
   }
-  __name(peg$f10, "peg$f10");
-  function peg$f11() {
+  __name(peg$f9, "peg$f9");
+  function peg$f10() {
     return new ParsedEnvSpecStaticValue({ rawValue: text(), _location: location() });
   }
-  __name(peg$f11, "peg$f11");
-  function peg$f12(name, args) {
+  __name(peg$f10, "peg$f10");
+  function peg$f11(name, args) {
     return new ParsedEnvSpecFunctionCall({
       name,
       args,
       _location: location()
     });
   }
-  __name(peg$f12, "peg$f12");
-  function peg$f13(key, val) {
+  __name(peg$f11, "peg$f11");
+  function peg$f12(key, val) {
     return new ParsedEnvSpecKeyValuePair({ key, val });
   }
-  __name(peg$f13, "peg$f13");
-  function peg$f14(values) {
+  __name(peg$f12, "peg$f12");
+  function peg$f13(values) {
     return new ParsedEnvSpecFunctionArgs({
       values: values || [],
       _location: location()
     });
   }
-  __name(peg$f14, "peg$f14");
-  function peg$f15() {
+  __name(peg$f13, "peg$f13");
+  function peg$f14() {
     return new ParsedEnvSpecStaticValue({ rawValue: text(), _location: location() });
   }
-  __name(peg$f15, "peg$f15");
-  function peg$f16(leadingSpace, contents) {
+  __name(peg$f14, "peg$f14");
+  function peg$f15(leadingSpace, contents) {
     return new ParsedEnvSpecDivider({
       contents,
       leadingSpace,
       _location: location()
     });
   }
+  __name(peg$f15, "peg$f15");
+  function peg$f16() {
+    return new ParsedEnvSpecStaticValue({ rawValue: text(), _location: location() });
+  }
   __name(peg$f16, "peg$f16");
   function peg$f17() {
     return new ParsedEnvSpecStaticValue({ rawValue: text(), _location: location() });
   }
   __name(peg$f17, "peg$f17");
-  function peg$f18() {
-    return new ParsedEnvSpecStaticValue({ rawValue: text(), _location: location() });
+  function peg$f18(quote) {
+    return new ParsedEnvSpecStaticValue({ quote, rawValue: text(), _location: location() });
   }
   __name(peg$f18, "peg$f18");
   function peg$f19(quote) {
@@ -439,7 +448,7 @@ function peg$parse(input, options) {
   }
   __name(peg$f20, "peg$f20");
   function peg$f21(quote) {
-    return new ParsedEnvSpecStaticValue({ quote, rawValue: text(), _location: location() });
+    return new ParsedEnvSpecStaticValue({ quote, isMultiLine: true, rawValue: text(), _location: location() });
   }
   __name(peg$f21, "peg$f21");
   function peg$f22(quote) {
@@ -454,10 +463,6 @@ function peg$parse(input, options) {
     return new ParsedEnvSpecStaticValue({ quote, isMultiLine: true, rawValue: text(), _location: location() });
   }
   __name(peg$f24, "peg$f24");
-  function peg$f25(quote) {
-    return new ParsedEnvSpecStaticValue({ quote, isMultiLine: true, rawValue: text(), _location: location() });
-  }
-  __name(peg$f25, "peg$f25");
   let peg$currPos = options.peg$currPos | 0;
   let peg$savedPos = peg$currPos;
   const peg$posDetailsCache = [{ line: 1, column: 1 }];
@@ -678,12 +683,9 @@ function peg$parse(input, options) {
     s0 = peg$currPos;
     s1 = [];
     s2 = peg$currPos;
-    s3 = peg$parseIgnoredDecoratorComment();
+    s3 = peg$parseDecoratorComment();
     if (s3 === peg$FAILED) {
-      s3 = peg$parseDecoratorComment();
-      if (s3 === peg$FAILED) {
-        s3 = peg$parseComment();
-      }
+      s3 = peg$parseComment();
     }
     if (s3 !== peg$FAILED) {
       if (input.charCodeAt(peg$currPos) === 10) {
@@ -708,12 +710,9 @@ function peg$parse(input, options) {
     while (s2 !== peg$FAILED) {
       s1.push(s2);
       s2 = peg$currPos;
-      s3 = peg$parseIgnoredDecoratorComment();
+      s3 = peg$parseDecoratorComment();
       if (s3 === peg$FAILED) {
-        s3 = peg$parseDecoratorComment();
-        if (s3 === peg$FAILED) {
-          s3 = peg$parseComment();
-        }
+        s3 = peg$parseComment();
       }
       if (s3 !== peg$FAILED) {
         if (input.charCodeAt(peg$currPos) === 10) {
@@ -778,12 +777,9 @@ function peg$parse(input, options) {
         }
         peg$parse_();
         s9 = peg$currPos;
-        s10 = peg$parseIgnoredDecoratorComment();
+        s10 = peg$parseDecoratorComment();
         if (s10 === peg$FAILED) {
-          s10 = peg$parseDecoratorComment();
-          if (s10 === peg$FAILED) {
-            s10 = peg$parseComment();
-          }
+          s10 = peg$parseComment();
         }
         if (s10 !== peg$FAILED) {
           s9 = s10;
@@ -883,12 +879,9 @@ function peg$parse(input, options) {
     s0 = peg$currPos;
     s1 = [];
     s2 = peg$currPos;
-    s3 = peg$parseIgnoredDecoratorComment();
+    s3 = peg$parseDecoratorComment();
     if (s3 === peg$FAILED) {
-      s3 = peg$parseDecoratorComment();
-      if (s3 === peg$FAILED) {
-        s3 = peg$parseComment();
-      }
+      s3 = peg$parseComment();
     }
     if (s3 !== peg$FAILED) {
       s4 = peg$parse_n();
@@ -906,12 +899,9 @@ function peg$parse(input, options) {
       while (s2 !== peg$FAILED) {
         s1.push(s2);
         s2 = peg$currPos;
-        s3 = peg$parseIgnoredDecoratorComment();
+        s3 = peg$parseDecoratorComment();
         if (s3 === peg$FAILED) {
-          s3 = peg$parseDecoratorComment();
-          if (s3 === peg$FAILED) {
-            s3 = peg$parseComment();
-          }
+          s3 = peg$parseComment();
         }
         if (s3 !== peg$FAILED) {
           s4 = peg$parse_n();
@@ -1043,7 +1033,7 @@ function peg$parse(input, options) {
     return s0;
   }
   __name(peg$parseComment, "peg$parseComment");
-  function peg$parseIgnoredDecoratorComment() {
+  function peg$parseDecoratorComment() {
     let s0, s1, s2, s3, s4, s5, s6, s7, s8, s9, s10;
     s0 = peg$currPos;
     if (input.charCodeAt(peg$currPos) === 35) {
@@ -1059,65 +1049,55 @@ function peg$parse(input, options) {
       s2 = peg$currPos;
       s3 = peg$parse_();
       s2 = input.substring(s2, peg$currPos);
-      s3 = peg$currPos;
-      s4 = peg$currPos;
-      if (input.charCodeAt(peg$currPos) === 64) {
-        s5 = peg$c4;
-        peg$currPos++;
-      } else {
-        s5 = peg$FAILED;
-        if (peg$silentFails === 0) {
-          peg$fail(peg$e6);
-        }
-      }
-      if (s5 !== peg$FAILED) {
-        s6 = [];
-        s7 = input.charAt(peg$currPos);
-        if (peg$r3.test(s7)) {
-          peg$currPos++;
-        } else {
-          s7 = peg$FAILED;
-          if (peg$silentFails === 0) {
-            peg$fail(peg$e8);
+      s3 = peg$parseDecorator();
+      if (s3 !== peg$FAILED) {
+        s4 = [];
+        s5 = peg$currPos;
+        s6 = peg$parse__();
+        if (s6 !== peg$FAILED) {
+          s7 = peg$parseDecorator();
+          if (s7 !== peg$FAILED) {
+            s5 = s7;
+          } else {
+            peg$currPos = s5;
+            s5 = peg$FAILED;
           }
+        } else {
+          peg$currPos = s5;
+          s5 = peg$FAILED;
         }
-        if (s7 !== peg$FAILED) {
-          while (s7 !== peg$FAILED) {
-            s6.push(s7);
-            s7 = input.charAt(peg$currPos);
-            if (peg$r3.test(s7)) {
-              peg$currPos++;
+        while (s5 !== peg$FAILED) {
+          s4.push(s5);
+          s5 = peg$currPos;
+          s6 = peg$parse__();
+          if (s6 !== peg$FAILED) {
+            s7 = peg$parseDecorator();
+            if (s7 !== peg$FAILED) {
+              s5 = s7;
             } else {
-              s7 = peg$FAILED;
-              if (peg$silentFails === 0) {
-                peg$fail(peg$e8);
-              }
+              peg$currPos = s5;
+              s5 = peg$FAILED;
             }
+          } else {
+            peg$currPos = s5;
+            s5 = peg$FAILED;
           }
-        } else {
-          s6 = peg$FAILED;
         }
+        s5 = peg$currPos;
+        s6 = peg$parse__();
         if (s6 !== peg$FAILED) {
-          if (input.charCodeAt(peg$currPos) === 58) {
-            s7 = peg$c5;
+          s7 = peg$currPos;
+          s8 = [];
+          s9 = input.charAt(peg$currPos);
+          if (peg$r2.test(s9)) {
             peg$currPos++;
           } else {
-            s7 = peg$FAILED;
+            s9 = peg$FAILED;
             if (peg$silentFails === 0) {
-              peg$fail(peg$e9);
+              peg$fail(peg$e7);
             }
           }
-          if (s7 !== peg$FAILED) {
-            s8 = [];
-            s9 = input.charAt(peg$currPos);
-            if (peg$r2.test(s9)) {
-              peg$currPos++;
-            } else {
-              s9 = peg$FAILED;
-              if (peg$silentFails === 0) {
-                peg$fail(peg$e7);
-              }
-            }
+          if (s9 !== peg$FAILED) {
             while (s9 !== peg$FAILED) {
               s8.push(s9);
               s9 = input.charAt(peg$currPos);
@@ -1130,163 +1110,14 @@ function peg$parse(input, options) {
                 }
               }
             }
-            s5 = [s5, s6, s7, s8];
-            s4 = s5;
           } else {
-            peg$currPos = s4;
-            s4 = peg$FAILED;
+            s8 = peg$FAILED;
           }
-        } else {
-          peg$currPos = s4;
-          s4 = peg$FAILED;
-        }
-      } else {
-        peg$currPos = s4;
-        s4 = peg$FAILED;
-      }
-      if (s4 === peg$FAILED) {
-        s4 = peg$currPos;
-        if (input.charCodeAt(peg$currPos) === 64) {
-          s5 = peg$c4;
-          peg$currPos++;
-        } else {
-          s5 = peg$FAILED;
-          if (peg$silentFails === 0) {
-            peg$fail(peg$e6);
-          }
-        }
-        if (s5 !== peg$FAILED) {
-          s6 = [];
-          s7 = input.charAt(peg$currPos);
-          if (peg$r3.test(s7)) {
-            peg$currPos++;
-          } else {
-            s7 = peg$FAILED;
-            if (peg$silentFails === 0) {
-              peg$fail(peg$e8);
-            }
-          }
-          if (s7 !== peg$FAILED) {
-            while (s7 !== peg$FAILED) {
-              s6.push(s7);
-              s7 = input.charAt(peg$currPos);
-              if (peg$r3.test(s7)) {
-                peg$currPos++;
-              } else {
-                s7 = peg$FAILED;
-                if (peg$silentFails === 0) {
-                  peg$fail(peg$e8);
-                }
-              }
-            }
-          } else {
-            s6 = peg$FAILED;
-          }
-          if (s6 !== peg$FAILED) {
-            s7 = peg$parse__();
-            if (s7 !== peg$FAILED) {
-              s8 = peg$currPos;
-              peg$silentFails++;
-              s9 = input.charAt(peg$currPos);
-              if (peg$r4.test(s9)) {
-                peg$currPos++;
-              } else {
-                s9 = peg$FAILED;
-                if (peg$silentFails === 0) {
-                  peg$fail(peg$e10);
-                }
-              }
-              peg$silentFails--;
-              if (s9 === peg$FAILED) {
-                s8 = void 0;
-              } else {
-                peg$currPos = s8;
-                s8 = peg$FAILED;
-              }
-              if (s8 !== peg$FAILED) {
-                s9 = [];
-                s10 = input.charAt(peg$currPos);
-                if (peg$r2.test(s10)) {
-                  peg$currPos++;
-                } else {
-                  s10 = peg$FAILED;
-                  if (peg$silentFails === 0) {
-                    peg$fail(peg$e7);
-                  }
-                }
-                while (s10 !== peg$FAILED) {
-                  s9.push(s10);
-                  s10 = input.charAt(peg$currPos);
-                  if (peg$r2.test(s10)) {
-                    peg$currPos++;
-                  } else {
-                    s10 = peg$FAILED;
-                    if (peg$silentFails === 0) {
-                      peg$fail(peg$e7);
-                    }
-                  }
-                }
-                s5 = [s5, s6, s7, s8, s9];
-                s4 = s5;
-              } else {
-                peg$currPos = s4;
-                s4 = peg$FAILED;
-              }
-            } else {
-              peg$currPos = s4;
-              s4 = peg$FAILED;
-            }
+          if (s8 !== peg$FAILED) {
+            s7 = input.substring(s7, peg$currPos);
           } else {
-            peg$currPos = s4;
-            s4 = peg$FAILED;
+            s7 = s8;
           }
-        } else {
-          peg$currPos = s4;
-          s4 = peg$FAILED;
-        }
-      }
-      if (s4 !== peg$FAILED) {
-        s3 = input.substring(s3, peg$currPos);
-      } else {
-        s3 = s4;
-      }
-      if (s3 !== peg$FAILED) {
-        peg$savedPos = s0;
-        s0 = peg$f5(s2, s3);
-      } else {
-        peg$currPos = s0;
-        s0 = peg$FAILED;
-      }
-    } else {
-      peg$currPos = s0;
-      s0 = peg$FAILED;
-    }
-    return s0;
-  }
-  __name(peg$parseIgnoredDecoratorComment, "peg$parseIgnoredDecoratorComment");
-  function peg$parseDecoratorComment() {
-    let s0, s1, s2, s3, s4, s5, s6, s7, s8, s9, s10;
-    s0 = peg$currPos;
-    if (input.charCodeAt(peg$currPos) === 35) {
-      s1 = peg$c3;
-      peg$currPos++;
-    } else {
-      s1 = peg$FAILED;
-      if (peg$silentFails === 0) {
-        peg$fail(peg$e5);
-      }
-    }
-    if (s1 !== peg$FAILED) {
-      s2 = peg$currPos;
-      s3 = peg$parse_();
-      s2 = input.substring(s2, peg$currPos);
-      s3 = peg$parseDecorator();
-      if (s3 !== peg$FAILED) {
-        s4 = [];
-        s5 = peg$currPos;
-        s6 = peg$parse__();
-        if (s6 !== peg$FAILED) {
-          s7 = peg$parseDecorator();
           if (s7 !== peg$FAILED) {
             s5 = s7;
           } else {
@@ -1297,48 +1128,21 @@ function peg$parse(input, options) {
           peg$currPos = s5;
           s5 = peg$FAILED;
         }
-        while (s5 !== peg$FAILED) {
-          s4.push(s5);
+        if (s5 === peg$FAILED) {
           s5 = peg$currPos;
-          s6 = peg$parse__();
-          if (s6 !== peg$FAILED) {
-            s7 = peg$parseDecorator();
-            if (s7 !== peg$FAILED) {
-              s5 = s7;
-            } else {
-              peg$currPos = s5;
-              s5 = peg$FAILED;
-            }
-          } else {
-            peg$currPos = s5;
-            s5 = peg$FAILED;
-          }
-        }
-        s5 = peg$parse_();
-        s6 = peg$currPos;
-        s7 = peg$currPos;
-        if (input.charCodeAt(peg$currPos) === 35) {
-          s8 = peg$c3;
-          peg$currPos++;
-        } else {
-          s8 = peg$FAILED;
-          if (peg$silentFails === 0) {
-            peg$fail(peg$e5);
-          }
-        }
-        if (s8 !== peg$FAILED) {
-          s9 = [];
-          s10 = input.charAt(peg$currPos);
-          if (peg$r2.test(s10)) {
+          s6 = peg$currPos;
+          s7 = peg$currPos;
+          if (input.charCodeAt(peg$currPos) === 35) {
+            s8 = peg$c3;
             peg$currPos++;
           } else {
-            s10 = peg$FAILED;
+            s8 = peg$FAILED;
             if (peg$silentFails === 0) {
-              peg$fail(peg$e7);
+              peg$fail(peg$e5);
             }
           }
-          while (s10 !== peg$FAILED) {
-            s9.push(s10);
+          if (s8 !== peg$FAILED) {
+            s9 = [];
             s10 = input.charAt(peg$currPos);
             if (peg$r2.test(s10)) {
               peg$currPos++;
@@ -1348,19 +1152,42 @@ function peg$parse(input, options) {
                 peg$fail(peg$e7);
               }
             }
+            while (s10 !== peg$FAILED) {
+              s9.push(s10);
+              s10 = input.charAt(peg$currPos);
+              if (peg$r2.test(s10)) {
+                peg$currPos++;
+              } else {
+                s10 = peg$FAILED;
+                if (peg$silentFails === 0) {
+                  peg$fail(peg$e7);
+                }
+              }
+            }
+            s8 = [s8, s9];
+            s7 = s8;
+          } else {
+            peg$currPos = s7;
+            s7 = peg$FAILED;
+          }
+          if (s7 !== peg$FAILED) {
+            s6 = input.substring(s6, peg$currPos);
+          } else {
+            s6 = s7;
+          }
+          if (s6 !== peg$FAILED) {
+            s5 = s6;
+          } else {
+            peg$currPos = s5;
+            s5 = peg$FAILED;
           }
-          s8 = [s8, s9];
-          s7 = s8;
-        } else {
-          peg$currPos = s7;
-          s7 = peg$FAILED;
         }
-        if (s7 === peg$FAILED) {
-          s7 = null;
+        if (s5 === peg$FAILED) {
+          s5 = null;
         }
-        s6 = input.substring(s6, peg$currPos);
+        s6 = peg$parse_();
         peg$savedPos = s0;
-        s0 = peg$f6(s2, s3, s4, s6);
+        s0 = peg$f5(s2, s3, s4, s5);
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -1417,7 +1244,7 @@ function peg$parse(input, options) {
           s3 = null;
         }
         peg$savedPos = s0;
-        s0 = peg$f7(s2, s3);
+        s0 = peg$f6(s2, s3);
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -1445,23 +1272,23 @@ function peg$parse(input, options) {
     if (s2 !== peg$FAILED) {
       s3 = [];
       s4 = input.charAt(peg$currPos);
-      if (peg$r5.test(s4)) {
+      if (peg$r4.test(s4)) {
         peg$currPos++;
       } else {
         s4 = peg$FAILED;
         if (peg$silentFails === 0) {
-          peg$fail(peg$e11);
+          peg$fail(peg$e9);
         }
       }
       while (s4 !== peg$FAILED) {
         s3.push(s4);
         s4 = input.charAt(peg$currPos);
-        if (peg$r5.test(s4)) {
+        if (peg$r4.test(s4)) {
           peg$currPos++;
         } else {
           s4 = peg$FAILED;
           if (peg$silentFails === 0) {
-            peg$fail(peg$e11);
+            peg$fail(peg$e9);
           }
         }
       }
@@ -1499,7 +1326,7 @@ function peg$parse(input, options) {
       s2 = peg$parseDecoratorFunctionArgs();
       if (s2 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f8(s1, s2);
+        s0 = peg$f7(s1, s2);
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -1515,12 +1342,12 @@ function peg$parse(input, options) {
     let s0, s1, s3, s4, s5, s6, s7, s8, s9;
     s0 = peg$currPos;
     if (input.charCodeAt(peg$currPos) === 40) {
-      s1 = peg$c6;
+      s1 = peg$c5;
       peg$currPos++;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) {
-        peg$fail(peg$e12);
+        peg$fail(peg$e10);
       }
     }
     if (s1 !== peg$FAILED) {
@@ -1543,7 +1370,7 @@ function peg$parse(input, options) {
           s8 = peg$parseDecoratorFunctionArgValue();
           if (s8 !== peg$FAILED) {
             peg$savedPos = s5;
-            s5 = peg$f9(s6, s8);
+            s5 = peg$f8(s6, s8);
           } else {
             peg$currPos = s5;
             s5 = peg$FAILED;
@@ -1565,12 +1392,12 @@ function peg$parse(input, options) {
         s6 = peg$currPos;
         s7 = peg$parse_decWs();
         if (input.charCodeAt(peg$currPos) === 44) {
-          s8 = peg$c7;
+          s8 = peg$c6;
           peg$currPos++;
         } else {
           s8 = peg$FAILED;
           if (peg$silentFails === 0) {
-            peg$fail(peg$e13);
+            peg$fail(peg$e11);
           }
         }
         if (s8 !== peg$FAILED) {
@@ -1598,7 +1425,7 @@ function peg$parse(input, options) {
               s9 = peg$parseDecoratorFunctionArgValue();
               if (s9 !== peg$FAILED) {
                 peg$savedPos = s6;
-                s6 = peg$f9(s7, s9);
+                s6 = peg$f8(s7, s9);
               } else {
                 peg$currPos = s6;
                 s6 = peg$FAILED;
@@ -1636,12 +1463,12 @@ function peg$parse(input, options) {
       s4 = peg$currPos;
       s5 = peg$parse_decWs();
       if (input.charCodeAt(peg$currPos) === 44) {
-        s6 = peg$c7;
+        s6 = peg$c6;
         peg$currPos++;
       } else {
         s6 = peg$FAILED;
         if (peg$silentFails === 0) {
-          peg$fail(peg$e13);
+          peg$fail(peg$e11);
         }
       }
       if (s6 !== peg$FAILED) {
@@ -1656,17 +1483,17 @@ function peg$parse(input, options) {
       }
       s5 = peg$parse_decWs();
       if (input.charCodeAt(peg$currPos) === 41) {
-        s6 = peg$c8;
+        s6 = peg$c7;
         peg$currPos++;
       } else {
         s6 = peg$FAILED;
         if (peg$silentFails === 0) {
-          peg$fail(peg$e14);
+          peg$fail(peg$e12);
         }
       }
       if (s6 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f10(s3);
+        s0 = peg$f9(s3);
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -1688,24 +1515,24 @@ function peg$parse(input, options) {
         s1 = peg$currPos;
         s2 = [];
         s3 = input.charAt(peg$currPos);
-        if (peg$r6.test(s3)) {
+        if (peg$r5.test(s3)) {
           peg$currPos++;
         } else {
           s3 = peg$FAILED;
           if (peg$silentFails === 0) {
-            peg$fail(peg$e15);
+            peg$fail(peg$e13);
           }
         }
         if (s3 !== peg$FAILED) {
           while (s3 !== peg$FAILED) {
             s2.push(s3);
             s3 = input.charAt(peg$currPos);
-            if (peg$r6.test(s3)) {
+            if (peg$r5.test(s3)) {
               peg$currPos++;
             } else {
               s3 = peg$FAILED;
               if (peg$silentFails === 0) {
-                peg$fail(peg$e15);
+                peg$fail(peg$e13);
               }
             }
           }
@@ -1719,7 +1546,7 @@ function peg$parse(input, options) {
         }
         if (s1 !== peg$FAILED) {
           peg$savedPos = s0;
-          s1 = peg$f11();
+          s1 = peg$f10();
         }
         s0 = s1;
       }
@@ -1731,12 +1558,12 @@ function peg$parse(input, options) {
     let s0, s1, s2, s3, s4, s5, s6;
     s0 = [];
     s1 = input.charAt(peg$currPos);
-    if (peg$r7.test(s1)) {
+    if (peg$r6.test(s1)) {
       peg$currPos++;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) {
-        peg$fail(peg$e16);
+        peg$fail(peg$e14);
       }
     }
     if (s1 === peg$FAILED) {
@@ -1753,23 +1580,23 @@ function peg$parse(input, options) {
       if (s2 !== peg$FAILED) {
         s3 = [];
         s4 = input.charAt(peg$currPos);
-        if (peg$r7.test(s4)) {
+        if (peg$r6.test(s4)) {
           peg$currPos++;
         } else {
           s4 = peg$FAILED;
           if (peg$silentFails === 0) {
-            peg$fail(peg$e16);
+            peg$fail(peg$e14);
           }
         }
         while (s4 !== peg$FAILED) {
           s3.push(s4);
           s4 = input.charAt(peg$currPos);
-          if (peg$r7.test(s4)) {
+          if (peg$r6.test(s4)) {
             peg$currPos++;
           } else {
             s4 = peg$FAILED;
             if (peg$silentFails === 0) {
-              peg$fail(peg$e16);
+              peg$fail(peg$e14);
             }
           }
         }
@@ -1785,23 +1612,23 @@ function peg$parse(input, options) {
         if (s4 !== peg$FAILED) {
           s5 = [];
           s6 = input.charAt(peg$currPos);
-          if (peg$r7.test(s6)) {
+          if (peg$r6.test(s6)) {
             peg$currPos++;
           } else {
             s6 = peg$FAILED;
             if (peg$silentFails === 0) {
-              peg$fail(peg$e16);
+              peg$fail(peg$e14);
             }
           }
           while (s6 !== peg$FAILED) {
             s5.push(s6);
             s6 = input.charAt(peg$currPos);
-            if (peg$r7.test(s6)) {
+            if (peg$r6.test(s6)) {
               peg$currPos++;
             } else {
               s6 = peg$FAILED;
               if (peg$silentFails === 0) {
-                peg$fail(peg$e16);
+                peg$fail(peg$e14);
               }
             }
           }
@@ -1819,12 +1646,12 @@ function peg$parse(input, options) {
     while (s1 !== peg$FAILED) {
       s0.push(s1);
       s1 = input.charAt(peg$currPos);
-      if (peg$r7.test(s1)) {
+      if (peg$r6.test(s1)) {
         peg$currPos++;
       } else {
         s1 = peg$FAILED;
         if (peg$silentFails === 0) {
-          peg$fail(peg$e16);
+          peg$fail(peg$e14);
         }
       }
       if (s1 === peg$FAILED) {
@@ -1841,23 +1668,23 @@ function peg$parse(input, options) {
         if (s2 !== peg$FAILED) {
           s3 = [];
           s4 = input.charAt(peg$currPos);
-          if (peg$r7.test(s4)) {
+          if (peg$r6.test(s4)) {
             peg$currPos++;
           } else {
             s4 = peg$FAILED;
             if (peg$silentFails === 0) {
-              peg$fail(peg$e16);
+              peg$fail(peg$e14);
             }
           }
           while (s4 !== peg$FAILED) {
             s3.push(s4);
             s4 = input.charAt(peg$currPos);
-            if (peg$r7.test(s4)) {
+            if (peg$r6.test(s4)) {
               peg$currPos++;
             } else {
               s4 = peg$FAILED;
               if (peg$silentFails === 0) {
-                peg$fail(peg$e16);
+                peg$fail(peg$e14);
               }
             }
           }
@@ -1873,23 +1700,23 @@ function peg$parse(input, options) {
           if (s4 !== peg$FAILED) {
             s5 = [];
             s6 = input.charAt(peg$currPos);
-            if (peg$r7.test(s6)) {
+            if (peg$r6.test(s6)) {
               peg$currPos++;
             } else {
               s6 = peg$FAILED;
               if (peg$silentFails === 0) {
-                peg$fail(peg$e16);
+                peg$fail(peg$e14);
               }
             }
             while (s6 !== peg$FAILED) {
               s5.push(s6);
               s6 = input.charAt(peg$currPos);
-              if (peg$r7.test(s6)) {
+              if (peg$r6.test(s6)) {
                 peg$currPos++;
               } else {
                 s6 = peg$FAILED;
                 if (peg$silentFails === 0) {
-                  peg$fail(peg$e16);
+                  peg$fail(peg$e14);
                 }
               }
             }
@@ -1916,7 +1743,7 @@ function peg$parse(input, options) {
       s2 = peg$parseFunctionArgs();
       if (s2 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f12(s1, s2);
+        s0 = peg$f11(s1, s2);
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -1944,23 +1771,23 @@ function peg$parse(input, options) {
     if (s2 !== peg$FAILED) {
       s3 = [];
       s4 = input.charAt(peg$currPos);
-      if (peg$r5.test(s4)) {
+      if (peg$r7.test(s4)) {
         peg$currPos++;
       } else {
         s4 = peg$FAILED;
         if (peg$silentFails === 0) {
-          peg$fail(peg$e11);
+          peg$fail(peg$e15);
         }
       }
       while (s4 !== peg$FAILED) {
         s3.push(s4);
         s4 = input.charAt(peg$currPos);
-        if (peg$r5.test(s4)) {
+        if (peg$r7.test(s4)) {
           peg$currPos++;
         } else {
           s4 = peg$FAILED;
           if (peg$silentFails === 0) {
-            peg$fail(peg$e11);
+            peg$fail(peg$e15);
           }
         }
       }
@@ -1982,12 +1809,12 @@ function peg$parse(input, options) {
     let s0, s1, s3, s4, s5, s6, s7, s8, s9;
     s0 = peg$currPos;
     if (input.charCodeAt(peg$currPos) === 40) {
-      s1 = peg$c6;
+      s1 = peg$c5;
       peg$currPos++;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) {
-        peg$fail(peg$e12);
+        peg$fail(peg$e10);
       }
     }
     if (s1 !== peg$FAILED) {
@@ -2010,7 +1837,7 @@ function peg$parse(input, options) {
           s8 = peg$parseFunctionArgValue();
           if (s8 !== peg$FAILED) {
             peg$savedPos = s5;
-            s5 = peg$f13(s6, s8);
+            s5 = peg$f12(s6, s8);
           } else {
             peg$currPos = s5;
             s5 = peg$FAILED;
@@ -2032,12 +1859,12 @@ function peg$parse(input, options) {
         s6 = peg$currPos;
         s7 = peg$parse_valWs();
         if (input.charCodeAt(peg$currPos) === 44) {
-          s8 = peg$c7;
+          s8 = peg$c6;
           peg$currPos++;
         } else {
           s8 = peg$FAILED;
           if (peg$silentFails === 0) {
-            peg$fail(peg$e13);
+            peg$fail(peg$e11);
           }
         }
         if (s8 !== peg$FAILED) {
@@ -2065,7 +1892,7 @@ function peg$parse(input, options) {
               s9 = peg$parseFunctionArgValue();
               if (s9 !== peg$FAILED) {
                 peg$savedPos = s6;
-                s6 = peg$f13(s7, s9);
+                s6 = peg$f12(s7, s9);
               } else {
                 peg$currPos = s6;
                 s6 = peg$FAILED;
@@ -2103,12 +1930,12 @@ function peg$parse(input, options) {
       s4 = peg$currPos;
       s5 = peg$parse_valWs();
       if (input.charCodeAt(peg$currPos) === 44) {
-        s6 = peg$c7;
+        s6 = peg$c6;
         peg$currPos++;
       } else {
         s6 = peg$FAILED;
         if (peg$silentFails === 0) {
-          peg$fail(peg$e13);
+          peg$fail(peg$e11);
         }
       }
       if (s6 !== peg$FAILED) {
@@ -2123,17 +1950,17 @@ function peg$parse(input, options) {
       }
       s5 = peg$parse_valWs();
       if (input.charCodeAt(peg$currPos) === 41) {
-        s6 = peg$c8;
+        s6 = peg$c7;
         peg$currPos++;
       } else {
         s6 = peg$FAILED;
         if (peg$silentFails === 0) {
-          peg$fail(peg$e14);
+          peg$fail(peg$e12);
         }
       }
       if (s6 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f14(s3);
+        s0 = peg$f13(s3);
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -2161,23 +1988,23 @@ function peg$parse(input, options) {
     if (s2 !== peg$FAILED) {
       s3 = [];
       s4 = input.charAt(peg$currPos);
-      if (peg$r5.test(s4)) {
+      if (peg$r7.test(s4)) {
         peg$currPos++;
       } else {
         s4 = peg$FAILED;
         if (peg$silentFails === 0) {
-          peg$fail(peg$e11);
+          peg$fail(peg$e15);
         }
       }
       while (s4 !== peg$FAILED) {
         s3.push(s4);
         s4 = input.charAt(peg$currPos);
-        if (peg$r5.test(s4)) {
+        if (peg$r7.test(s4)) {
           peg$currPos++;
         } else {
           s4 = peg$FAILED;
           if (peg$silentFails === 0) {
-            peg$fail(peg$e11);
+            peg$fail(peg$e15);
           }
         }
       }
@@ -2205,24 +2032,24 @@ function peg$parse(input, options) {
         s1 = peg$currPos;
         s2 = [];
         s3 = input.charAt(peg$currPos);
-        if (peg$r6.test(s3)) {
+        if (peg$r5.test(s3)) {
           peg$currPos++;
         } else {
           s3 = peg$FAILED;
           if (peg$silentFails === 0) {
-            peg$fail(peg$e15);
+            peg$fail(peg$e13);
           }
         }
         if (s3 !== peg$FAILED) {
           while (s3 !== peg$FAILED) {
             s2.push(s3);
             s3 = input.charAt(peg$currPos);
-            if (peg$r6.test(s3)) {
+            if (peg$r5.test(s3)) {
               peg$currPos++;
             } else {
               s3 = peg$FAILED;
               if (peg$silentFails === 0) {
-                peg$fail(peg$e15);
+                peg$fail(peg$e13);
               }
             }
           }
@@ -2236,7 +2063,7 @@ function peg$parse(input, options) {
         }
         if (s1 !== peg$FAILED) {
           peg$savedPos = s0;
-          s1 = peg$f15();
+          s1 = peg$f14();
         }
         s0 = s1;
       }
@@ -2253,7 +2080,7 @@ function peg$parse(input, options) {
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) {
-        peg$fail(peg$e17);
+        peg$fail(peg$e16);
       }
     }
     while (s1 !== peg$FAILED) {
@@ -2264,7 +2091,7 @@ function peg$parse(input, options) {
       } else {
         s1 = peg$FAILED;
         if (peg$silentFails === 0) {
-          peg$fail(peg$e17);
+          peg$fail(peg$e16);
         }
       }
     }
@@ -2297,7 +2124,7 @@ function peg$parse(input, options) {
       } else {
         s7 = peg$FAILED;
         if (peg$silentFails === 0) {
-          peg$fail(peg$e18);
+          peg$fail(peg$e17);
         }
       }
       while (s7 !== peg$FAILED) {
@@ -2308,7 +2135,7 @@ function peg$parse(input, options) {
         } else {
           s7 = peg$FAILED;
           if (peg$silentFails === 0) {
-            peg$fail(peg$e18);
+            peg$fail(peg$e17);
           }
         }
       }
@@ -2356,7 +2183,7 @@ function peg$parse(input, options) {
         s4 = peg$parse_n();
         if (s4 !== peg$FAILED) {
           peg$savedPos = s0;
-          s0 = peg$f16(s2, s3);
+          s0 = peg$f15(s2, s3);
         } else {
           peg$currPos = s0;
           s0 = peg$FAILED;
@@ -2386,7 +2213,7 @@ function peg$parse(input, options) {
     } else {
       s5 = peg$FAILED;
       if (peg$silentFails === 0) {
-        peg$fail(peg$e19);
+        peg$fail(peg$e18);
       }
     }
     peg$silentFails--;
@@ -2404,7 +2231,7 @@ function peg$parse(input, options) {
       } else {
         s6 = peg$FAILED;
         if (peg$silentFails === 0) {
-          peg$fail(peg$e20);
+          peg$fail(peg$e19);
         }
       }
       if (s6 !== peg$FAILED) {
@@ -2416,7 +2243,7 @@ function peg$parse(input, options) {
           } else {
             s6 = peg$FAILED;
             if (peg$silentFails === 0) {
-              peg$fail(peg$e20);
+              peg$fail(peg$e19);
             }
           }
         }
@@ -2441,7 +2268,7 @@ function peg$parse(input, options) {
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f17();
+      s1 = peg$f16();
     }
     s0 = s1;
     return s0;
@@ -2460,7 +2287,7 @@ function peg$parse(input, options) {
     } else {
       s4 = peg$FAILED;
       if (peg$silentFails === 0) {
-        peg$fail(peg$e19);
+        peg$fail(peg$e18);
       }
     }
     peg$silentFails--;
@@ -2478,7 +2305,7 @@ function peg$parse(input, options) {
       } else {
         s5 = peg$FAILED;
         if (peg$silentFails === 0) {
-          peg$fail(peg$e21);
+          peg$fail(peg$e20);
         }
       }
       if (s5 !== peg$FAILED) {
@@ -2490,7 +2317,7 @@ function peg$parse(input, options) {
           } else {
             s5 = peg$FAILED;
             if (peg$silentFails === 0) {
-              peg$fail(peg$e21);
+              peg$fail(peg$e20);
             }
           }
         }
@@ -2515,7 +2342,7 @@ function peg$parse(input, options) {
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f18();
+      s1 = peg$f17();
     }
     s0 = s1;
     return s0;
@@ -2542,18 +2369,18 @@ function peg$parse(input, options) {
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) {
-        peg$fail(peg$e22);
+        peg$fail(peg$e21);
       }
     }
     if (s1 !== peg$FAILED) {
       s2 = [];
-      if (input.substr(peg$currPos, 2) === peg$c9) {
-        s3 = peg$c9;
+      if (input.substr(peg$currPos, 2) === peg$c8) {
+        s3 = peg$c8;
         peg$currPos += 2;
       } else {
         s3 = peg$FAILED;
         if (peg$silentFails === 0) {
-          peg$fail(peg$e23);
+          peg$fail(peg$e22);
         }
       }
       if (s3 === peg$FAILED) {
@@ -2563,19 +2390,19 @@ function peg$parse(input, options) {
         } else {
           s3 = peg$FAILED;
           if (peg$silentFails === 0) {
-            peg$fail(peg$e24);
+            peg$fail(peg$e23);
           }
         }
       }
       while (s3 !== peg$FAILED) {
         s2.push(s3);
-        if (input.substr(peg$currPos, 2) === peg$c9) {
-          s3 = peg$c9;
+        if (input.substr(peg$currPos, 2) === peg$c8) {
+          s3 = peg$c8;
           peg$currPos += 2;
         } else {
           s3 = peg$FAILED;
           if (peg$silentFails === 0) {
-            peg$fail(peg$e23);
+            peg$fail(peg$e22);
           }
         }
         if (s3 === peg$FAILED) {
@@ -2585,7 +2412,7 @@ function peg$parse(input, options) {
           } else {
             s3 = peg$FAILED;
             if (peg$silentFails === 0) {
-              peg$fail(peg$e24);
+              peg$fail(peg$e23);
             }
           }
         }
@@ -2596,12 +2423,12 @@ function peg$parse(input, options) {
       } else {
         s3 = peg$FAILED;
         if (peg$silentFails === 0) {
-          peg$fail(peg$e22);
+          peg$fail(peg$e21);
         }
       }
       if (s3 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f19(s1);
+        s0 = peg$f18(s1);
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -2622,18 +2449,18 @@ function peg$parse(input, options) {
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) {
-        peg$fail(peg$e25);
+        peg$fail(peg$e24);
       }
     }
     if (s1 !== peg$FAILED) {
       s2 = [];
-      if (input.substr(peg$currPos, 2) === peg$c10) {
-        s3 = peg$c10;
+      if (input.substr(peg$currPos, 2) === peg$c9) {
+        s3 = peg$c9;
         peg$currPos += 2;
       } else {
         s3 = peg$FAILED;
         if (peg$silentFails === 0) {
-          peg$fail(peg$e26);
+          peg$fail(peg$e25);
         }
       }
       if (s3 === peg$FAILED) {
@@ -2643,19 +2470,19 @@ function peg$parse(input, options) {
         } else {
           s3 = peg$FAILED;
           if (peg$silentFails === 0) {
-            peg$fail(peg$e27);
+            peg$fail(peg$e26);
           }
         }
       }
       while (s3 !== peg$FAILED) {
         s2.push(s3);
-        if (input.substr(peg$currPos, 2) === peg$c10) {
-          s3 = peg$c10;
+        if (input.substr(peg$currPos, 2) === peg$c9) {
+          s3 = peg$c9;
           peg$currPos += 2;
         } else {
           s3 = peg$FAILED;
           if (peg$silentFails === 0) {
-            peg$fail(peg$e26);
+            peg$fail(peg$e25);
           }
         }
         if (s3 === peg$FAILED) {
@@ -2665,7 +2492,7 @@ function peg$parse(input, options) {
           } else {
             s3 = peg$FAILED;
             if (peg$silentFails === 0) {
-              peg$fail(peg$e27);
+              peg$fail(peg$e26);
             }
           }
         }
@@ -2676,12 +2503,12 @@ function peg$parse(input, options) {
       } else {
         s3 = peg$FAILED;
         if (peg$silentFails === 0) {
-          peg$fail(peg$e25);
+          peg$fail(peg$e24);
         }
       }
       if (s3 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f20(s1);
+        s0 = peg$f19(s1);
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -2702,18 +2529,18 @@ function peg$parse(input, options) {
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) {
-        peg$fail(peg$e28);
+        peg$fail(peg$e27);
       }
     }
     if (s1 !== peg$FAILED) {
       s2 = [];
-      if (input.substr(peg$currPos, 2) === peg$c11) {
-        s3 = peg$c11;
+      if (input.substr(peg$currPos, 2) === peg$c10) {
+        s3 = peg$c10;
         peg$currPos += 2;
       } else {
         s3 = peg$FAILED;
         if (peg$silentFails === 0) {
-          peg$fail(peg$e29);
+          peg$fail(peg$e28);
         }
       }
       if (s3 === peg$FAILED) {
@@ -2723,19 +2550,19 @@ function peg$parse(input, options) {
         } else {
           s3 = peg$FAILED;
           if (peg$silentFails === 0) {
-            peg$fail(peg$e30);
+            peg$fail(peg$e29);
           }
         }
       }
       while (s3 !== peg$FAILED) {
         s2.push(s3);
-        if (input.substr(peg$currPos, 2) === peg$c11) {
-          s3 = peg$c11;
+        if (input.substr(peg$currPos, 2) === peg$c10) {
+          s3 = peg$c10;
           peg$currPos += 2;
         } else {
           s3 = peg$FAILED;
           if (peg$silentFails === 0) {
-            peg$fail(peg$e29);
+            peg$fail(peg$e28);
           }
         }
         if (s3 === peg$FAILED) {
@@ -2745,7 +2572,7 @@ function peg$parse(input, options) {
           } else {
             s3 = peg$FAILED;
             if (peg$silentFails === 0) {
-              peg$fail(peg$e30);
+              peg$fail(peg$e29);
             }
           }
         }
@@ -2756,12 +2583,12 @@ function peg$parse(input, options) {
       } else {
         s3 = peg$FAILED;
         if (peg$silentFails === 0) {
-          peg$fail(peg$e28);
+          peg$fail(peg$e27);
         }
       }
       if (s3 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f21(s1);
+        s0 = peg$f20(s1);
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -2797,20 +2624,20 @@ function peg$parse(input, options) {
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) {
-        peg$fail(peg$e25);
+        peg$fail(peg$e24);
       }
     }
     if (s1 !== peg$FAILED) {
       s2 = [];
       s3 = peg$currPos;
       s4 = [];
-      if (input.substr(peg$currPos, 2) === peg$c10) {
-        s5 = peg$c10;
+      if (input.substr(peg$currPos, 2) === peg$c9) {
+        s5 = peg$c9;
         peg$currPos += 2;
       } else {
         s5 = peg$FAILED;
         if (peg$silentFails === 0) {
-          peg$fail(peg$e26);
+          peg$fail(peg$e25);
         }
       }
       if (s5 === peg$FAILED) {
@@ -2820,19 +2647,19 @@ function peg$parse(input, options) {
         } else {
           s5 = peg$FAILED;
           if (peg$silentFails === 0) {
-            peg$fail(peg$e27);
+            peg$fail(peg$e26);
           }
         }
       }
       while (s5 !== peg$FAILED) {
         s4.push(s5);
-        if (input.substr(peg$currPos, 2) === peg$c10) {
-          s5 = peg$c10;
+        if (input.substr(peg$currPos, 2) === peg$c9) {
+          s5 = peg$c9;
           peg$currPos += 2;
         } else {
           s5 = peg$FAILED;
           if (peg$silentFails === 0) {
-            peg$fail(peg$e26);
+            peg$fail(peg$e25);
           }
         }
         if (s5 === peg$FAILED) {
@@ -2842,7 +2669,7 @@ function peg$parse(input, options) {
           } else {
             s5 = peg$FAILED;
             if (peg$silentFails === 0) {
-              peg$fail(peg$e27);
+              peg$fail(peg$e26);
             }
           }
         }
@@ -2868,13 +2695,13 @@ function peg$parse(input, options) {
           s2.push(s3);
           s3 = peg$currPos;
           s4 = [];
-          if (input.substr(peg$currPos, 2) === peg$c10) {
-            s5 = peg$c10;
+          if (input.substr(peg$currPos, 2) === peg$c9) {
+            s5 = peg$c9;
             peg$currPos += 2;
           } else {
             s5 = peg$FAILED;
             if (peg$silentFails === 0) {
-              peg$fail(peg$e26);
+              peg$fail(peg$e25);
             }
           }
           if (s5 === peg$FAILED) {
@@ -2884,19 +2711,19 @@ function peg$parse(input, options) {
             } else {
               s5 = peg$FAILED;
               if (peg$silentFails === 0) {
-                peg$fail(peg$e27);
+                peg$fail(peg$e26);
               }
             }
           }
           while (s5 !== peg$FAILED) {
             s4.push(s5);
-            if (input.substr(peg$currPos, 2) === peg$c10) {
-              s5 = peg$c10;
+            if (input.substr(peg$currPos, 2) === peg$c9) {
+              s5 = peg$c9;
               peg$currPos += 2;
             } else {
               s5 = peg$FAILED;
               if (peg$silentFails === 0) {
-                peg$fail(peg$e26);
+                peg$fail(peg$e25);
               }
             }
             if (s5 === peg$FAILED) {
@@ -2906,7 +2733,7 @@ function peg$parse(input, options) {
               } else {
                 s5 = peg$FAILED;
                 if (peg$silentFails === 0) {
-                  peg$fail(peg$e27);
+                  peg$fail(peg$e26);
                 }
               }
             }
@@ -2933,13 +2760,13 @@ function peg$parse(input, options) {
       }
       if (s2 !== peg$FAILED) {
         s3 = [];
-        if (input.substr(peg$currPos, 2) === peg$c10) {
-          s4 = peg$c10;
+        if (input.substr(peg$currPos, 2) === peg$c9) {
+          s4 = peg$c9;
           peg$currPos += 2;
         } else {
           s4 = peg$FAILED;
           if (peg$silentFails === 0) {
-            peg$fail(peg$e26);
+            peg$fail(peg$e25);
           }
         }
         if (s4 === peg$FAILED) {
@@ -2949,19 +2776,19 @@ function peg$parse(input, options) {
           } else {
             s4 = peg$FAILED;
             if (peg$silentFails === 0) {
-              peg$fail(peg$e27);
+              peg$fail(peg$e26);
             }
           }
         }
         while (s4 !== peg$FAILED) {
           s3.push(s4);
-          if (input.substr(peg$currPos, 2) === peg$c10) {
-            s4 = peg$c10;
+          if (input.substr(peg$currPos, 2) === peg$c9) {
+            s4 = peg$c9;
             peg$currPos += 2;
           } else {
             s4 = peg$FAILED;
             if (peg$silentFails === 0) {
-              peg$fail(peg$e26);
+              peg$fail(peg$e25);
             }
           }
           if (s4 === peg$FAILED) {
@@ -2971,7 +2798,7 @@ function peg$parse(input, options) {
             } else {
               s4 = peg$FAILED;
               if (peg$silentFails === 0) {
-                peg$fail(peg$e27);
+                peg$fail(peg$e26);
               }
             }
           }
@@ -2982,12 +2809,12 @@ function peg$parse(input, options) {
         } else {
           s4 = peg$FAILED;
           if (peg$silentFails === 0) {
-            peg$fail(peg$e25);
+            peg$fail(peg$e24);
           }
         }
         if (s4 !== peg$FAILED) {
           peg$savedPos = s0;
-          s0 = peg$f22(s1);
+          s0 = peg$f21(s1);
         } else {
           peg$currPos = s0;
           s0 = peg$FAILED;
@@ -3012,20 +2839,20 @@ function peg$parse(input, options) {
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) {
-        peg$fail(peg$e22);
+        peg$fail(peg$e21);
       }
     }
     if (s1 !== peg$FAILED) {
       s2 = [];
       s3 = peg$currPos;
       s4 = [];
-      if (input.substr(peg$currPos, 2) === peg$c9) {
-        s5 = peg$c9;
+      if (input.substr(peg$currPos, 2) === peg$c8) {
+        s5 = peg$c8;
         peg$currPos += 2;
       } else {
         s5 = peg$FAILED;
         if (peg$silentFails === 0) {
-          peg$fail(peg$e23);
+          peg$fail(peg$e22);
         }
       }
       if (s5 === peg$FAILED) {
@@ -3035,19 +2862,19 @@ function peg$parse(input, options) {
         } else {
           s5 = peg$FAILED;
           if (peg$silentFails === 0) {
-            peg$fail(peg$e24);
+            peg$fail(peg$e23);
           }
         }
       }
       while (s5 !== peg$FAILED) {
         s4.push(s5);
-        if (input.substr(peg$currPos, 2) === peg$c9) {
-          s5 = peg$c9;
+        if (input.substr(peg$currPos, 2) === peg$c8) {
+          s5 = peg$c8;
           peg$currPos += 2;
         } else {
           s5 = peg$FAILED;
           if (peg$silentFails === 0) {
-            peg$fail(peg$e23);
+            peg$fail(peg$e22);
           }
         }
         if (s5 === peg$FAILED) {
@@ -3057,7 +2884,7 @@ function peg$parse(input, options) {
           } else {
             s5 = peg$FAILED;
             if (peg$silentFails === 0) {
-              peg$fail(peg$e24);
+              peg$fail(peg$e23);
             }
           }
         }
@@ -3083,13 +2910,13 @@ function peg$parse(input, options) {
           s2.push(s3);
           s3 = peg$currPos;
           s4 = [];
-          if (input.substr(peg$currPos, 2) === peg$c9) {
-            s5 = peg$c9;
+          if (input.substr(peg$currPos, 2) === peg$c8) {
+            s5 = peg$c8;
             peg$currPos += 2;
           } else {
             s5 = peg$FAILED;
             if (peg$silentFails === 0) {
-              peg$fail(peg$e23);
+              peg$fail(peg$e22);
             }
           }
           if (s5 === peg$FAILED) {
@@ -3099,19 +2926,19 @@ function peg$parse(input, options) {
             } else {
               s5 = peg$FAILED;
               if (peg$silentFails === 0) {
-                peg$fail(peg$e24);
+                peg$fail(peg$e23);
               }
             }
           }
           while (s5 !== peg$FAILED) {
             s4.push(s5);
-            if (input.substr(peg$currPos, 2) === peg$c9) {
-              s5 = peg$c9;
+            if (input.substr(peg$currPos, 2) === peg$c8) {
+              s5 = peg$c8;
               peg$currPos += 2;
             } else {
               s5 = peg$FAILED;
               if (peg$silentFails === 0) {
-                peg$fail(peg$e23);
+                peg$fail(peg$e22);
               }
             }
             if (s5 === peg$FAILED) {
@@ -3121,7 +2948,7 @@ function peg$parse(input, options) {
               } else {
                 s5 = peg$FAILED;
                 if (peg$silentFails === 0) {
-                  peg$fail(peg$e24);
+                  peg$fail(peg$e23);
                 }
               }
             }
@@ -3148,13 +2975,13 @@ function peg$parse(input, options) {
       }
       if (s2 !== peg$FAILED) {
         s3 = [];
-        if (input.substr(peg$currPos, 2) === peg$c9) {
-          s4 = peg$c9;
+        if (input.substr(peg$currPos, 2) === peg$c8) {
+          s4 = peg$c8;
           peg$currPos += 2;
         } else {
           s4 = peg$FAILED;
           if (peg$silentFails === 0) {
-            peg$fail(peg$e23);
+            peg$fail(peg$e22);
           }
         }
         if (s4 === peg$FAILED) {
@@ -3164,19 +2991,19 @@ function peg$parse(input, options) {
           } else {
             s4 = peg$FAILED;
             if (peg$silentFails === 0) {
-              peg$fail(peg$e24);
+              peg$fail(peg$e23);
             }
           }
         }
         while (s4 !== peg$FAILED) {
           s3.push(s4);
-          if (input.substr(peg$currPos, 2) === peg$c9) {
-            s4 = peg$c9;
+          if (input.substr(peg$currPos, 2) === peg$c8) {
+            s4 = peg$c8;
             peg$currPos += 2;
           } else {
             s4 = peg$FAILED;
             if (peg$silentFails === 0) {
-              peg$fail(peg$e23);
+              peg$fail(peg$e22);
             }
           }
           if (s4 === peg$FAILED) {
@@ -3186,7 +3013,7 @@ function peg$parse(input, options) {
             } else {
               s4 = peg$FAILED;
               if (peg$silentFails === 0) {
-                peg$fail(peg$e24);
+                peg$fail(peg$e23);
               }
             }
           }
@@ -3197,12 +3024,12 @@ function peg$parse(input, options) {
         } else {
           s4 = peg$FAILED;
           if (peg$silentFails === 0) {
-            peg$fail(peg$e22);
+            peg$fail(peg$e21);
           }
         }
         if (s4 !== peg$FAILED) {
           peg$savedPos = s0;
-          s0 = peg$f23(s1);
+          s0 = peg$f22(s1);
         } else {
           peg$currPos = s0;
           s0 = peg$FAILED;
@@ -3221,39 +3048,39 @@ function peg$parse(input, options) {
   function peg$parsetripleDQuotedMultiLineString() {
     let s0, s1, s2, s3, s4, s5, s6, s7;
     s0 = peg$currPos;
-    if (input.substr(peg$currPos, 3) === peg$c12) {
-      s1 = peg$c12;
+    if (input.substr(peg$currPos, 3) === peg$c11) {
+      s1 = peg$c11;
       peg$currPos += 3;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) {
-        peg$fail(peg$e31);
+        peg$fail(peg$e30);
       }
     }
     if (s1 !== peg$FAILED) {
       s2 = [];
       s3 = peg$currPos;
       s4 = [];
-      if (input.substr(peg$currPos, 4) === peg$c13) {
-        s5 = peg$c13;
+      if (input.substr(peg$currPos, 4) === peg$c12) {
+        s5 = peg$c12;
         peg$currPos += 4;
       } else {
         s5 = peg$FAILED;
         if (peg$silentFails === 0) {
-          peg$fail(peg$e32);
+          peg$fail(peg$e31);
         }
       }
       if (s5 === peg$FAILED) {
         s5 = peg$currPos;
         s6 = peg$currPos;
         peg$silentFails++;
-        if (input.substr(peg$currPos, 3) === peg$c12) {
-          s7 = peg$c12;
+        if (input.substr(peg$currPos, 3) === peg$c11) {
+          s7 = peg$c11;
           peg$currPos += 3;
         } else {
           s7 = peg$FAILED;
           if (peg$silentFails === 0) {
-            peg$fail(peg$e31);
+            peg$fail(peg$e30);
           }
         }
         peg$silentFails--;
@@ -3287,26 +3114,26 @@ function peg$parse(input, options) {
       }
       while (s5 !== peg$FAILED) {
         s4.push(s5);
-        if (input.substr(peg$currPos, 4) === peg$c13) {
-          s5 = peg$c13;
+        if (input.substr(peg$currPos, 4) === peg$c12) {
+          s5 = peg$c12;
           peg$currPos += 4;
         } else {
           s5 = peg$FAILED;
           if (peg$silentFails === 0) {
-            peg$fail(peg$e32);
+            peg$fail(peg$e31);
           }
         }
         if (s5 === peg$FAILED) {
           s5 = peg$currPos;
           s6 = peg$currPos;
           peg$silentFails++;
-          if (input.substr(peg$currPos, 3) === peg$c12) {
-            s7 = peg$c12;
+          if (input.substr(peg$currPos, 3) === peg$c11) {
+            s7 = peg$c11;
             peg$currPos += 3;
           } else {
             s7 = peg$FAILED;
             if (peg$silentFails === 0) {
-              peg$fail(peg$e31);
+              peg$fail(peg$e30);
             }
           }
           peg$silentFails--;
@@ -3360,26 +3187,26 @@ function peg$parse(input, options) {
           s2.push(s3);
           s3 = peg$currPos;
           s4 = [];
-          if (input.substr(peg$currPos, 4) === peg$c13) {
-            s5 = peg$c13;
+          if (input.substr(peg$currPos, 4) === peg$c12) {
+            s5 = peg$c12;
             peg$currPos += 4;
           } else {
             s5 = peg$FAILED;
             if (peg$silentFails === 0) {
-              peg$fail(peg$e32);
+              peg$fail(peg$e31);
             }
           }
           if (s5 === peg$FAILED) {
             s5 = peg$currPos;
             s6 = peg$currPos;
             peg$silentFails++;
-            if (input.substr(peg$currPos, 3) === peg$c12) {
-              s7 = peg$c12;
+            if (input.substr(peg$currPos, 3) === peg$c11) {
+              s7 = peg$c11;
               peg$currPos += 3;
             } else {
               s7 = peg$FAILED;
               if (peg$silentFails === 0) {
-                peg$fail(peg$e31);
+                peg$fail(peg$e30);
               }
             }
             peg$silentFails--;
@@ -3413,26 +3240,26 @@ function peg$parse(input, options) {
           }
           while (s5 !== peg$FAILED) {
             s4.push(s5);
-            if (input.substr(peg$currPos, 4) === peg$c13) {
-              s5 = peg$c13;
+            if (input.substr(peg$currPos, 4) === peg$c12) {
+              s5 = peg$c12;
               peg$currPos += 4;
             } else {
               s5 = peg$FAILED;
               if (peg$silentFails === 0) {
-                peg$fail(peg$e32);
+                peg$fail(peg$e31);
               }
             }
             if (s5 === peg$FAILED) {
               s5 = peg$currPos;
               s6 = peg$currPos;
               peg$silentFails++;
-              if (input.substr(peg$currPos, 3) === peg$c12) {
-                s7 = peg$c12;
+              if (input.substr(peg$currPos, 3) === peg$c11) {
+                s7 = peg$c11;
                 peg$currPos += 3;
               } else {
                 s7 = peg$FAILED;
                 if (peg$silentFails === 0) {
-                  peg$fail(peg$e31);
+                  peg$fail(peg$e30);
                 }
               }
               peg$silentFails--;
@@ -3487,26 +3314,26 @@ function peg$parse(input, options) {
       }
       if (s2 !== peg$FAILED) {
         s3 = [];
-        if (input.substr(peg$currPos, 4) === peg$c13) {
-          s4 = peg$c13;
+        if (input.substr(peg$currPos, 4) === peg$c12) {
+          s4 = peg$c12;
           peg$currPos += 4;
         } else {
           s4 = peg$FAILED;
           if (peg$silentFails === 0) {
-            peg$fail(peg$e32);
+            peg$fail(peg$e31);
           }
         }
         if (s4 === peg$FAILED) {
           s4 = peg$currPos;
           s5 = peg$currPos;
           peg$silentFails++;
-          if (input.substr(peg$currPos, 3) === peg$c12) {
-            s6 = peg$c12;
+          if (input.substr(peg$currPos, 3) === peg$c11) {
+            s6 = peg$c11;
             peg$currPos += 3;
           } else {
             s6 = peg$FAILED;
             if (peg$silentFails === 0) {
-              peg$fail(peg$e31);
+              peg$fail(peg$e30);
             }
           }
           peg$silentFails--;
@@ -3540,26 +3367,26 @@ function peg$parse(input, options) {
         }
         while (s4 !== peg$FAILED) {
           s3.push(s4);
-          if (input.substr(peg$currPos, 4) === peg$c13) {
-            s4 = peg$c13;
+          if (input.substr(peg$currPos, 4) === peg$c12) {
+            s4 = peg$c12;
             peg$currPos += 4;
           } else {
             s4 = peg$FAILED;
             if (peg$silentFails === 0) {
-              peg$fail(peg$e32);
+              peg$fail(peg$e31);
             }
           }
           if (s4 === peg$FAILED) {
             s4 = peg$currPos;
             s5 = peg$currPos;
             peg$silentFails++;
-            if (input.substr(peg$currPos, 3) === peg$c12) {
-              s6 = peg$c12;
+            if (input.substr(peg$currPos, 3) === peg$c11) {
+              s6 = peg$c11;
               peg$currPos += 3;
             } else {
               s6 = peg$FAILED;
               if (peg$silentFails === 0) {
-                peg$fail(peg$e31);
+                peg$fail(peg$e30);
               }
             }
             peg$silentFails--;
@@ -3592,18 +3419,18 @@ function peg$parse(input, options) {
             }
           }
         }
-        if (input.substr(peg$currPos, 3) === peg$c12) {
-          s4 = peg$c12;
+        if (input.substr(peg$currPos, 3) === peg$c11) {
+          s4 = peg$c11;
           peg$currPos += 3;
         } else {
           s4 = peg$FAILED;
           if (peg$silentFails === 0) {
-            peg$fail(peg$e31);
+            peg$fail(peg$e30);
           }
         }
         if (s4 !== peg$FAILED) {
           peg$savedPos = s0;
-          s0 = peg$f24(s1);
+          s0 = peg$f23(s1);
         } else {
           peg$currPos = s0;
           s0 = peg$FAILED;
@@ -3622,39 +3449,39 @@ function peg$parse(input, options) {
   function peg$parsetripleBQuotedMultiLineString() {
     let s0, s1, s2, s3, s4, s5, s6, s7;
     s0 = peg$currPos;
-    if (input.substr(peg$currPos, 3) === peg$c14) {
-      s1 = peg$c14;
+    if (input.substr(peg$currPos, 3) === peg$c13) {
+      s1 = peg$c13;
       peg$currPos += 3;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) {
-        peg$fail(peg$e33);
+        peg$fail(peg$e32);
       }
     }
     if (s1 !== peg$FAILED) {
       s2 = [];
       s3 = peg$currPos;
       s4 = [];
-      if (input.substr(peg$currPos, 4) === peg$c15) {
-        s5 = peg$c15;
+      if (input.substr(peg$currPos, 4) === peg$c14) {
+        s5 = peg$c14;
         peg$currPos += 4;
       } else {
         s5 = peg$FAILED;
         if (peg$silentFails === 0) {
-          peg$fail(peg$e34);
+          peg$fail(peg$e33);
         }
       }
       if (s5 === peg$FAILED) {
         s5 = peg$currPos;
         s6 = peg$currPos;
         peg$silentFails++;
-        if (input.substr(peg$currPos, 3) === peg$c14) {
-          s7 = peg$c14;
+        if (input.substr(peg$currPos, 3) === peg$c13) {
+          s7 = peg$c13;
           peg$currPos += 3;
         } else {
           s7 = peg$FAILED;
           if (peg$silentFails === 0) {
-            peg$fail(peg$e33);
+            peg$fail(peg$e32);
           }
         }
         peg$silentFails--;
@@ -3688,26 +3515,26 @@ function peg$parse(input, options) {
       }
       while (s5 !== peg$FAILED) {
         s4.push(s5);
-        if (input.substr(peg$currPos, 4) === peg$c15) {
-          s5 = peg$c15;
+        if (input.substr(peg$currPos, 4) === peg$c14) {
+          s5 = peg$c14;
           peg$currPos += 4;
         } else {
           s5 = peg$FAILED;
           if (peg$silentFails === 0) {
-            peg$fail(peg$e34);
+            peg$fail(peg$e33);
           }
         }
         if (s5 === peg$FAILED) {
           s5 = peg$currPos;
           s6 = peg$currPos;
           peg$silentFails++;
-          if (input.substr(peg$currPos, 3) === peg$c14) {
-            s7 = peg$c14;
+          if (input.substr(peg$currPos, 3) === peg$c13) {
+            s7 = peg$c13;
             peg$currPos += 3;
           } else {
             s7 = peg$FAILED;
             if (peg$silentFails === 0) {
-              peg$fail(peg$e33);
+              peg$fail(peg$e32);
             }
           }
           peg$silentFails--;
@@ -3761,26 +3588,26 @@ function peg$parse(input, options) {
           s2.push(s3);
           s3 = peg$currPos;
           s4 = [];
-          if (input.substr(peg$currPos, 4) === peg$c15) {
-            s5 = peg$c15;
+          if (input.substr(peg$currPos, 4) === peg$c14) {
+            s5 = peg$c14;
             peg$currPos += 4;
           } else {
             s5 = peg$FAILED;
             if (peg$silentFails === 0) {
-              peg$fail(peg$e34);
+              peg$fail(peg$e33);
             }
           }
           if (s5 === peg$FAILED) {
             s5 = peg$currPos;
             s6 = peg$currPos;
             peg$silentFails++;
-            if (input.substr(peg$currPos, 3) === peg$c14) {
-              s7 = peg$c14;
+            if (input.substr(peg$currPos, 3) === peg$c13) {
+              s7 = peg$c13;
               peg$currPos += 3;
             } else {
               s7 = peg$FAILED;
               if (peg$silentFails === 0) {
-                peg$fail(peg$e33);
+                peg$fail(peg$e32);
               }
             }
             peg$silentFails--;
@@ -3814,26 +3641,26 @@ function peg$parse(input, options) {
           }
           while (s5 !== peg$FAILED) {
             s4.push(s5);
-            if (input.substr(peg$currPos, 4) === peg$c15) {
-              s5 = peg$c15;
+            if (input.substr(peg$currPos, 4) === peg$c14) {
+              s5 = peg$c14;
               peg$currPos += 4;
             } else {
               s5 = peg$FAILED;
               if (peg$silentFails === 0) {
-                peg$fail(peg$e34);
+                peg$fail(peg$e33);
               }
             }
             if (s5 === peg$FAILED) {
               s5 = peg$currPos;
               s6 = peg$currPos;
               peg$silentFails++;
-              if (input.substr(peg$currPos, 3) === peg$c14) {
-                s7 = peg$c14;
+              if (input.substr(peg$currPos, 3) === peg$c13) {
+                s7 = peg$c13;
                 peg$currPos += 3;
               } else {
                 s7 = peg$FAILED;
                 if (peg$silentFails === 0) {
-                  peg$fail(peg$e33);
+                  peg$fail(peg$e32);
                 }
               }
               peg$silentFails--;
@@ -3888,26 +3715,26 @@ function peg$parse(input, options) {
       }
       if (s2 !== peg$FAILED) {
         s3 = [];
-        if (input.substr(peg$currPos, 4) === peg$c15) {
-          s4 = peg$c15;
+        if (input.substr(peg$currPos, 4) === peg$c14) {
+          s4 = peg$c14;
           peg$currPos += 4;
         } else {
           s4 = peg$FAILED;
           if (peg$silentFails === 0) {
-            peg$fail(peg$e34);
+            peg$fail(peg$e33);
           }
         }
         if (s4 === peg$FAILED) {
           s4 = peg$currPos;
           s5 = peg$currPos;
           peg$silentFails++;
-          if (input.substr(peg$currPos, 3) === peg$c14) {
-            s6 = peg$c14;
+          if (input.substr(peg$currPos, 3) === peg$c13) {
+            s6 = peg$c13;
             peg$currPos += 3;
           } else {
             s6 = peg$FAILED;
             if (peg$silentFails === 0) {
-              peg$fail(peg$e33);
+              peg$fail(peg$e32);
             }
           }
           peg$silentFails--;
@@ -3941,26 +3768,26 @@ function peg$parse(input, options) {
         }
         while (s4 !== peg$FAILED) {
           s3.push(s4);
-          if (input.substr(peg$currPos, 4) === peg$c15) {
-            s4 = peg$c15;
+          if (input.substr(peg$currPos, 4) === peg$c14) {
+            s4 = peg$c14;
             peg$currPos += 4;
           } else {
             s4 = peg$FAILED;
             if (peg$silentFails === 0) {
-              peg$fail(peg$e34);
+              peg$fail(peg$e33);
             }
           }
           if (s4 === peg$FAILED) {
             s4 = peg$currPos;
             s5 = peg$currPos;
             peg$silentFails++;
-            if (input.substr(peg$currPos, 3) === peg$c14) {
-              s6 = peg$c14;
+            if (input.substr(peg$currPos, 3) === peg$c13) {
+              s6 = peg$c13;
               peg$currPos += 3;
             } else {
               s6 = peg$FAILED;
               if (peg$silentFails === 0) {
-                peg$fail(peg$e33);
+                peg$fail(peg$e32);
               }
             }
             peg$silentFails--;
@@ -3993,18 +3820,18 @@ function peg$parse(input, options) {
             }
           }
         }
-        if (input.substr(peg$currPos, 3) === peg$c14) {
-          s4 = peg$c14;
+        if (input.substr(peg$currPos, 3) === peg$c13) {
+          s4 = peg$c13;
           peg$currPos += 3;
         } else {
           s4 = peg$FAILED;
           if (peg$silentFails === 0) {
-            peg$fail(peg$e33);
+            peg$fail(peg$e32);
           }
         }
         if (s4 !== peg$FAILED) {
           peg$savedPos = s0;
-          s0 = peg$f25(s1);
+          s0 = peg$f24(s1);
         } else {
           peg$currPos = s0;
           s0 = peg$FAILED;
@@ -4040,7 +3867,7 @@ function peg$parse(input, options) {
       } else {
         s1 = peg$FAILED;
         if (peg$silentFails === 0) {
-          peg$fail(peg$e35);
+          peg$fail(peg$e34);
         }
       }
       peg$silentFails--;
@@ -4058,23 +3885,23 @@ function peg$parse(input, options) {
     let s0, s1;
     s0 = [];
     s1 = input.charAt(peg$currPos);
-    if (peg$r7.test(s1)) {
+    if (peg$r6.test(s1)) {
       peg$currPos++;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) {
-        peg$fail(peg$e16);
+        peg$fail(peg$e14);
       }
     }
     while (s1 !== peg$FAILED) {
       s0.push(s1);
       s1 = input.charAt(peg$currPos);
-      if (peg$r7.test(s1)) {
+      if (peg$r6.test(s1)) {
         peg$currPos++;
       } else {
         s1 = peg$FAILED;
         if (peg$silentFails === 0) {
-          peg$fail(peg$e16);
+          peg$fail(peg$e14);
         }
       }
     }
@@ -4085,24 +3912,24 @@ function peg$parse(input, options) {
     let s0, s1;
     s0 = [];
     s1 = input.charAt(peg$currPos);
-    if (peg$r7.test(s1)) {
+    if (peg$r6.test(s1)) {
       peg$currPos++;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) {
-        peg$fail(peg$e16);
+        peg$fail(peg$e14);
       }
     }
     if (s1 !== peg$FAILED) {
       while (s1 !== peg$FAILED) {
         s0.push(s1);
         s1 = input.charAt(peg$currPos);
-        if (peg$r7.test(s1)) {
+        if (peg$r6.test(s1)) {
           peg$currPos++;
         } else {
           s1 = peg$FAILED;
           if (peg$silentFails === 0) {
-            peg$fail(peg$e16);
+            peg$fail(peg$e14);
           }
         }
       }