@env-spec/parser 0.0.8 → 0.1.0

package/dist/index.mjs

@@ -264,17 +264,18 @@ function peg$parse(input, options) {
   const peg$r4 = /^[@#]/;
   const peg$r5 = /^[a-zA-Z0-9_]/;
   const peg$r6 = /^[^ \n,)]/;
-  const peg$r7 = /^[\-=*#]/;
-  const peg$r8 = /^['"`]/;
-  const peg$r9 = /^[^#\n]/;
-  const peg$r10 = /^[^# \n]/;
-  const peg$r11 = /^["]/;
-  const peg$r12 = /^[^"\n]/;
-  const peg$r13 = /^[']/;
-  const peg$r14 = /^[^'\n]/;
-  const peg$r15 = /^[`]/;
-  const peg$r16 = /^[^`\n]/;
-  const peg$r17 = /^[ \t]/;
+  const peg$r7 = /^[ \t]/;
+  const peg$r8 = /^[ \t\n]/;
+  const peg$r9 = /^[\-=*#]/;
+  const peg$r10 = /^['"`]/;
+  const peg$r11 = /^[^#\n]/;
+  const peg$r12 = /^[^# \n]/;
+  const peg$r13 = /^["]/;
+  const peg$r14 = /^[^"\n]/;
+  const peg$r15 = /^[']/;
+  const peg$r16 = /^[^'\n]/;
+  const peg$r17 = /^[`]/;
+  const peg$r18 = /^[^`\n]/;
   const peg$e0 = peg$literalExpectation("\n", false);
   const peg$e1 = peg$literalExpectation("export ", false);
   const peg$e2 = peg$literalExpectation("=", false);
@@ -291,25 +292,26 @@ function peg$parse(input, options) {
   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(["'", '"', "`"], false, false, false);
-  const peg$e18 = peg$classExpectation(["#", "\n"], true, false, false);
-  const peg$e19 = peg$classExpectation(["#", " ", "\n"], true, false, false);
-  const peg$e20 = peg$classExpectation(['"'], false, false, false);
-  const peg$e21 = peg$literalExpectation('\\"', false);
-  const peg$e22 = peg$classExpectation(['"', "\n"], true, false, false);
-  const peg$e23 = peg$classExpectation(["'"], false, false, false);
-  const peg$e24 = peg$literalExpectation("\\'", false);
-  const peg$e25 = peg$classExpectation(["'", "\n"], true, false, false);
-  const peg$e26 = peg$classExpectation(["`"], false, false, false);
-  const peg$e27 = peg$literalExpectation("\\`", false);
-  const peg$e28 = peg$classExpectation(["`", "\n"], true, false, false);
-  const peg$e29 = peg$literalExpectation('"""', false);
-  const peg$e30 = peg$literalExpectation('\\"""', false);
-  const peg$e31 = peg$literalExpectation("```", false);
-  const peg$e32 = peg$literalExpectation("\\```", false);
-  const peg$e33 = peg$anyExpectation();
-  const peg$e34 = peg$classExpectation([" ", "	"], false, 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();
   function peg$f0() {
     return new ParsedEnvSpecBlankLine({ _location: location() });
   }
@@ -389,50 +391,73 @@ function peg$parse(input, options) {
     return new ParsedEnvSpecStaticValue({ rawValue: text(), _location: location() });
   }
   __name(peg$f11, "peg$f11");
-  function peg$f12(leadingSpace, contents) {
-    return new ParsedEnvSpecDivider({
-      contents,
-      leadingSpace,
+  function peg$f12(name, args) {
+    return new ParsedEnvSpecFunctionCall({
+      name,
+      args,
       _location: location()
     });
   }
   __name(peg$f12, "peg$f12");
-  function peg$f13() {
-    return new ParsedEnvSpecStaticValue({ rawValue: text(), _location: location() });
+  function peg$f13(key, val) {
+    return new ParsedEnvSpecKeyValuePair({ key, val });
   }
   __name(peg$f13, "peg$f13");
-  function peg$f14() {
-    return new ParsedEnvSpecStaticValue({ rawValue: text(), _location: location() });
+  function peg$f14(values) {
+    return new ParsedEnvSpecFunctionArgs({
+      values: values || [],
+      _location: location()
+    });
   }
   __name(peg$f14, "peg$f14");
-  function peg$f15(quote) {
-    return new ParsedEnvSpecStaticValue({ quote, rawValue: text(), _location: location() });
+  function peg$f15() {
+    return new ParsedEnvSpecStaticValue({ rawValue: text(), _location: location() });
   }
   __name(peg$f15, "peg$f15");
-  function peg$f16(quote) {
-    return new ParsedEnvSpecStaticValue({ quote, rawValue: text(), _location: location() });
+  function peg$f16(leadingSpace, contents) {
+    return new ParsedEnvSpecDivider({
+      contents,
+      leadingSpace,
+      _location: location()
+    });
   }
   __name(peg$f16, "peg$f16");
-  function peg$f17(quote) {
-    return new ParsedEnvSpecStaticValue({ quote, rawValue: text(), _location: location() });
+  function peg$f17() {
+    return new ParsedEnvSpecStaticValue({ rawValue: text(), _location: location() });
   }
   __name(peg$f17, "peg$f17");
-  function peg$f18(quote) {
-    return new ParsedEnvSpecStaticValue({ quote, isMultiLine: true, rawValue: text(), _location: location() });
+  function peg$f18() {
+    return new ParsedEnvSpecStaticValue({ rawValue: text(), _location: location() });
   }
   __name(peg$f18, "peg$f18");
   function peg$f19(quote) {
-    return new ParsedEnvSpecStaticValue({ quote, isMultiLine: true, rawValue: text(), _location: location() });
+    return new ParsedEnvSpecStaticValue({ quote, rawValue: text(), _location: location() });
   }
   __name(peg$f19, "peg$f19");
   function peg$f20(quote) {
-    return new ParsedEnvSpecStaticValue({ quote, isMultiLine: true, rawValue: text(), _location: location() });
+    return new ParsedEnvSpecStaticValue({ quote, rawValue: text(), _location: location() });
   }
   __name(peg$f20, "peg$f20");
   function peg$f21(quote) {
-    return new ParsedEnvSpecStaticValue({ quote, isMultiLine: true, rawValue: text(), _location: location() });
+    return new ParsedEnvSpecStaticValue({ quote, rawValue: text(), _location: location() });
   }
   __name(peg$f21, "peg$f21");
+  function peg$f22(quote) {
+    return new ParsedEnvSpecStaticValue({ quote, isMultiLine: true, rawValue: text(), _location: location() });
+  }
+  __name(peg$f22, "peg$f22");
+  function peg$f23(quote) {
+    return new ParsedEnvSpecStaticValue({ quote, isMultiLine: true, rawValue: text(), _location: location() });
+  }
+  __name(peg$f23, "peg$f23");
+  function peg$f24(quote) {
+    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 }];
@@ -1362,7 +1387,7 @@ function peg$parse(input, options) {
     if (s1 !== peg$FAILED) {
       s2 = peg$parseDecoratorName();
       if (s2 !== peg$FAILED) {
-        s3 = peg$parseFunctionArgs();
+        s3 = peg$parseDecoratorFunctionArgs();
         if (s3 === peg$FAILED) {
           s3 = peg$currPos;
           if (input.charCodeAt(peg$currPos) === 61) {
@@ -1423,49 +1448,466 @@ function peg$parse(input, options) {
       if (peg$r5.test(s4)) {
         peg$currPos++;
       } else {
-        s4 = peg$FAILED;
+        s4 = peg$FAILED;
+        if (peg$silentFails === 0) {
+          peg$fail(peg$e11);
+        }
+      }
+      while (s4 !== peg$FAILED) {
+        s3.push(s4);
+        s4 = input.charAt(peg$currPos);
+        if (peg$r5.test(s4)) {
+          peg$currPos++;
+        } else {
+          s4 = peg$FAILED;
+          if (peg$silentFails === 0) {
+            peg$fail(peg$e11);
+          }
+        }
+      }
+      s2 = [s2, s3];
+      s1 = s2;
+    } else {
+      peg$currPos = s1;
+      s1 = peg$FAILED;
+    }
+    if (s1 !== peg$FAILED) {
+      s0 = input.substring(s0, peg$currPos);
+    } else {
+      s0 = s1;
+    }
+    return s0;
+  }
+  __name(peg$parseDecoratorName, "peg$parseDecoratorName");
+  function peg$parseDecoratorValue() {
+    let s0;
+    s0 = peg$parseDecoratorFunctionCall();
+    if (s0 === peg$FAILED) {
+      s0 = peg$parsequotedString();
+      if (s0 === peg$FAILED) {
+        s0 = peg$parseunquotedStringWithoutSpaces();
+      }
+    }
+    return s0;
+  }
+  __name(peg$parseDecoratorValue, "peg$parseDecoratorValue");
+  function peg$parseDecoratorFunctionCall() {
+    let s0, s1, s2;
+    s0 = peg$currPos;
+    s1 = peg$parseFunctionName();
+    if (s1 !== peg$FAILED) {
+      s2 = peg$parseDecoratorFunctionArgs();
+      if (s2 !== peg$FAILED) {
+        peg$savedPos = s0;
+        s0 = peg$f8(s1, s2);
+      } else {
+        peg$currPos = s0;
+        s0 = peg$FAILED;
+      }
+    } else {
+      peg$currPos = s0;
+      s0 = peg$FAILED;
+    }
+    return s0;
+  }
+  __name(peg$parseDecoratorFunctionCall, "peg$parseDecoratorFunctionCall");
+  function peg$parseDecoratorFunctionArgs() {
+    let s0, s1, s3, s4, s5, s6, s7, s8, s9;
+    s0 = peg$currPos;
+    if (input.charCodeAt(peg$currPos) === 40) {
+      s1 = peg$c6;
+      peg$currPos++;
+    } else {
+      s1 = peg$FAILED;
+      if (peg$silentFails === 0) {
+        peg$fail(peg$e12);
+      }
+    }
+    if (s1 !== peg$FAILED) {
+      peg$parse_decWs();
+      s3 = peg$currPos;
+      s4 = [];
+      s5 = peg$currPos;
+      s6 = peg$parseFunctionArgKeyName();
+      if (s6 !== peg$FAILED) {
+        if (input.charCodeAt(peg$currPos) === 61) {
+          s7 = peg$c2;
+          peg$currPos++;
+        } else {
+          s7 = peg$FAILED;
+          if (peg$silentFails === 0) {
+            peg$fail(peg$e2);
+          }
+        }
+        if (s7 !== peg$FAILED) {
+          s8 = peg$parseDecoratorFunctionArgValue();
+          if (s8 !== peg$FAILED) {
+            peg$savedPos = s5;
+            s5 = peg$f9(s6, s8);
+          } else {
+            peg$currPos = s5;
+            s5 = peg$FAILED;
+          }
+        } else {
+          peg$currPos = s5;
+          s5 = peg$FAILED;
+        }
+      } else {
+        peg$currPos = s5;
+        s5 = peg$FAILED;
+      }
+      if (s5 === peg$FAILED) {
+        s5 = peg$parseDecoratorFunctionArgValue();
+      }
+      while (s5 !== peg$FAILED) {
+        s4.push(s5);
+        s5 = peg$currPos;
+        s6 = peg$currPos;
+        s7 = peg$parse_decWs();
+        if (input.charCodeAt(peg$currPos) === 44) {
+          s8 = peg$c7;
+          peg$currPos++;
+        } else {
+          s8 = peg$FAILED;
+          if (peg$silentFails === 0) {
+            peg$fail(peg$e13);
+          }
+        }
+        if (s8 !== peg$FAILED) {
+          s9 = peg$parse_decWs();
+          s7 = [s7, s8, s9];
+          s6 = s7;
+        } else {
+          peg$currPos = s6;
+          s6 = peg$FAILED;
+        }
+        if (s6 !== peg$FAILED) {
+          s6 = peg$currPos;
+          s7 = peg$parseFunctionArgKeyName();
+          if (s7 !== peg$FAILED) {
+            if (input.charCodeAt(peg$currPos) === 61) {
+              s8 = peg$c2;
+              peg$currPos++;
+            } else {
+              s8 = peg$FAILED;
+              if (peg$silentFails === 0) {
+                peg$fail(peg$e2);
+              }
+            }
+            if (s8 !== peg$FAILED) {
+              s9 = peg$parseDecoratorFunctionArgValue();
+              if (s9 !== peg$FAILED) {
+                peg$savedPos = s6;
+                s6 = peg$f9(s7, s9);
+              } else {
+                peg$currPos = s6;
+                s6 = peg$FAILED;
+              }
+            } else {
+              peg$currPos = s6;
+              s6 = peg$FAILED;
+            }
+          } else {
+            peg$currPos = s6;
+            s6 = peg$FAILED;
+          }
+          if (s6 === peg$FAILED) {
+            s6 = peg$parseDecoratorFunctionArgValue();
+          }
+          if (s6 === peg$FAILED) {
+            peg$currPos = s5;
+            s5 = peg$FAILED;
+          } else {
+            s5 = s6;
+          }
+        } else {
+          s5 = s6;
+        }
+      }
+      if (s4.length < 1) {
+        peg$currPos = s3;
+        s3 = peg$FAILED;
+      } else {
+        s3 = s4;
+      }
+      if (s3 === peg$FAILED) {
+        s3 = null;
+      }
+      s4 = peg$currPos;
+      s5 = peg$parse_decWs();
+      if (input.charCodeAt(peg$currPos) === 44) {
+        s6 = peg$c7;
+        peg$currPos++;
+      } else {
+        s6 = peg$FAILED;
+        if (peg$silentFails === 0) {
+          peg$fail(peg$e13);
+        }
+      }
+      if (s6 !== peg$FAILED) {
+        s5 = [s5, s6];
+        s4 = s5;
+      } else {
+        peg$currPos = s4;
+        s4 = peg$FAILED;
+      }
+      if (s4 === peg$FAILED) {
+        s4 = null;
+      }
+      s5 = peg$parse_decWs();
+      if (input.charCodeAt(peg$currPos) === 41) {
+        s6 = peg$c8;
+        peg$currPos++;
+      } else {
+        s6 = peg$FAILED;
+        if (peg$silentFails === 0) {
+          peg$fail(peg$e14);
+        }
+      }
+      if (s6 !== peg$FAILED) {
+        peg$savedPos = s0;
+        s0 = peg$f10(s3);
+      } else {
+        peg$currPos = s0;
+        s0 = peg$FAILED;
+      }
+    } else {
+      peg$currPos = s0;
+      s0 = peg$FAILED;
+    }
+    return s0;
+  }
+  __name(peg$parseDecoratorFunctionArgs, "peg$parseDecoratorFunctionArgs");
+  function peg$parseDecoratorFunctionArgValue() {
+    let s0, s1, s2, s3;
+    s0 = peg$parseDecoratorFunctionCall();
+    if (s0 === peg$FAILED) {
+      s0 = peg$parsequotedString();
+      if (s0 === peg$FAILED) {
+        s0 = peg$currPos;
+        s1 = peg$currPos;
+        s2 = [];
+        s3 = input.charAt(peg$currPos);
+        if (peg$r6.test(s3)) {
+          peg$currPos++;
+        } else {
+          s3 = peg$FAILED;
+          if (peg$silentFails === 0) {
+            peg$fail(peg$e15);
+          }
+        }
+        if (s3 !== peg$FAILED) {
+          while (s3 !== peg$FAILED) {
+            s2.push(s3);
+            s3 = input.charAt(peg$currPos);
+            if (peg$r6.test(s3)) {
+              peg$currPos++;
+            } else {
+              s3 = peg$FAILED;
+              if (peg$silentFails === 0) {
+                peg$fail(peg$e15);
+              }
+            }
+          }
+        } else {
+          s2 = peg$FAILED;
+        }
+        if (s2 !== peg$FAILED) {
+          s1 = input.substring(s1, peg$currPos);
+        } else {
+          s1 = s2;
+        }
+        if (s1 !== peg$FAILED) {
+          peg$savedPos = s0;
+          s1 = peg$f11();
+        }
+        s0 = s1;
+      }
+    }
+    return s0;
+  }
+  __name(peg$parseDecoratorFunctionArgValue, "peg$parseDecoratorFunctionArgValue");
+  function peg$parse_decWs() {
+    let s0, s1, s2, s3, s4, s5, s6;
+    s0 = [];
+    s1 = input.charAt(peg$currPos);
+    if (peg$r7.test(s1)) {
+      peg$currPos++;
+    } else {
+      s1 = peg$FAILED;
+      if (peg$silentFails === 0) {
+        peg$fail(peg$e16);
+      }
+    }
+    if (s1 === peg$FAILED) {
+      s1 = peg$currPos;
+      if (input.charCodeAt(peg$currPos) === 10) {
+        s2 = peg$c0;
+        peg$currPos++;
+      } else {
+        s2 = peg$FAILED;
+        if (peg$silentFails === 0) {
+          peg$fail(peg$e0);
+        }
+      }
+      if (s2 !== peg$FAILED) {
+        s3 = [];
+        s4 = input.charAt(peg$currPos);
+        if (peg$r7.test(s4)) {
+          peg$currPos++;
+        } else {
+          s4 = peg$FAILED;
+          if (peg$silentFails === 0) {
+            peg$fail(peg$e16);
+          }
+        }
+        while (s4 !== peg$FAILED) {
+          s3.push(s4);
+          s4 = input.charAt(peg$currPos);
+          if (peg$r7.test(s4)) {
+            peg$currPos++;
+          } else {
+            s4 = peg$FAILED;
+            if (peg$silentFails === 0) {
+              peg$fail(peg$e16);
+            }
+          }
+        }
+        if (input.charCodeAt(peg$currPos) === 35) {
+          s4 = peg$c3;
+          peg$currPos++;
+        } else {
+          s4 = peg$FAILED;
+          if (peg$silentFails === 0) {
+            peg$fail(peg$e5);
+          }
+        }
+        if (s4 !== peg$FAILED) {
+          s5 = [];
+          s6 = input.charAt(peg$currPos);
+          if (peg$r7.test(s6)) {
+            peg$currPos++;
+          } else {
+            s6 = peg$FAILED;
+            if (peg$silentFails === 0) {
+              peg$fail(peg$e16);
+            }
+          }
+          while (s6 !== peg$FAILED) {
+            s5.push(s6);
+            s6 = input.charAt(peg$currPos);
+            if (peg$r7.test(s6)) {
+              peg$currPos++;
+            } else {
+              s6 = peg$FAILED;
+              if (peg$silentFails === 0) {
+                peg$fail(peg$e16);
+              }
+            }
+          }
+          s2 = [s2, s3, s4, s5];
+          s1 = s2;
+        } else {
+          peg$currPos = s1;
+          s1 = peg$FAILED;
+        }
+      } else {
+        peg$currPos = s1;
+        s1 = peg$FAILED;
+      }
+    }
+    while (s1 !== peg$FAILED) {
+      s0.push(s1);
+      s1 = input.charAt(peg$currPos);
+      if (peg$r7.test(s1)) {
+        peg$currPos++;
+      } else {
+        s1 = peg$FAILED;
         if (peg$silentFails === 0) {
-          peg$fail(peg$e11);
+          peg$fail(peg$e16);
         }
       }
-      while (s4 !== peg$FAILED) {
-        s3.push(s4);
-        s4 = input.charAt(peg$currPos);
-        if (peg$r5.test(s4)) {
+      if (s1 === peg$FAILED) {
+        s1 = peg$currPos;
+        if (input.charCodeAt(peg$currPos) === 10) {
+          s2 = peg$c0;
           peg$currPos++;
         } else {
-          s4 = peg$FAILED;
+          s2 = peg$FAILED;
           if (peg$silentFails === 0) {
-            peg$fail(peg$e11);
+            peg$fail(peg$e0);
           }
         }
-      }
-      s2 = [s2, s3];
-      s1 = s2;
-    } else {
-      peg$currPos = s1;
-      s1 = peg$FAILED;
-    }
-    if (s1 !== peg$FAILED) {
-      s0 = input.substring(s0, peg$currPos);
-    } else {
-      s0 = s1;
-    }
-    return s0;
-  }
-  __name(peg$parseDecoratorName, "peg$parseDecoratorName");
-  function peg$parseDecoratorValue() {
-    let s0;
-    s0 = peg$parseFunctionCall();
-    if (s0 === peg$FAILED) {
-      s0 = peg$parsequotedString();
-      if (s0 === peg$FAILED) {
-        s0 = peg$parseunquotedStringWithoutSpaces();
+        if (s2 !== peg$FAILED) {
+          s3 = [];
+          s4 = input.charAt(peg$currPos);
+          if (peg$r7.test(s4)) {
+            peg$currPos++;
+          } else {
+            s4 = peg$FAILED;
+            if (peg$silentFails === 0) {
+              peg$fail(peg$e16);
+            }
+          }
+          while (s4 !== peg$FAILED) {
+            s3.push(s4);
+            s4 = input.charAt(peg$currPos);
+            if (peg$r7.test(s4)) {
+              peg$currPos++;
+            } else {
+              s4 = peg$FAILED;
+              if (peg$silentFails === 0) {
+                peg$fail(peg$e16);
+              }
+            }
+          }
+          if (input.charCodeAt(peg$currPos) === 35) {
+            s4 = peg$c3;
+            peg$currPos++;
+          } else {
+            s4 = peg$FAILED;
+            if (peg$silentFails === 0) {
+              peg$fail(peg$e5);
+            }
+          }
+          if (s4 !== peg$FAILED) {
+            s5 = [];
+            s6 = input.charAt(peg$currPos);
+            if (peg$r7.test(s6)) {
+              peg$currPos++;
+            } else {
+              s6 = peg$FAILED;
+              if (peg$silentFails === 0) {
+                peg$fail(peg$e16);
+              }
+            }
+            while (s6 !== peg$FAILED) {
+              s5.push(s6);
+              s6 = input.charAt(peg$currPos);
+              if (peg$r7.test(s6)) {
+                peg$currPos++;
+              } else {
+                s6 = peg$FAILED;
+                if (peg$silentFails === 0) {
+                  peg$fail(peg$e16);
+                }
+              }
+            }
+            s2 = [s2, s3, s4, s5];
+            s1 = s2;
+          } else {
+            peg$currPos = s1;
+            s1 = peg$FAILED;
+          }
+        } else {
+          peg$currPos = s1;
+          s1 = peg$FAILED;
+        }
       }
     }
     return s0;
   }
-  __name(peg$parseDecoratorValue, "peg$parseDecoratorValue");
+  __name(peg$parse_decWs, "peg$parse_decWs");
   function peg$parseFunctionCall() {
     let s0, s1, s2;
     s0 = peg$currPos;
@@ -1474,7 +1916,7 @@ function peg$parse(input, options) {
       s2 = peg$parseFunctionArgs();
       if (s2 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f8(s1, s2);
+        s0 = peg$f12(s1, s2);
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -1549,7 +1991,7 @@ function peg$parse(input, options) {
       }
     }
     if (s1 !== peg$FAILED) {
-      peg$parse_();
+      peg$parse_valWs();
       s3 = peg$currPos;
       s4 = [];
       s5 = peg$currPos;
@@ -1568,7 +2010,7 @@ function peg$parse(input, options) {
           s8 = peg$parseFunctionArgValue();
           if (s8 !== peg$FAILED) {
             peg$savedPos = s5;
-            s5 = peg$f9(s6, s8);
+            s5 = peg$f13(s6, s8);
           } else {
             peg$currPos = s5;
             s5 = peg$FAILED;
@@ -1588,7 +2030,7 @@ function peg$parse(input, options) {
         s4.push(s5);
         s5 = peg$currPos;
         s6 = peg$currPos;
-        s7 = peg$parse_();
+        s7 = peg$parse_valWs();
         if (input.charCodeAt(peg$currPos) === 44) {
           s8 = peg$c7;
           peg$currPos++;
@@ -1599,7 +2041,7 @@ function peg$parse(input, options) {
           }
         }
         if (s8 !== peg$FAILED) {
-          s9 = peg$parse_();
+          s9 = peg$parse_valWs();
           s7 = [s7, s8, s9];
           s6 = s7;
         } else {
@@ -1623,7 +2065,7 @@ function peg$parse(input, options) {
               s9 = peg$parseFunctionArgValue();
               if (s9 !== peg$FAILED) {
                 peg$savedPos = s6;
-                s6 = peg$f9(s7, s9);
+                s6 = peg$f13(s7, s9);
               } else {
                 peg$currPos = s6;
                 s6 = peg$FAILED;
@@ -1658,19 +2100,40 @@ function peg$parse(input, options) {
       if (s3 === peg$FAILED) {
         s3 = null;
       }
-      s4 = peg$parse_();
+      s4 = peg$currPos;
+      s5 = peg$parse_valWs();
+      if (input.charCodeAt(peg$currPos) === 44) {
+        s6 = peg$c7;
+        peg$currPos++;
+      } else {
+        s6 = peg$FAILED;
+        if (peg$silentFails === 0) {
+          peg$fail(peg$e13);
+        }
+      }
+      if (s6 !== peg$FAILED) {
+        s5 = [s5, s6];
+        s4 = s5;
+      } else {
+        peg$currPos = s4;
+        s4 = peg$FAILED;
+      }
+      if (s4 === peg$FAILED) {
+        s4 = null;
+      }
+      s5 = peg$parse_valWs();
       if (input.charCodeAt(peg$currPos) === 41) {
-        s5 = peg$c8;
+        s6 = peg$c8;
         peg$currPos++;
       } else {
-        s5 = peg$FAILED;
+        s6 = peg$FAILED;
         if (peg$silentFails === 0) {
           peg$fail(peg$e14);
         }
       }
-      if (s5 !== peg$FAILED) {
+      if (s6 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f10(s3);
+        s0 = peg$f14(s3);
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -1773,7 +2236,7 @@ function peg$parse(input, options) {
         }
         if (s1 !== peg$FAILED) {
           peg$savedPos = s0;
-          s1 = peg$f11();
+          s1 = peg$f15();
         }
         s0 = s1;
       }
@@ -1781,6 +2244,33 @@ function peg$parse(input, options) {
     return s0;
   }
   __name(peg$parseFunctionArgValue, "peg$parseFunctionArgValue");
+  function peg$parse_valWs() {
+    let s0, s1;
+    s0 = [];
+    s1 = input.charAt(peg$currPos);
+    if (peg$r8.test(s1)) {
+      peg$currPos++;
+    } else {
+      s1 = peg$FAILED;
+      if (peg$silentFails === 0) {
+        peg$fail(peg$e17);
+      }
+    }
+    while (s1 !== peg$FAILED) {
+      s0.push(s1);
+      s1 = input.charAt(peg$currPos);
+      if (peg$r8.test(s1)) {
+        peg$currPos++;
+      } else {
+        s1 = peg$FAILED;
+        if (peg$silentFails === 0) {
+          peg$fail(peg$e17);
+        }
+      }
+    }
+    return s0;
+  }
+  __name(peg$parse_valWs, "peg$parse_valWs");
   function peg$parseDivider() {
     let s0, s1, s2, s3, s4, s5, s6, s7;
     s0 = peg$currPos;
@@ -1802,23 +2292,23 @@ function peg$parse(input, options) {
       s5 = peg$currPos;
       s6 = [];
       s7 = input.charAt(peg$currPos);
-      if (peg$r7.test(s7)) {
+      if (peg$r9.test(s7)) {
         peg$currPos++;
       } else {
         s7 = peg$FAILED;
         if (peg$silentFails === 0) {
-          peg$fail(peg$e16);
+          peg$fail(peg$e18);
         }
       }
       while (s7 !== peg$FAILED) {
         s6.push(s7);
         s7 = input.charAt(peg$currPos);
-        if (peg$r7.test(s7)) {
+        if (peg$r9.test(s7)) {
           peg$currPos++;
         } else {
           s7 = peg$FAILED;
           if (peg$silentFails === 0) {
-            peg$fail(peg$e16);
+            peg$fail(peg$e18);
           }
         }
       }
@@ -1866,7 +2356,7 @@ function peg$parse(input, options) {
         s4 = peg$parse_n();
         if (s4 !== peg$FAILED) {
           peg$savedPos = s0;
-          s0 = peg$f12(s2, s3);
+          s0 = peg$f16(s2, s3);
         } else {
           peg$currPos = s0;
           s0 = peg$FAILED;
@@ -1891,12 +2381,12 @@ function peg$parse(input, options) {
     s4 = peg$currPos;
     peg$silentFails++;
     s5 = input.charAt(peg$currPos);
-    if (peg$r8.test(s5)) {
+    if (peg$r10.test(s5)) {
       peg$currPos++;
     } else {
       s5 = peg$FAILED;
       if (peg$silentFails === 0) {
-        peg$fail(peg$e17);
+        peg$fail(peg$e19);
       }
     }
     peg$silentFails--;
@@ -1909,24 +2399,24 @@ function peg$parse(input, options) {
     if (s4 !== peg$FAILED) {
       s5 = [];
       s6 = input.charAt(peg$currPos);
-      if (peg$r9.test(s6)) {
+      if (peg$r11.test(s6)) {
         peg$currPos++;
       } else {
         s6 = peg$FAILED;
         if (peg$silentFails === 0) {
-          peg$fail(peg$e18);
+          peg$fail(peg$e20);
         }
       }
       if (s6 !== peg$FAILED) {
         while (s6 !== peg$FAILED) {
           s5.push(s6);
           s6 = input.charAt(peg$currPos);
-          if (peg$r9.test(s6)) {
+          if (peg$r11.test(s6)) {
             peg$currPos++;
           } else {
             s6 = peg$FAILED;
             if (peg$silentFails === 0) {
-              peg$fail(peg$e18);
+              peg$fail(peg$e20);
             }
           }
         }
@@ -1951,7 +2441,7 @@ function peg$parse(input, options) {
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f13();
+      s1 = peg$f17();
     }
     s0 = s1;
     return s0;
@@ -1965,12 +2455,12 @@ function peg$parse(input, options) {
     s3 = peg$currPos;
     peg$silentFails++;
     s4 = input.charAt(peg$currPos);
-    if (peg$r8.test(s4)) {
+    if (peg$r10.test(s4)) {
       peg$currPos++;
     } else {
       s4 = peg$FAILED;
       if (peg$silentFails === 0) {
-        peg$fail(peg$e17);
+        peg$fail(peg$e19);
       }
     }
     peg$silentFails--;
@@ -1983,24 +2473,24 @@ function peg$parse(input, options) {
     if (s3 !== peg$FAILED) {
       s4 = [];
       s5 = input.charAt(peg$currPos);
-      if (peg$r10.test(s5)) {
+      if (peg$r12.test(s5)) {
         peg$currPos++;
       } else {
         s5 = peg$FAILED;
         if (peg$silentFails === 0) {
-          peg$fail(peg$e19);
+          peg$fail(peg$e21);
         }
       }
       if (s5 !== peg$FAILED) {
         while (s5 !== peg$FAILED) {
           s4.push(s5);
           s5 = input.charAt(peg$currPos);
-          if (peg$r10.test(s5)) {
+          if (peg$r12.test(s5)) {
             peg$currPos++;
           } else {
             s5 = peg$FAILED;
             if (peg$silentFails === 0) {
-              peg$fail(peg$e19);
+              peg$fail(peg$e21);
             }
           }
         }
@@ -2025,7 +2515,7 @@ function peg$parse(input, options) {
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f14();
+      s1 = peg$f18();
     }
     s0 = s1;
     return s0;
@@ -2047,12 +2537,12 @@ function peg$parse(input, options) {
     let s0, s1, s2, s3;
     s0 = peg$currPos;
     s1 = input.charAt(peg$currPos);
-    if (peg$r11.test(s1)) {
+    if (peg$r13.test(s1)) {
       peg$currPos++;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) {
-        peg$fail(peg$e20);
+        peg$fail(peg$e22);
       }
     }
     if (s1 !== peg$FAILED) {
@@ -2063,17 +2553,17 @@ function peg$parse(input, options) {
       } else {
         s3 = peg$FAILED;
         if (peg$silentFails === 0) {
-          peg$fail(peg$e21);
+          peg$fail(peg$e23);
         }
       }
       if (s3 === peg$FAILED) {
         s3 = input.charAt(peg$currPos);
-        if (peg$r12.test(s3)) {
+        if (peg$r14.test(s3)) {
           peg$currPos++;
         } else {
           s3 = peg$FAILED;
           if (peg$silentFails === 0) {
-            peg$fail(peg$e22);
+            peg$fail(peg$e24);
           }
         }
       }
@@ -2085,33 +2575,33 @@ function peg$parse(input, options) {
         } else {
           s3 = peg$FAILED;
           if (peg$silentFails === 0) {
-            peg$fail(peg$e21);
+            peg$fail(peg$e23);
           }
         }
         if (s3 === peg$FAILED) {
           s3 = input.charAt(peg$currPos);
-          if (peg$r12.test(s3)) {
+          if (peg$r14.test(s3)) {
             peg$currPos++;
           } else {
             s3 = peg$FAILED;
             if (peg$silentFails === 0) {
-              peg$fail(peg$e22);
+              peg$fail(peg$e24);
             }
           }
         }
       }
       s3 = input.charAt(peg$currPos);
-      if (peg$r11.test(s3)) {
+      if (peg$r13.test(s3)) {
         peg$currPos++;
       } else {
         s3 = peg$FAILED;
         if (peg$silentFails === 0) {
-          peg$fail(peg$e20);
+          peg$fail(peg$e22);
         }
       }
       if (s3 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f15(s1);
+        s0 = peg$f19(s1);
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -2127,12 +2617,12 @@ function peg$parse(input, options) {
     let s0, s1, s2, s3;
     s0 = peg$currPos;
     s1 = input.charAt(peg$currPos);
-    if (peg$r13.test(s1)) {
+    if (peg$r15.test(s1)) {
       peg$currPos++;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) {
-        peg$fail(peg$e23);
+        peg$fail(peg$e25);
       }
     }
     if (s1 !== peg$FAILED) {
@@ -2143,17 +2633,17 @@ function peg$parse(input, options) {
       } else {
         s3 = peg$FAILED;
         if (peg$silentFails === 0) {
-          peg$fail(peg$e24);
+          peg$fail(peg$e26);
         }
       }
       if (s3 === peg$FAILED) {
         s3 = input.charAt(peg$currPos);
-        if (peg$r14.test(s3)) {
+        if (peg$r16.test(s3)) {
           peg$currPos++;
         } else {
           s3 = peg$FAILED;
           if (peg$silentFails === 0) {
-            peg$fail(peg$e25);
+            peg$fail(peg$e27);
           }
         }
       }
@@ -2165,33 +2655,33 @@ function peg$parse(input, options) {
         } else {
           s3 = peg$FAILED;
           if (peg$silentFails === 0) {
-            peg$fail(peg$e24);
+            peg$fail(peg$e26);
           }
         }
         if (s3 === peg$FAILED) {
           s3 = input.charAt(peg$currPos);
-          if (peg$r14.test(s3)) {
+          if (peg$r16.test(s3)) {
             peg$currPos++;
           } else {
             s3 = peg$FAILED;
             if (peg$silentFails === 0) {
-              peg$fail(peg$e25);
+              peg$fail(peg$e27);
             }
           }
         }
       }
       s3 = input.charAt(peg$currPos);
-      if (peg$r13.test(s3)) {
+      if (peg$r15.test(s3)) {
         peg$currPos++;
       } else {
         s3 = peg$FAILED;
         if (peg$silentFails === 0) {
-          peg$fail(peg$e23);
+          peg$fail(peg$e25);
         }
       }
       if (s3 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f16(s1);
+        s0 = peg$f20(s1);
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -2207,12 +2697,12 @@ function peg$parse(input, options) {
     let s0, s1, s2, s3;
     s0 = peg$currPos;
     s1 = input.charAt(peg$currPos);
-    if (peg$r15.test(s1)) {
+    if (peg$r17.test(s1)) {
       peg$currPos++;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) {
-        peg$fail(peg$e26);
+        peg$fail(peg$e28);
       }
     }
     if (s1 !== peg$FAILED) {
@@ -2223,17 +2713,17 @@ function peg$parse(input, options) {
       } else {
         s3 = peg$FAILED;
         if (peg$silentFails === 0) {
-          peg$fail(peg$e27);
+          peg$fail(peg$e29);
         }
       }
       if (s3 === peg$FAILED) {
         s3 = input.charAt(peg$currPos);
-        if (peg$r16.test(s3)) {
+        if (peg$r18.test(s3)) {
           peg$currPos++;
         } else {
           s3 = peg$FAILED;
           if (peg$silentFails === 0) {
-            peg$fail(peg$e28);
+            peg$fail(peg$e30);
           }
         }
       }
@@ -2245,33 +2735,33 @@ function peg$parse(input, options) {
         } else {
           s3 = peg$FAILED;
           if (peg$silentFails === 0) {
-            peg$fail(peg$e27);
+            peg$fail(peg$e29);
           }
         }
         if (s3 === peg$FAILED) {
           s3 = input.charAt(peg$currPos);
-          if (peg$r16.test(s3)) {
+          if (peg$r18.test(s3)) {
             peg$currPos++;
           } else {
             s3 = peg$FAILED;
             if (peg$silentFails === 0) {
-              peg$fail(peg$e28);
+              peg$fail(peg$e30);
             }
           }
         }
       }
       s3 = input.charAt(peg$currPos);
-      if (peg$r15.test(s3)) {
+      if (peg$r17.test(s3)) {
         peg$currPos++;
       } else {
         s3 = peg$FAILED;
         if (peg$silentFails === 0) {
-          peg$fail(peg$e26);
+          peg$fail(peg$e28);
         }
       }
       if (s3 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f17(s1);
+        s0 = peg$f21(s1);
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -2302,12 +2792,12 @@ function peg$parse(input, options) {
     let s0, s1, s2, s3, s4, s5;
     s0 = peg$currPos;
     s1 = input.charAt(peg$currPos);
-    if (peg$r13.test(s1)) {
+    if (peg$r15.test(s1)) {
       peg$currPos++;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) {
-        peg$fail(peg$e23);
+        peg$fail(peg$e25);
       }
     }
     if (s1 !== peg$FAILED) {
@@ -2320,17 +2810,17 @@ function peg$parse(input, options) {
       } else {
         s5 = peg$FAILED;
         if (peg$silentFails === 0) {
-          peg$fail(peg$e24);
+          peg$fail(peg$e26);
         }
       }
       if (s5 === peg$FAILED) {
         s5 = input.charAt(peg$currPos);
-        if (peg$r14.test(s5)) {
+        if (peg$r16.test(s5)) {
           peg$currPos++;
         } else {
           s5 = peg$FAILED;
           if (peg$silentFails === 0) {
-            peg$fail(peg$e25);
+            peg$fail(peg$e27);
           }
         }
       }
@@ -2342,17 +2832,17 @@ function peg$parse(input, options) {
         } else {
           s5 = peg$FAILED;
           if (peg$silentFails === 0) {
-            peg$fail(peg$e24);
+            peg$fail(peg$e26);
           }
         }
         if (s5 === peg$FAILED) {
           s5 = input.charAt(peg$currPos);
-          if (peg$r14.test(s5)) {
+          if (peg$r16.test(s5)) {
             peg$currPos++;
           } else {
             s5 = peg$FAILED;
             if (peg$silentFails === 0) {
-              peg$fail(peg$e25);
+              peg$fail(peg$e27);
             }
           }
         }
@@ -2384,17 +2874,17 @@ function peg$parse(input, options) {
           } else {
             s5 = peg$FAILED;
             if (peg$silentFails === 0) {
-              peg$fail(peg$e24);
+              peg$fail(peg$e26);
             }
           }
           if (s5 === peg$FAILED) {
             s5 = input.charAt(peg$currPos);
-            if (peg$r14.test(s5)) {
+            if (peg$r16.test(s5)) {
               peg$currPos++;
             } else {
               s5 = peg$FAILED;
               if (peg$silentFails === 0) {
-                peg$fail(peg$e25);
+                peg$fail(peg$e27);
               }
             }
           }
@@ -2406,17 +2896,17 @@ function peg$parse(input, options) {
             } else {
               s5 = peg$FAILED;
               if (peg$silentFails === 0) {
-                peg$fail(peg$e24);
+                peg$fail(peg$e26);
               }
             }
             if (s5 === peg$FAILED) {
               s5 = input.charAt(peg$currPos);
-              if (peg$r14.test(s5)) {
+              if (peg$r16.test(s5)) {
                 peg$currPos++;
               } else {
                 s5 = peg$FAILED;
                 if (peg$silentFails === 0) {
-                  peg$fail(peg$e25);
+                  peg$fail(peg$e27);
                 }
               }
             }
@@ -2449,17 +2939,17 @@ function peg$parse(input, options) {
         } else {
           s4 = peg$FAILED;
           if (peg$silentFails === 0) {
-            peg$fail(peg$e24);
+            peg$fail(peg$e26);
           }
         }
         if (s4 === peg$FAILED) {
           s4 = input.charAt(peg$currPos);
-          if (peg$r14.test(s4)) {
+          if (peg$r16.test(s4)) {
             peg$currPos++;
           } else {
             s4 = peg$FAILED;
             if (peg$silentFails === 0) {
-              peg$fail(peg$e25);
+              peg$fail(peg$e27);
             }
           }
         }
@@ -2471,33 +2961,33 @@ function peg$parse(input, options) {
           } else {
             s4 = peg$FAILED;
             if (peg$silentFails === 0) {
-              peg$fail(peg$e24);
+              peg$fail(peg$e26);
             }
           }
           if (s4 === peg$FAILED) {
             s4 = input.charAt(peg$currPos);
-            if (peg$r14.test(s4)) {
+            if (peg$r16.test(s4)) {
               peg$currPos++;
             } else {
               s4 = peg$FAILED;
               if (peg$silentFails === 0) {
-                peg$fail(peg$e25);
+                peg$fail(peg$e27);
               }
             }
           }
         }
         s4 = input.charAt(peg$currPos);
-        if (peg$r13.test(s4)) {
+        if (peg$r15.test(s4)) {
           peg$currPos++;
         } else {
           s4 = peg$FAILED;
           if (peg$silentFails === 0) {
-            peg$fail(peg$e23);
+            peg$fail(peg$e25);
           }
         }
         if (s4 !== peg$FAILED) {
           peg$savedPos = s0;
-          s0 = peg$f18(s1);
+          s0 = peg$f22(s1);
         } else {
           peg$currPos = s0;
           s0 = peg$FAILED;
@@ -2517,12 +3007,12 @@ function peg$parse(input, options) {
     let s0, s1, s2, s3, s4, s5;
     s0 = peg$currPos;
     s1 = input.charAt(peg$currPos);
-    if (peg$r11.test(s1)) {
+    if (peg$r13.test(s1)) {
       peg$currPos++;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) {
-        peg$fail(peg$e20);
+        peg$fail(peg$e22);
       }
     }
     if (s1 !== peg$FAILED) {
@@ -2535,17 +3025,17 @@ function peg$parse(input, options) {
       } else {
         s5 = peg$FAILED;
         if (peg$silentFails === 0) {
-          peg$fail(peg$e21);
+          peg$fail(peg$e23);
         }
       }
       if (s5 === peg$FAILED) {
         s5 = input.charAt(peg$currPos);
-        if (peg$r12.test(s5)) {
+        if (peg$r14.test(s5)) {
           peg$currPos++;
         } else {
           s5 = peg$FAILED;
           if (peg$silentFails === 0) {
-            peg$fail(peg$e22);
+            peg$fail(peg$e24);
           }
         }
       }
@@ -2557,17 +3047,17 @@ function peg$parse(input, options) {
         } else {
           s5 = peg$FAILED;
           if (peg$silentFails === 0) {
-            peg$fail(peg$e21);
+            peg$fail(peg$e23);
           }
         }
         if (s5 === peg$FAILED) {
           s5 = input.charAt(peg$currPos);
-          if (peg$r12.test(s5)) {
+          if (peg$r14.test(s5)) {
             peg$currPos++;
           } else {
             s5 = peg$FAILED;
             if (peg$silentFails === 0) {
-              peg$fail(peg$e22);
+              peg$fail(peg$e24);
             }
           }
         }
@@ -2599,17 +3089,17 @@ function peg$parse(input, options) {
           } else {
             s5 = peg$FAILED;
             if (peg$silentFails === 0) {
-              peg$fail(peg$e21);
+              peg$fail(peg$e23);
             }
           }
           if (s5 === peg$FAILED) {
             s5 = input.charAt(peg$currPos);
-            if (peg$r12.test(s5)) {
+            if (peg$r14.test(s5)) {
               peg$currPos++;
             } else {
               s5 = peg$FAILED;
               if (peg$silentFails === 0) {
-                peg$fail(peg$e22);
+                peg$fail(peg$e24);
               }
             }
           }
@@ -2621,17 +3111,17 @@ function peg$parse(input, options) {
             } else {
               s5 = peg$FAILED;
               if (peg$silentFails === 0) {
-                peg$fail(peg$e21);
+                peg$fail(peg$e23);
               }
             }
             if (s5 === peg$FAILED) {
               s5 = input.charAt(peg$currPos);
-              if (peg$r12.test(s5)) {
+              if (peg$r14.test(s5)) {
                 peg$currPos++;
               } else {
                 s5 = peg$FAILED;
                 if (peg$silentFails === 0) {
-                  peg$fail(peg$e22);
+                  peg$fail(peg$e24);
                 }
               }
             }
@@ -2664,17 +3154,17 @@ function peg$parse(input, options) {
         } else {
           s4 = peg$FAILED;
           if (peg$silentFails === 0) {
-            peg$fail(peg$e21);
+            peg$fail(peg$e23);
           }
         }
         if (s4 === peg$FAILED) {
           s4 = input.charAt(peg$currPos);
-          if (peg$r12.test(s4)) {
+          if (peg$r14.test(s4)) {
             peg$currPos++;
           } else {
             s4 = peg$FAILED;
             if (peg$silentFails === 0) {
-              peg$fail(peg$e22);
+              peg$fail(peg$e24);
             }
           }
         }
@@ -2686,33 +3176,33 @@ function peg$parse(input, options) {
           } else {
             s4 = peg$FAILED;
             if (peg$silentFails === 0) {
-              peg$fail(peg$e21);
+              peg$fail(peg$e23);
             }
           }
           if (s4 === peg$FAILED) {
             s4 = input.charAt(peg$currPos);
-            if (peg$r12.test(s4)) {
+            if (peg$r14.test(s4)) {
               peg$currPos++;
             } else {
               s4 = peg$FAILED;
               if (peg$silentFails === 0) {
-                peg$fail(peg$e22);
+                peg$fail(peg$e24);
               }
             }
           }
         }
         s4 = input.charAt(peg$currPos);
-        if (peg$r11.test(s4)) {
+        if (peg$r13.test(s4)) {
           peg$currPos++;
         } else {
           s4 = peg$FAILED;
           if (peg$silentFails === 0) {
-            peg$fail(peg$e20);
+            peg$fail(peg$e22);
           }
         }
         if (s4 !== peg$FAILED) {
           peg$savedPos = s0;
-          s0 = peg$f19(s1);
+          s0 = peg$f23(s1);
         } else {
           peg$currPos = s0;
           s0 = peg$FAILED;
@@ -2737,7 +3227,7 @@ function peg$parse(input, options) {
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) {
-        peg$fail(peg$e29);
+        peg$fail(peg$e31);
       }
     }
     if (s1 !== peg$FAILED) {
@@ -2750,7 +3240,7 @@ function peg$parse(input, options) {
       } else {
         s5 = peg$FAILED;
         if (peg$silentFails === 0) {
-          peg$fail(peg$e30);
+          peg$fail(peg$e32);
         }
       }
       if (s5 === peg$FAILED) {
@@ -2763,7 +3253,7 @@ function peg$parse(input, options) {
         } else {
           s7 = peg$FAILED;
           if (peg$silentFails === 0) {
-            peg$fail(peg$e29);
+            peg$fail(peg$e31);
           }
         }
         peg$silentFails--;
@@ -2803,7 +3293,7 @@ function peg$parse(input, options) {
         } else {
           s5 = peg$FAILED;
           if (peg$silentFails === 0) {
-            peg$fail(peg$e30);
+            peg$fail(peg$e32);
           }
         }
         if (s5 === peg$FAILED) {
@@ -2816,7 +3306,7 @@ function peg$parse(input, options) {
           } else {
             s7 = peg$FAILED;
             if (peg$silentFails === 0) {
-              peg$fail(peg$e29);
+              peg$fail(peg$e31);
             }
           }
           peg$silentFails--;
@@ -2876,7 +3366,7 @@ function peg$parse(input, options) {
           } else {
             s5 = peg$FAILED;
             if (peg$silentFails === 0) {
-              peg$fail(peg$e30);
+              peg$fail(peg$e32);
             }
           }
           if (s5 === peg$FAILED) {
@@ -2889,7 +3379,7 @@ function peg$parse(input, options) {
             } else {
               s7 = peg$FAILED;
               if (peg$silentFails === 0) {
-                peg$fail(peg$e29);
+                peg$fail(peg$e31);
               }
             }
             peg$silentFails--;
@@ -2929,7 +3419,7 @@ function peg$parse(input, options) {
             } else {
               s5 = peg$FAILED;
               if (peg$silentFails === 0) {
-                peg$fail(peg$e30);
+                peg$fail(peg$e32);
               }
             }
             if (s5 === peg$FAILED) {
@@ -2942,7 +3432,7 @@ function peg$parse(input, options) {
               } else {
                 s7 = peg$FAILED;
                 if (peg$silentFails === 0) {
-                  peg$fail(peg$e29);
+                  peg$fail(peg$e31);
                 }
               }
               peg$silentFails--;
@@ -3003,7 +3493,7 @@ function peg$parse(input, options) {
         } else {
           s4 = peg$FAILED;
           if (peg$silentFails === 0) {
-            peg$fail(peg$e30);
+            peg$fail(peg$e32);
           }
         }
         if (s4 === peg$FAILED) {
@@ -3016,7 +3506,7 @@ function peg$parse(input, options) {
           } else {
             s6 = peg$FAILED;
             if (peg$silentFails === 0) {
-              peg$fail(peg$e29);
+              peg$fail(peg$e31);
             }
           }
           peg$silentFails--;
@@ -3056,7 +3546,7 @@ function peg$parse(input, options) {
           } else {
             s4 = peg$FAILED;
             if (peg$silentFails === 0) {
-              peg$fail(peg$e30);
+              peg$fail(peg$e32);
             }
           }
           if (s4 === peg$FAILED) {
@@ -3069,7 +3559,7 @@ function peg$parse(input, options) {
             } else {
               s6 = peg$FAILED;
               if (peg$silentFails === 0) {
-                peg$fail(peg$e29);
+                peg$fail(peg$e31);
               }
             }
             peg$silentFails--;
@@ -3108,12 +3598,12 @@ function peg$parse(input, options) {
         } else {
           s4 = peg$FAILED;
           if (peg$silentFails === 0) {
-            peg$fail(peg$e29);
+            peg$fail(peg$e31);
           }
         }
         if (s4 !== peg$FAILED) {
           peg$savedPos = s0;
-          s0 = peg$f20(s1);
+          s0 = peg$f24(s1);
         } else {
           peg$currPos = s0;
           s0 = peg$FAILED;
@@ -3138,7 +3628,7 @@ function peg$parse(input, options) {
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) {
-        peg$fail(peg$e31);
+        peg$fail(peg$e33);
       }
     }
     if (s1 !== peg$FAILED) {
@@ -3151,7 +3641,7 @@ function peg$parse(input, options) {
       } else {
         s5 = peg$FAILED;
         if (peg$silentFails === 0) {
-          peg$fail(peg$e32);
+          peg$fail(peg$e34);
         }
       }
       if (s5 === peg$FAILED) {
@@ -3164,7 +3654,7 @@ function peg$parse(input, options) {
         } else {
           s7 = peg$FAILED;
           if (peg$silentFails === 0) {
-            peg$fail(peg$e31);
+            peg$fail(peg$e33);
           }
         }
         peg$silentFails--;
@@ -3204,7 +3694,7 @@ function peg$parse(input, options) {
         } else {
           s5 = peg$FAILED;
           if (peg$silentFails === 0) {
-            peg$fail(peg$e32);
+            peg$fail(peg$e34);
           }
         }
         if (s5 === peg$FAILED) {
@@ -3217,7 +3707,7 @@ function peg$parse(input, options) {
           } else {
             s7 = peg$FAILED;
             if (peg$silentFails === 0) {
-              peg$fail(peg$e31);
+              peg$fail(peg$e33);
             }
           }
           peg$silentFails--;
@@ -3277,7 +3767,7 @@ function peg$parse(input, options) {
           } else {
             s5 = peg$FAILED;
             if (peg$silentFails === 0) {
-              peg$fail(peg$e32);
+              peg$fail(peg$e34);
             }
           }
           if (s5 === peg$FAILED) {
@@ -3290,7 +3780,7 @@ function peg$parse(input, options) {
             } else {
               s7 = peg$FAILED;
               if (peg$silentFails === 0) {
-                peg$fail(peg$e31);
+                peg$fail(peg$e33);
               }
             }
             peg$silentFails--;
@@ -3330,7 +3820,7 @@ function peg$parse(input, options) {
             } else {
               s5 = peg$FAILED;
               if (peg$silentFails === 0) {
-                peg$fail(peg$e32);
+                peg$fail(peg$e34);
               }
             }
             if (s5 === peg$FAILED) {
@@ -3343,7 +3833,7 @@ function peg$parse(input, options) {
               } else {
                 s7 = peg$FAILED;
                 if (peg$silentFails === 0) {
-                  peg$fail(peg$e31);
+                  peg$fail(peg$e33);
                 }
               }
               peg$silentFails--;
@@ -3404,7 +3894,7 @@ function peg$parse(input, options) {
         } else {
           s4 = peg$FAILED;
           if (peg$silentFails === 0) {
-            peg$fail(peg$e32);
+            peg$fail(peg$e34);
           }
         }
         if (s4 === peg$FAILED) {
@@ -3417,7 +3907,7 @@ function peg$parse(input, options) {
           } else {
             s6 = peg$FAILED;
             if (peg$silentFails === 0) {
-              peg$fail(peg$e31);
+              peg$fail(peg$e33);
             }
           }
           peg$silentFails--;
@@ -3457,7 +3947,7 @@ function peg$parse(input, options) {
           } else {
             s4 = peg$FAILED;
             if (peg$silentFails === 0) {
-              peg$fail(peg$e32);
+              peg$fail(peg$e34);
             }
           }
           if (s4 === peg$FAILED) {
@@ -3470,7 +3960,7 @@ function peg$parse(input, options) {
             } else {
               s6 = peg$FAILED;
               if (peg$silentFails === 0) {
-                peg$fail(peg$e31);
+                peg$fail(peg$e33);
               }
             }
             peg$silentFails--;
@@ -3509,12 +3999,12 @@ function peg$parse(input, options) {
         } else {
           s4 = peg$FAILED;
           if (peg$silentFails === 0) {
-            peg$fail(peg$e31);
+            peg$fail(peg$e33);
           }
         }
         if (s4 !== peg$FAILED) {
           peg$savedPos = s0;
-          s0 = peg$f21(s1);
+          s0 = peg$f25(s1);
         } else {
           peg$currPos = s0;
           s0 = peg$FAILED;
@@ -3550,7 +4040,7 @@ function peg$parse(input, options) {
       } else {
         s1 = peg$FAILED;
         if (peg$silentFails === 0) {
-          peg$fail(peg$e33);
+          peg$fail(peg$e35);
         }
       }
       peg$silentFails--;
@@ -3568,23 +4058,23 @@ function peg$parse(input, options) {
     let s0, s1;
     s0 = [];
     s1 = input.charAt(peg$currPos);
-    if (peg$r17.test(s1)) {
+    if (peg$r7.test(s1)) {
       peg$currPos++;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) {
-        peg$fail(peg$e34);
+        peg$fail(peg$e16);
       }
     }
     while (s1 !== peg$FAILED) {
       s0.push(s1);
       s1 = input.charAt(peg$currPos);
-      if (peg$r17.test(s1)) {
+      if (peg$r7.test(s1)) {
         peg$currPos++;
       } else {
         s1 = peg$FAILED;
         if (peg$silentFails === 0) {
-          peg$fail(peg$e34);
+          peg$fail(peg$e16);
         }
       }
     }
@@ -3595,24 +4085,24 @@ function peg$parse(input, options) {
     let s0, s1;
     s0 = [];
     s1 = input.charAt(peg$currPos);
-    if (peg$r17.test(s1)) {
+    if (peg$r7.test(s1)) {
       peg$currPos++;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) {
-        peg$fail(peg$e34);
+        peg$fail(peg$e16);
       }
     }
     if (s1 !== peg$FAILED) {
       while (s1 !== peg$FAILED) {
         s0.push(s1);
         s1 = input.charAt(peg$currPos);
-        if (peg$r17.test(s1)) {
+        if (peg$r7.test(s1)) {
           peg$currPos++;
         } else {
           s1 = peg$FAILED;
           if (peg$silentFails === 0) {
-            peg$fail(peg$e34);
+            peg$fail(peg$e16);
           }
         }
       }