@aster-cloud/aster-lang-ts 0.0.31 → 0.1.0

package/dist/peg/headers-parser.js

@@ -166,35 +166,33 @@ function peg$parse(input, options) {
 
   const peg$c0 = "module";
   const peg$c1 = ".";
-  const peg$c2 = "this module is";
-  const peg$c3 = "use";
-  const peg$c4 = "as";
-  const peg$c5 = "define";
-  const peg$c6 = "has";
-  const peg$c7 = "with";
-  const peg$c8 = "one";
-  const peg$c9 = "of";
-  const peg$c10 = "rule";
-  const peg$c11 = ",";
-  const peg$c12 = "produce";
-  const peg$c13 = "to";
-  const peg$c14 = "given";
-  const peg$c15 = ":";
-  const peg$c16 = "it";
-  const peg$c17 = "performs";
-  const peg$c18 = "io";
-  const peg$c19 = "cpu";
-  const peg$c20 = "and";
-  const peg$c21 = "or";
-  const peg$c22 = "maybe";
-  const peg$c23 = "option";
-  const peg$c24 = "result";
-  const peg$c25 = "list";
-  const peg$c26 = "map";
-  const peg$c27 = "text";
-  const peg$c28 = "int";
-  const peg$c29 = "float";
-  const peg$c30 = "bool";
+  const peg$c2 = "use";
+  const peg$c3 = "as";
+  const peg$c4 = "define";
+  const peg$c5 = "has";
+  const peg$c6 = "one";
+  const peg$c7 = "of";
+  const peg$c8 = "rule";
+  const peg$c9 = ",";
+  const peg$c10 = "produce";
+  const peg$c11 = "given";
+  const peg$c12 = ":";
+  const peg$c13 = "it";
+  const peg$c14 = "performs";
+  const peg$c15 = "io";
+  const peg$c16 = "cpu";
+  const peg$c17 = "and";
+  const peg$c18 = "or";
+  const peg$c19 = "maybe";
+  const peg$c20 = "option";
+  const peg$c21 = "result";
+  const peg$c22 = "list";
+  const peg$c23 = "map";
+  const peg$c24 = "to";
+  const peg$c25 = "text";
+  const peg$c26 = "int";
+  const peg$c27 = "float";
+  const peg$c28 = "bool";
 
   const peg$r0 = /^[.:]/;
   const peg$r1 = /^[A-Z\xC0-\xD6\xD8-\xDE\u0100-\u024F\u4E00-\u9FFF\u3400-\u4DBF]/;
@@ -204,82 +202,75 @@ function peg$parse(input, options) {
 
   const peg$e0 = peg$literalExpectation("Module", true);
   const peg$e1 = peg$literalExpectation(".", false);
-  const peg$e2 = peg$literalExpectation("this module is", true);
-  const peg$e3 = peg$literalExpectation("use", true);
-  const peg$e4 = peg$literalExpectation("as", true);
-  const peg$e5 = peg$literalExpectation("define", true);
-  const peg$e6 = peg$literalExpectation("has", true);
-  const peg$e7 = peg$literalExpectation("with", true);
-  const peg$e8 = peg$literalExpectation("one", true);
-  const peg$e9 = peg$literalExpectation("of", true);
-  const peg$e10 = peg$literalExpectation("Rule", true);
-  const peg$e11 = peg$literalExpectation(",", false);
-  const peg$e12 = peg$literalExpectation("produce", true);
-  const peg$e13 = peg$literalExpectation("to", true);
-  const peg$e14 = peg$literalExpectation("given", true);
-  const peg$e15 = peg$literalExpectation(":", false);
-  const peg$e16 = peg$literalExpectation("it", true);
-  const peg$e17 = peg$literalExpectation("performs", true);
-  const peg$e18 = peg$classExpectation([".", ":"], false, false, false);
-  const peg$e19 = peg$literalExpectation("io", true);
-  const peg$e20 = peg$literalExpectation("cpu", true);
-  const peg$e21 = peg$literalExpectation("and", true);
-  const peg$e22 = peg$literalExpectation("or", true);
-  const peg$e23 = peg$literalExpectation("maybe", true);
-  const peg$e24 = peg$literalExpectation("option", true);
-  const peg$e25 = peg$literalExpectation("result", true);
-  const peg$e26 = peg$literalExpectation("list", true);
-  const peg$e27 = peg$literalExpectation("map", true);
-  const peg$e28 = peg$literalExpectation("text", true);
-  const peg$e29 = peg$literalExpectation("int", true);
-  const peg$e30 = peg$literalExpectation("float", true);
-  const peg$e31 = peg$literalExpectation("bool", true);
-  const peg$e32 = peg$classExpectation([["A", "Z"], ["\xC0", "\xD6"], ["\xD8", "\xDE"], ["\u0100", "\u024F"], ["\u4E00", "\u9FFF"], ["\u3400", "\u4DBF"]], false, false, false);
-  const peg$e33 = peg$classExpectation([["A", "Z"], ["a", "z"], ["0", "9"], "_", ["\xC0", "\u024F"], ["\u4E00", "\u9FFF"], ["\u3400", "\u4DBF"]], false, false, false);
-  const peg$e34 = peg$classExpectation([["a", "z"], ["\xDF", "\xF6"], ["\xF8", "\xFF"], ["\u0100", "\u024F"], ["\u4E00", "\u9FFF"], ["\u3400", "\u4DBF"]], false, false, false);
-  const peg$e35 = peg$classExpectation([" ", "\t"], false, false, false);
+  const peg$e2 = peg$literalExpectation("use", true);
+  const peg$e3 = peg$literalExpectation("as", true);
+  const peg$e4 = peg$literalExpectation("define", true);
+  const peg$e5 = peg$literalExpectation("has", true);
+  const peg$e6 = peg$literalExpectation("one", true);
+  const peg$e7 = peg$literalExpectation("of", true);
+  const peg$e8 = peg$literalExpectation("Rule", true);
+  const peg$e9 = peg$literalExpectation(",", false);
+  const peg$e10 = peg$literalExpectation("produce", true);
+  const peg$e11 = peg$literalExpectation("given", true);
+  const peg$e12 = peg$literalExpectation(":", false);
+  const peg$e13 = peg$literalExpectation("it", true);
+  const peg$e14 = peg$literalExpectation("performs", true);
+  const peg$e15 = peg$classExpectation([".", ":"], false, false, false);
+  const peg$e16 = peg$literalExpectation("io", true);
+  const peg$e17 = peg$literalExpectation("cpu", true);
+  const peg$e18 = peg$literalExpectation("and", true);
+  const peg$e19 = peg$literalExpectation("or", true);
+  const peg$e20 = peg$literalExpectation("maybe", true);
+  const peg$e21 = peg$literalExpectation("option", true);
+  const peg$e22 = peg$literalExpectation("result", true);
+  const peg$e23 = peg$literalExpectation("list", true);
+  const peg$e24 = peg$literalExpectation("map", true);
+  const peg$e25 = peg$literalExpectation("to", true);
+  const peg$e26 = peg$literalExpectation("text", true);
+  const peg$e27 = peg$literalExpectation("int", true);
+  const peg$e28 = peg$literalExpectation("float", true);
+  const peg$e29 = peg$literalExpectation("bool", true);
+  const peg$e30 = peg$classExpectation([["A", "Z"], ["\xC0", "\xD6"], ["\xD8", "\xDE"], ["\u0100", "\u024F"], ["\u4E00", "\u9FFF"], ["\u3400", "\u4DBF"]], false, false, false);
+  const peg$e31 = peg$classExpectation([["A", "Z"], ["a", "z"], ["0", "9"], "_", ["\xC0", "\u024F"], ["\u4E00", "\u9FFF"], ["\u3400", "\u4DBF"]], false, false, false);
+  const peg$e32 = peg$classExpectation([["a", "z"], ["\xDF", "\xF6"], ["\xF8", "\xFF"], ["\u0100", "\u024F"], ["\u4E00", "\u9FFF"], ["\u3400", "\u4DBF"]], false, false, false);
+  const peg$e33 = peg$classExpectation([" ", "\t"], false, false, false);
 
   function peg$f0(h) {    return h;  }
   function peg$f1(n) {    return { kind: 'Module', name: n };  }
-  function peg$f2(n) {    return { kind: 'Module', name: n };  }
-  function peg$f3(n, a) {    return a;  }
-  function peg$f4(n, a) {    return { kind: 'Import', name: n, asName: a ?? null };  }
-  function peg$f5(t, fs) {    return { kind: 'Data', name: t, fields: fs };  }
-  function peg$f6(t, fs) {    return { kind: 'Data', name: t, fields: fs };  }
-  function peg$f7(t, vs) {    return { kind: 'Enum', name: t, variants: vs };  }
-  function peg$f8(n, p, r, eff, end) {    return { kind: 'FuncHeader', name: n, params: p ?? [], retType: r, effects: eff ?? [], bodyFollows: end === ':' };  }
-  function peg$f9(n, p, r, eff, end) {    return { kind: 'FuncHeader', name: n, params: p ?? [], retType: r, effects: eff ?? [], bodyFollows: end === ':' };  }
-  function peg$f10(ps) {    return ps;  }
-  function peg$f11() {    return ':';  }
-  function peg$f12() {    return '.';  }
-  function peg$f13(es) {    return es;  }
-  function peg$f14(e) {    return [e];  }
-  function peg$f15(e) {    return [e];  }
-  function peg$f16() {    return 'io';  }
-  function peg$f17() {    return 'cpu';  }
-  function peg$f18(ps) {    return ps;  }
-  function peg$f19(ps) {    return ps;  }
-  function peg$f20(a, b) {    return b;  }
-  function peg$f21(a) {    return [a].concat(b ?? []);  }
-  function peg$f22(n, t) {    return { name: n, type: t };  }
-  function peg$f23(a, b) {    return b;  }
-  function peg$f24(a) {    return [a].concat(b ?? []);  }
-  function peg$f25(n, t) {    return { name: n, type: t };  }
-  function peg$f26(a, b) {    return b;  }
-  function peg$f27(a) {    return [a].concat(b ?? []);  }
-  function peg$f28(t) {    return { kind: 'Maybe', type: t };  }
-  function peg$f29(t) {    return { kind: 'Option', type: t };  }
-  function peg$f30(ok, err) {    return { kind: 'Result', ok: ok, err: err };  }
-  function peg$f31(t) {    return { kind: 'List', type: t };  }
-  function peg$f32(k, v) {    return { kind: 'Map', key: k, val: v };  }
-  function peg$f33(t) {    return t;  }
-  function peg$f34(t) {    return text(t);  }
-  function peg$f35() {    return text('Text');  }
-  function peg$f36() {    return text('Int');  }
-  function peg$f37() {    return text('Float');  }
-  function peg$f38() {    return text('Bool');  }
-  function peg$f39(a, b) {    return b;  }
-  function peg$f40(a) {    return [a].concat(b ?? []).join('.');  }
+  function peg$f2(n, a) {    return a;  }
+  function peg$f3(n, a) {    return { kind: 'Import', name: n, asName: a ?? null };  }
+  function peg$f4(t, fs) {    return { kind: 'Data', name: t, fields: fs };  }
+  function peg$f5(t, vs) {    return { kind: 'Enum', name: t, variants: vs };  }
+  function peg$f6(n, p, r, eff, end) {    return { kind: 'FuncHeader', name: n, params: p ?? [], retType: r, effects: eff ?? [], bodyFollows: end === ':' };  }
+  function peg$f7(ps) {    return ps;  }
+  function peg$f8() {    return ':';  }
+  function peg$f9() {    return '.';  }
+  function peg$f10(es) {    return es;  }
+  function peg$f11(e) {    return [e];  }
+  function peg$f12(e) {    return [e];  }
+  function peg$f13() {    return 'io';  }
+  function peg$f14() {    return 'cpu';  }
+  function peg$f15(a, b) {    return b;  }
+  function peg$f16(a) {    return [a].concat(b ?? []);  }
+  function peg$f17(n, t) {    return { name: n, type: t };  }
+  function peg$f18(a, b) {    return b;  }
+  function peg$f19(a) {    return [a].concat(b ?? []);  }
+  function peg$f20(n, t) {    return { name: n, type: t };  }
+  function peg$f21(a, b) {    return b;  }
+  function peg$f22(a) {    return [a].concat(b ?? []);  }
+  function peg$f23(t) {    return { kind: 'Maybe', type: t };  }
+  function peg$f24(t) {    return { kind: 'Option', type: t };  }
+  function peg$f25(ok, err) {    return { kind: 'Result', ok: ok, err: err };  }
+  function peg$f26(t) {    return { kind: 'List', type: t };  }
+  function peg$f27(k, v) {    return { kind: 'Map', key: k, val: v };  }
+  function peg$f28(t) {    return t;  }
+  function peg$f29(t) {    return text(t);  }
+  function peg$f30() {    return text('Text');  }
+  function peg$f31() {    return text('Int');  }
+  function peg$f32() {    return text('Float');  }
+  function peg$f33() {    return text('Bool');  }
+  function peg$f34(a, b) {    return b;  }
+  function peg$f35(a) {    return [a].concat(b ?? []).join('.');  }
   let peg$currPos = options.peg$currPos | 0;
   let peg$savedPos = peg$currPos;
   const peg$posDetailsCache = [{ line: 1, column: 1 }];
@@ -461,15 +452,9 @@ function peg$parse(input, options) {
       if (s2 === peg$FAILED) {
         s2 = peg$parseData();
         if (s2 === peg$FAILED) {
-          s2 = peg$parseDataHas();
+          s2 = peg$parseEnum();
           if (s2 === peg$FAILED) {
-            s2 = peg$parseEnum();
-            if (s2 === peg$FAILED) {
-              s2 = peg$parseFuncHeader();
-              if (s2 === peg$FAILED) {
-                s2 = peg$parseFuncHeaderLegacy();
-              }
-            }
+            s2 = peg$parseFuncHeader();
           }
         }
       }
@@ -524,43 +509,6 @@ function peg$parse(input, options) {
       peg$currPos = s0;
       s0 = peg$FAILED;
     }
-    if (s0 === peg$FAILED) {
-      s0 = peg$currPos;
-      s1 = input.substr(peg$currPos, 14);
-      if (s1.toLowerCase() === peg$c2) {
-        peg$currPos += (14);
-      } else {
-        s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e2); }
-      }
-      if (s1 !== peg$FAILED) {
-        s2 = peg$parse_();
-        s3 = peg$parseDottedIdent();
-        if (s3 !== peg$FAILED) {
-          s4 = peg$parse_();
-          if (input.charCodeAt(peg$currPos) === 46) {
-            s5 = peg$c1;
-            peg$currPos++;
-          } else {
-            s5 = peg$FAILED;
-            if (peg$silentFails === 0) { peg$fail(peg$e1); }
-          }
-          if (s5 !== peg$FAILED) {
-            peg$savedPos = s0;
-            s0 = peg$f2(s3);
-          } else {
-            peg$currPos = s0;
-            s0 = peg$FAILED;
-          }
-        } else {
-          peg$currPos = s0;
-          s0 = peg$FAILED;
-        }
-      } else {
-        peg$currPos = s0;
-        s0 = peg$FAILED;
-      }
-    }
 
     return s0;
   }
@@ -570,11 +518,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 3);
-    if (s1.toLowerCase() === peg$c3) {
+    if (s1.toLowerCase() === peg$c2) {
       peg$currPos += (3);
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e3); }
+      if (peg$silentFails === 0) { peg$fail(peg$e2); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$parse_();
@@ -583,18 +531,18 @@ function peg$parse(input, options) {
         s4 = peg$parse_();
         s5 = peg$currPos;
         s6 = input.substr(peg$currPos, 2);
-        if (s6.toLowerCase() === peg$c4) {
+        if (s6.toLowerCase() === peg$c3) {
           peg$currPos += (2);
         } else {
           s6 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e4); }
+          if (peg$silentFails === 0) { peg$fail(peg$e3); }
         }
         if (s6 !== peg$FAILED) {
           s7 = peg$parse_();
           s8 = peg$parseIdent();
           if (s8 !== peg$FAILED) {
             peg$savedPos = s5;
-            s5 = peg$f3(s3, s8);
+            s5 = peg$f2(s3, s8);
           } else {
             peg$currPos = s5;
             s5 = peg$FAILED;
@@ -616,7 +564,7 @@ function peg$parse(input, options) {
         }
         if (s7 !== peg$FAILED) {
           peg$savedPos = s0;
-          s0 = peg$f4(s3, s5);
+          s0 = peg$f3(s3, s5);
         } else {
           peg$currPos = s0;
           s0 = peg$FAILED;
@@ -633,16 +581,16 @@ function peg$parse(input, options) {
     return s0;
   }
 
-  function peg$parseDataHas() {
+  function peg$parseData() {
     let s0, s1, s2, s3, s4, s5, s6, s7, s8, s9;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 6);
-    if (s1.toLowerCase() === peg$c5) {
+    if (s1.toLowerCase() === peg$c4) {
       peg$currPos += (6);
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e5); }
+      if (peg$silentFails === 0) { peg$fail(peg$e4); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$parse_();
@@ -650,73 +598,11 @@ function peg$parse(input, options) {
       if (s3 !== peg$FAILED) {
         s4 = peg$parse_();
         s5 = input.substr(peg$currPos, 3);
-        if (s5.toLowerCase() === peg$c6) {
+        if (s5.toLowerCase() === peg$c5) {
           peg$currPos += (3);
         } else {
           s5 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e6); }
-        }
-        if (s5 !== peg$FAILED) {
-          s6 = peg$parse_();
-          s7 = peg$parseFieldList();
-          if (s7 !== peg$FAILED) {
-            s8 = peg$parse_();
-            if (input.charCodeAt(peg$currPos) === 46) {
-              s9 = peg$c1;
-              peg$currPos++;
-            } else {
-              s9 = peg$FAILED;
-              if (peg$silentFails === 0) { peg$fail(peg$e1); }
-            }
-            if (s9 !== peg$FAILED) {
-              peg$savedPos = s0;
-              s0 = peg$f5(s3, s7);
-            } else {
-              peg$currPos = s0;
-              s0 = peg$FAILED;
-            }
-          } else {
-            peg$currPos = s0;
-            s0 = peg$FAILED;
-          }
-        } else {
-          peg$currPos = s0;
-          s0 = peg$FAILED;
-        }
-      } else {
-        peg$currPos = s0;
-        s0 = peg$FAILED;
-      }
-    } else {
-      peg$currPos = s0;
-      s0 = peg$FAILED;
-    }
-
-    return s0;
-  }
-
-  function peg$parseData() {
-    let s0, s1, s2, s3, s4, s5, s6, s7, s8, s9;
-
-    s0 = peg$currPos;
-    s1 = input.substr(peg$currPos, 6);
-    if (s1.toLowerCase() === peg$c5) {
-      peg$currPos += (6);
-    } else {
-      s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e5); }
-    }
-    if (s1 !== peg$FAILED) {
-      s2 = peg$parse_();
-      s3 = peg$parseTypeIdent();
-      if (s3 !== peg$FAILED) {
-        s4 = peg$parse_();
-        s5 = input.substr(peg$currPos, 4);
-        if (s5.toLowerCase() === peg$c7) {
-          peg$currPos += (4);
-        } else {
-          s5 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e7); }
+          if (peg$silentFails === 0) { peg$fail(peg$e5); }
         }
         if (s5 !== peg$FAILED) {
           s6 = peg$parse_();
@@ -732,7 +618,7 @@ function peg$parse(input, options) {
             }
             if (s9 !== peg$FAILED) {
               peg$savedPos = s0;
-              s0 = peg$f6(s3, s7);
+              s0 = peg$f4(s3, s7);
             } else {
               peg$currPos = s0;
               s0 = peg$FAILED;
@@ -762,11 +648,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 6);
-    if (s1.toLowerCase() === peg$c5) {
+    if (s1.toLowerCase() === peg$c4) {
       peg$currPos += (6);
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e5); }
+      if (peg$silentFails === 0) { peg$fail(peg$e4); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$parse_();
@@ -774,29 +660,29 @@ function peg$parse(input, options) {
       if (s3 !== peg$FAILED) {
         s4 = peg$parse_();
         s5 = input.substr(peg$currPos, 2);
-        if (s5.toLowerCase() === peg$c4) {
+        if (s5.toLowerCase() === peg$c3) {
           peg$currPos += (2);
         } else {
           s5 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e4); }
+          if (peg$silentFails === 0) { peg$fail(peg$e3); }
         }
         if (s5 !== peg$FAILED) {
           s6 = peg$parse_();
           s7 = input.substr(peg$currPos, 3);
-          if (s7.toLowerCase() === peg$c8) {
+          if (s7.toLowerCase() === peg$c6) {
             peg$currPos += (3);
           } else {
             s7 = peg$FAILED;
-            if (peg$silentFails === 0) { peg$fail(peg$e8); }
+            if (peg$silentFails === 0) { peg$fail(peg$e6); }
           }
           if (s7 !== peg$FAILED) {
             s8 = peg$parse_();
             s9 = input.substr(peg$currPos, 2);
-            if (s9.toLowerCase() === peg$c9) {
+            if (s9.toLowerCase() === peg$c7) {
               peg$currPos += (2);
             } else {
               s9 = peg$FAILED;
-              if (peg$silentFails === 0) { peg$fail(peg$e9); }
+              if (peg$silentFails === 0) { peg$fail(peg$e7); }
             }
             if (s9 !== peg$FAILED) {
               s10 = peg$parse_();
@@ -812,7 +698,7 @@ function peg$parse(input, options) {
                 }
                 if (s13 !== peg$FAILED) {
                   peg$savedPos = s0;
-                  s0 = peg$f7(s3, s11);
+                  s0 = peg$f5(s3, s11);
                 } else {
                   peg$currPos = s0;
                   s0 = peg$FAILED;
@@ -850,11 +736,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 4);
-    if (s1.toLowerCase() === peg$c10) {
+    if (s1.toLowerCase() === peg$c8) {
       peg$currPos += (4);
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e10); }
+      if (peg$silentFails === 0) { peg$fail(peg$e8); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$parse_();
@@ -867,99 +753,20 @@ function peg$parse(input, options) {
         }
         s6 = peg$parse_();
         if (input.charCodeAt(peg$currPos) === 44) {
-          s7 = peg$c11;
+          s7 = peg$c9;
           peg$currPos++;
         } else {
           s7 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e11); }
-        }
-        if (s7 !== peg$FAILED) {
-          s8 = peg$parse_();
-          s9 = input.substr(peg$currPos, 7);
-          if (s9.toLowerCase() === peg$c12) {
-            peg$currPos += (7);
-          } else {
-            s9 = peg$FAILED;
-            if (peg$silentFails === 0) { peg$fail(peg$e12); }
-          }
-          if (s9 !== peg$FAILED) {
-            s10 = peg$parse_();
-            s11 = peg$parseType();
-            if (s11 !== peg$FAILED) {
-              s12 = peg$parse_();
-              s13 = peg$parseEffectPart();
-              if (s13 === peg$FAILED) {
-                s13 = null;
-              }
-              s14 = peg$parse_();
-              s15 = peg$parseHeaderEnd();
-              if (s15 !== peg$FAILED) {
-                peg$savedPos = s0;
-                s0 = peg$f8(s3, s5, s11, s13, s15);
-              } else {
-                peg$currPos = s0;
-                s0 = peg$FAILED;
-              }
-            } else {
-              peg$currPos = s0;
-              s0 = peg$FAILED;
-            }
-          } else {
-            peg$currPos = s0;
-            s0 = peg$FAILED;
-          }
-        } else {
-          peg$currPos = s0;
-          s0 = peg$FAILED;
-        }
-      } else {
-        peg$currPos = s0;
-        s0 = peg$FAILED;
-      }
-    } else {
-      peg$currPos = s0;
-      s0 = peg$FAILED;
-    }
-
-    return s0;
-  }
-
-  function peg$parseFuncHeaderLegacy() {
-    let s0, s1, s2, s3, s4, s5, s6, s7, s8, s9, s10, s11, s12, s13, s14, s15;
-
-    s0 = peg$currPos;
-    s1 = input.substr(peg$currPos, 2);
-    if (s1.toLowerCase() === peg$c13) {
-      peg$currPos += (2);
-    } else {
-      s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e13); }
-    }
-    if (s1 !== peg$FAILED) {
-      s2 = peg$parse_();
-      s3 = peg$parseIdent();
-      if (s3 !== peg$FAILED) {
-        s4 = peg$parse_();
-        s5 = peg$parseParamPart();
-        if (s5 === peg$FAILED) {
-          s5 = null;
-        }
-        s6 = peg$parse_();
-        if (input.charCodeAt(peg$currPos) === 44) {
-          s7 = peg$c11;
-          peg$currPos++;
-        } else {
-          s7 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e11); }
+          if (peg$silentFails === 0) { peg$fail(peg$e9); }
         }
         if (s7 !== peg$FAILED) {
           s8 = peg$parse_();
           s9 = input.substr(peg$currPos, 7);
-          if (s9.toLowerCase() === peg$c12) {
+          if (s9.toLowerCase() === peg$c10) {
             peg$currPos += (7);
           } else {
             s9 = peg$FAILED;
-            if (peg$silentFails === 0) { peg$fail(peg$e12); }
+            if (peg$silentFails === 0) { peg$fail(peg$e10); }
           }
           if (s9 !== peg$FAILED) {
             s10 = peg$parse_();
@@ -974,7 +781,7 @@ function peg$parse(input, options) {
               s15 = peg$parseHeaderEnd();
               if (s15 !== peg$FAILED) {
                 peg$savedPos = s0;
-                s0 = peg$f9(s3, s5, s11, s13, s15);
+                s0 = peg$f6(s3, s5, s11, s13, s15);
               } else {
                 peg$currPos = s0;
                 s0 = peg$FAILED;
@@ -1009,18 +816,18 @@ function peg$parse(input, options) {
     s0 = peg$currPos;
     s1 = peg$parse_();
     s2 = input.substr(peg$currPos, 5);
-    if (s2.toLowerCase() === peg$c14) {
+    if (s2.toLowerCase() === peg$c11) {
       peg$currPos += (5);
     } else {
       s2 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e14); }
+      if (peg$silentFails === 0) { peg$fail(peg$e11); }
     }
     if (s2 !== peg$FAILED) {
       s3 = peg$parse_();
       s4 = peg$parseParamList();
       if (s4 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f10(s4);
+        s0 = peg$f7(s4);
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -1038,15 +845,15 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     if (input.charCodeAt(peg$currPos) === 58) {
-      s1 = peg$c15;
+      s1 = peg$c12;
       peg$currPos++;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e15); }
+      if (peg$silentFails === 0) { peg$fail(peg$e12); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f11();
+      s1 = peg$f8();
     }
     s0 = s1;
     if (s0 === peg$FAILED) {
@@ -1060,7 +867,7 @@ function peg$parse(input, options) {
       }
       if (s1 !== peg$FAILED) {
         peg$savedPos = s0;
-        s1 = peg$f12();
+        s1 = peg$f9();
       }
       s0 = s1;
     }
@@ -1075,11 +882,11 @@ function peg$parse(input, options) {
     s1 = peg$parse_();
     s2 = peg$currPos;
     s3 = input.substr(peg$currPos, 2);
-    if (s3.toLowerCase() === peg$c16) {
+    if (s3.toLowerCase() === peg$c13) {
       peg$currPos += (2);
     } else {
       s3 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e16); }
+      if (peg$silentFails === 0) { peg$fail(peg$e13); }
     }
     if (s3 !== peg$FAILED) {
       s4 = peg$parse_();
@@ -1093,11 +900,11 @@ function peg$parse(input, options) {
       s2 = null;
     }
     s3 = input.substr(peg$currPos, 8);
-    if (s3.toLowerCase() === peg$c17) {
+    if (s3.toLowerCase() === peg$c14) {
       peg$currPos += (8);
     } else {
       s3 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e17); }
+      if (peg$silentFails === 0) { peg$fail(peg$e14); }
     }
     if (s3 !== peg$FAILED) {
       s4 = peg$parse_();
@@ -1109,11 +916,11 @@ function peg$parse(input, options) {
           peg$currPos++;
         } else {
           s7 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e18); }
+          if (peg$silentFails === 0) { peg$fail(peg$e15); }
         }
         if (s7 !== peg$FAILED) {
           peg$savedPos = s0;
-          s0 = peg$f13(s5);
+          s0 = peg$f10(s5);
         } else {
           peg$currPos = s0;
           s0 = peg$FAILED;
@@ -1140,11 +947,11 @@ function peg$parse(input, options) {
       s3 = peg$currPos;
       s4 = peg$parse_();
       if (input.charCodeAt(peg$currPos) === 44) {
-        s5 = peg$c11;
+        s5 = peg$c9;
         peg$currPos++;
       } else {
         s5 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e11); }
+        if (peg$silentFails === 0) { peg$fail(peg$e9); }
       }
       if (s5 !== peg$FAILED) {
         s6 = peg$parse_();
@@ -1165,11 +972,11 @@ function peg$parse(input, options) {
         s3 = peg$currPos;
         s4 = peg$parse_();
         if (input.charCodeAt(peg$currPos) === 44) {
-          s5 = peg$c11;
+          s5 = peg$c9;
           peg$currPos++;
         } else {
           s5 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e11); }
+          if (peg$silentFails === 0) { peg$fail(peg$e9); }
         }
         if (s5 !== peg$FAILED) {
           s6 = peg$parse_();
@@ -1187,7 +994,7 @@ function peg$parse(input, options) {
         }
       }
       peg$savedPos = s0;
-      s0 = peg$f14(s1);
+      s0 = peg$f11(s1);
     } else {
       peg$currPos = s0;
       s0 = peg$FAILED;
@@ -1221,7 +1028,7 @@ function peg$parse(input, options) {
           }
         }
         peg$savedPos = s0;
-        s0 = peg$f15(s1);
+        s0 = peg$f12(s1);
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -1236,29 +1043,29 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 2);
-    if (s1.toLowerCase() === peg$c18) {
+    if (s1.toLowerCase() === peg$c15) {
       peg$currPos += (2);
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e19); }
+      if (peg$silentFails === 0) { peg$fail(peg$e16); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f16();
+      s1 = peg$f13();
     }
     s0 = s1;
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 3);
-      if (s1.toLowerCase() === peg$c19) {
+      if (s1.toLowerCase() === peg$c16) {
         peg$currPos += (3);
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e20); }
+        if (peg$silentFails === 0) { peg$fail(peg$e17); }
       }
       if (s1 !== peg$FAILED) {
         peg$savedPos = s0;
-        s1 = peg$f17();
+        s1 = peg$f14();
       }
       s0 = s1;
     }
@@ -1266,48 +1073,6 @@ function peg$parse(input, options) {
     return s0;
   }
 
-  function peg$parseParamPart() {
-    let s0, s1, s2, s3, s4;
-
-    s0 = peg$currPos;
-    s1 = peg$parse_();
-    s2 = input.substr(peg$currPos, 4);
-    if (s2.toLowerCase() === peg$c7) {
-      peg$currPos += (4);
-    } else {
-      s2 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e7); }
-    }
-    if (s2 !== peg$FAILED) {
-      s3 = peg$parse_();
-      s4 = peg$parseParamList();
-      if (s4 !== peg$FAILED) {
-        peg$savedPos = s0;
-        s0 = peg$f18(s4);
-      } else {
-        peg$currPos = s0;
-        s0 = peg$FAILED;
-      }
-    } else {
-      peg$currPos = s0;
-      s0 = peg$FAILED;
-    }
-    if (s0 === peg$FAILED) {
-      s0 = peg$currPos;
-      s1 = peg$parse_();
-      s2 = peg$parseParamList();
-      if (s2 !== peg$FAILED) {
-        peg$savedPos = s0;
-        s0 = peg$f19(s2);
-      } else {
-        peg$currPos = s0;
-        s0 = peg$FAILED;
-      }
-    }
-
-    return s0;
-  }
-
   function peg$parseParamList() {
     let s0, s1, s2, s3, s4, s5, s6, s7;
 
@@ -1318,18 +1083,18 @@ function peg$parse(input, options) {
       s3 = peg$currPos;
       s4 = peg$parse_();
       s5 = input.substr(peg$currPos, 3);
-      if (s5.toLowerCase() === peg$c20) {
+      if (s5.toLowerCase() === peg$c17) {
         peg$currPos += (3);
       } else {
         s5 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e21); }
+        if (peg$silentFails === 0) { peg$fail(peg$e18); }
       }
       if (s5 !== peg$FAILED) {
         s6 = peg$parse_();
         s7 = peg$parseParam();
         if (s7 !== peg$FAILED) {
           peg$savedPos = s3;
-          s3 = peg$f20(s1, s7);
+          s3 = peg$f15(s1, s7);
         } else {
           peg$currPos = s3;
           s3 = peg$FAILED;
@@ -1343,18 +1108,18 @@ function peg$parse(input, options) {
         s3 = peg$currPos;
         s4 = peg$parse_();
         s5 = input.substr(peg$currPos, 3);
-        if (s5.toLowerCase() === peg$c20) {
+        if (s5.toLowerCase() === peg$c17) {
           peg$currPos += (3);
         } else {
           s5 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e21); }
+          if (peg$silentFails === 0) { peg$fail(peg$e18); }
         }
         if (s5 !== peg$FAILED) {
           s6 = peg$parse_();
           s7 = peg$parseParam();
           if (s7 !== peg$FAILED) {
             peg$savedPos = s3;
-            s3 = peg$f20(s1, s7);
+            s3 = peg$f15(s1, s7);
           } else {
             peg$currPos = s3;
             s3 = peg$FAILED;
@@ -1365,7 +1130,7 @@ function peg$parse(input, options) {
         }
       }
       peg$savedPos = s0;
-      s0 = peg$f21(s1);
+      s0 = peg$f16(s1);
     } else {
       peg$currPos = s0;
       s0 = peg$FAILED;
@@ -1381,19 +1146,19 @@ function peg$parse(input, options) {
     s1 = peg$parseIdent();
     if (s1 !== peg$FAILED) {
       s2 = peg$parse_();
-      if (input.charCodeAt(peg$currPos) === 58) {
-        s3 = peg$c15;
-        peg$currPos++;
+      s3 = input.substr(peg$currPos, 2);
+      if (s3.toLowerCase() === peg$c3) {
+        peg$currPos += (2);
       } else {
         s3 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e15); }
+        if (peg$silentFails === 0) { peg$fail(peg$e3); }
       }
       if (s3 !== peg$FAILED) {
         s4 = peg$parse_();
         s5 = peg$parseType();
         if (s5 !== peg$FAILED) {
           peg$savedPos = s0;
-          s0 = peg$f22(s1, s5);
+          s0 = peg$f17(s1, s5);
         } else {
           peg$currPos = s0;
           s0 = peg$FAILED;
@@ -1420,18 +1185,18 @@ function peg$parse(input, options) {
       s3 = peg$currPos;
       s4 = peg$parse_();
       s5 = input.substr(peg$currPos, 3);
-      if (s5.toLowerCase() === peg$c20) {
+      if (s5.toLowerCase() === peg$c17) {
         peg$currPos += (3);
       } else {
         s5 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e21); }
+        if (peg$silentFails === 0) { peg$fail(peg$e18); }
       }
       if (s5 !== peg$FAILED) {
         s6 = peg$parse_();
         s7 = peg$parseField();
         if (s7 !== peg$FAILED) {
           peg$savedPos = s3;
-          s3 = peg$f23(s1, s7);
+          s3 = peg$f18(s1, s7);
         } else {
           peg$currPos = s3;
           s3 = peg$FAILED;
@@ -1445,18 +1210,18 @@ function peg$parse(input, options) {
         s3 = peg$currPos;
         s4 = peg$parse_();
         s5 = input.substr(peg$currPos, 3);
-        if (s5.toLowerCase() === peg$c20) {
+        if (s5.toLowerCase() === peg$c17) {
           peg$currPos += (3);
         } else {
           s5 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e21); }
+          if (peg$silentFails === 0) { peg$fail(peg$e18); }
         }
         if (s5 !== peg$FAILED) {
           s6 = peg$parse_();
           s7 = peg$parseField();
           if (s7 !== peg$FAILED) {
             peg$savedPos = s3;
-            s3 = peg$f23(s1, s7);
+            s3 = peg$f18(s1, s7);
           } else {
             peg$currPos = s3;
             s3 = peg$FAILED;
@@ -1467,7 +1232,7 @@ function peg$parse(input, options) {
         }
       }
       peg$savedPos = s0;
-      s0 = peg$f24(s1);
+      s0 = peg$f19(s1);
     } else {
       peg$currPos = s0;
       s0 = peg$FAILED;
@@ -1483,19 +1248,19 @@ function peg$parse(input, options) {
     s1 = peg$parseIdent();
     if (s1 !== peg$FAILED) {
       s2 = peg$parse_();
-      if (input.charCodeAt(peg$currPos) === 58) {
-        s3 = peg$c15;
-        peg$currPos++;
+      s3 = input.substr(peg$currPos, 2);
+      if (s3.toLowerCase() === peg$c3) {
+        peg$currPos += (2);
       } else {
         s3 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e15); }
+        if (peg$silentFails === 0) { peg$fail(peg$e3); }
       }
       if (s3 !== peg$FAILED) {
         s4 = peg$parse_();
         s5 = peg$parseType();
         if (s5 !== peg$FAILED) {
           peg$savedPos = s0;
-          s0 = peg$f25(s1, s5);
+          s0 = peg$f20(s1, s5);
         } else {
           peg$currPos = s0;
           s0 = peg$FAILED;
@@ -1522,19 +1287,19 @@ function peg$parse(input, options) {
       s3 = peg$currPos;
       s4 = peg$parse_();
       if (input.charCodeAt(peg$currPos) === 44) {
-        s5 = peg$c11;
+        s5 = peg$c9;
         peg$currPos++;
       } else {
         s5 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e11); }
+        if (peg$silentFails === 0) { peg$fail(peg$e9); }
       }
       if (s5 === peg$FAILED) {
         s5 = input.substr(peg$currPos, 2);
-        if (s5.toLowerCase() === peg$c21) {
+        if (s5.toLowerCase() === peg$c18) {
           peg$currPos += (2);
         } else {
           s5 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e22); }
+          if (peg$silentFails === 0) { peg$fail(peg$e19); }
         }
       }
       if (s5 !== peg$FAILED) {
@@ -1542,7 +1307,7 @@ function peg$parse(input, options) {
         s7 = peg$parseTypeIdent();
         if (s7 !== peg$FAILED) {
           peg$savedPos = s3;
-          s3 = peg$f26(s1, s7);
+          s3 = peg$f21(s1, s7);
         } else {
           peg$currPos = s3;
           s3 = peg$FAILED;
@@ -1556,19 +1321,19 @@ function peg$parse(input, options) {
         s3 = peg$currPos;
         s4 = peg$parse_();
         if (input.charCodeAt(peg$currPos) === 44) {
-          s5 = peg$c11;
+          s5 = peg$c9;
           peg$currPos++;
         } else {
           s5 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e11); }
+          if (peg$silentFails === 0) { peg$fail(peg$e9); }
         }
         if (s5 === peg$FAILED) {
           s5 = input.substr(peg$currPos, 2);
-          if (s5.toLowerCase() === peg$c21) {
+          if (s5.toLowerCase() === peg$c18) {
             peg$currPos += (2);
           } else {
             s5 = peg$FAILED;
-            if (peg$silentFails === 0) { peg$fail(peg$e22); }
+            if (peg$silentFails === 0) { peg$fail(peg$e19); }
           }
         }
         if (s5 !== peg$FAILED) {
@@ -1576,7 +1341,7 @@ function peg$parse(input, options) {
           s7 = peg$parseTypeIdent();
           if (s7 !== peg$FAILED) {
             peg$savedPos = s3;
-            s3 = peg$f26(s1, s7);
+            s3 = peg$f21(s1, s7);
           } else {
             peg$currPos = s3;
             s3 = peg$FAILED;
@@ -1587,7 +1352,7 @@ function peg$parse(input, options) {
         }
       }
       peg$savedPos = s0;
-      s0 = peg$f27(s1);
+      s0 = peg$f22(s1);
     } else {
       peg$currPos = s0;
       s0 = peg$FAILED;
@@ -1601,18 +1366,18 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 5);
-    if (s1.toLowerCase() === peg$c22) {
+    if (s1.toLowerCase() === peg$c19) {
       peg$currPos += (5);
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e23); }
+      if (peg$silentFails === 0) { peg$fail(peg$e20); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$parse_();
       s3 = peg$parseType();
       if (s3 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f28(s3);
+        s0 = peg$f23(s3);
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -1624,27 +1389,27 @@ function peg$parse(input, options) {
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 6);
-      if (s1.toLowerCase() === peg$c23) {
+      if (s1.toLowerCase() === peg$c20) {
         peg$currPos += (6);
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e24); }
+        if (peg$silentFails === 0) { peg$fail(peg$e21); }
       }
       if (s1 !== peg$FAILED) {
         s2 = peg$parse_();
         s3 = input.substr(peg$currPos, 2);
-        if (s3.toLowerCase() === peg$c9) {
+        if (s3.toLowerCase() === peg$c7) {
           peg$currPos += (2);
         } else {
           s3 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e9); }
+          if (peg$silentFails === 0) { peg$fail(peg$e7); }
         }
         if (s3 !== peg$FAILED) {
           s4 = peg$parse_();
           s5 = peg$parseType();
           if (s5 !== peg$FAILED) {
             peg$savedPos = s0;
-            s0 = peg$f29(s5);
+            s0 = peg$f24(s5);
           } else {
             peg$currPos = s0;
             s0 = peg$FAILED;
@@ -1660,20 +1425,20 @@ function peg$parse(input, options) {
       if (s0 === peg$FAILED) {
         s0 = peg$currPos;
         s1 = input.substr(peg$currPos, 6);
-        if (s1.toLowerCase() === peg$c24) {
+        if (s1.toLowerCase() === peg$c21) {
           peg$currPos += (6);
         } else {
           s1 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e25); }
+          if (peg$silentFails === 0) { peg$fail(peg$e22); }
         }
         if (s1 !== peg$FAILED) {
           s2 = peg$parse_();
           s3 = input.substr(peg$currPos, 2);
-          if (s3.toLowerCase() === peg$c9) {
+          if (s3.toLowerCase() === peg$c7) {
             peg$currPos += (2);
           } else {
             s3 = peg$FAILED;
-            if (peg$silentFails === 0) { peg$fail(peg$e9); }
+            if (peg$silentFails === 0) { peg$fail(peg$e7); }
           }
           if (s3 !== peg$FAILED) {
             s4 = peg$parse_();
@@ -1681,18 +1446,18 @@ function peg$parse(input, options) {
             if (s5 !== peg$FAILED) {
               s6 = peg$parse_();
               s7 = input.substr(peg$currPos, 2);
-              if (s7.toLowerCase() === peg$c21) {
+              if (s7.toLowerCase() === peg$c18) {
                 peg$currPos += (2);
               } else {
                 s7 = peg$FAILED;
-                if (peg$silentFails === 0) { peg$fail(peg$e22); }
+                if (peg$silentFails === 0) { peg$fail(peg$e19); }
               }
               if (s7 !== peg$FAILED) {
                 s8 = peg$parse_();
                 s9 = peg$parseType();
                 if (s9 !== peg$FAILED) {
                   peg$savedPos = s0;
-                  s0 = peg$f30(s5, s9);
+                  s0 = peg$f25(s5, s9);
                 } else {
                   peg$currPos = s0;
                   s0 = peg$FAILED;
@@ -1716,27 +1481,27 @@ function peg$parse(input, options) {
         if (s0 === peg$FAILED) {
           s0 = peg$currPos;
           s1 = input.substr(peg$currPos, 4);
-          if (s1.toLowerCase() === peg$c25) {
+          if (s1.toLowerCase() === peg$c22) {
             peg$currPos += (4);
           } else {
             s1 = peg$FAILED;
-            if (peg$silentFails === 0) { peg$fail(peg$e26); }
+            if (peg$silentFails === 0) { peg$fail(peg$e23); }
           }
           if (s1 !== peg$FAILED) {
             s2 = peg$parse_();
             s3 = input.substr(peg$currPos, 2);
-            if (s3.toLowerCase() === peg$c9) {
+            if (s3.toLowerCase() === peg$c7) {
               peg$currPos += (2);
             } else {
               s3 = peg$FAILED;
-              if (peg$silentFails === 0) { peg$fail(peg$e9); }
+              if (peg$silentFails === 0) { peg$fail(peg$e7); }
             }
             if (s3 !== peg$FAILED) {
               s4 = peg$parse_();
               s5 = peg$parseType();
               if (s5 !== peg$FAILED) {
                 peg$savedPos = s0;
-                s0 = peg$f31(s5);
+                s0 = peg$f26(s5);
               } else {
                 peg$currPos = s0;
                 s0 = peg$FAILED;
@@ -1752,11 +1517,11 @@ function peg$parse(input, options) {
           if (s0 === peg$FAILED) {
             s0 = peg$currPos;
             s1 = input.substr(peg$currPos, 3);
-            if (s1.toLowerCase() === peg$c26) {
+            if (s1.toLowerCase() === peg$c23) {
               peg$currPos += (3);
             } else {
               s1 = peg$FAILED;
-              if (peg$silentFails === 0) { peg$fail(peg$e27); }
+              if (peg$silentFails === 0) { peg$fail(peg$e24); }
             }
             if (s1 !== peg$FAILED) {
               s2 = peg$parse_();
@@ -1764,18 +1529,18 @@ function peg$parse(input, options) {
               if (s3 !== peg$FAILED) {
                 s4 = peg$parse_();
                 s5 = input.substr(peg$currPos, 2);
-                if (s5.toLowerCase() === peg$c13) {
+                if (s5.toLowerCase() === peg$c24) {
                   peg$currPos += (2);
                 } else {
                   s5 = peg$FAILED;
-                  if (peg$silentFails === 0) { peg$fail(peg$e13); }
+                  if (peg$silentFails === 0) { peg$fail(peg$e25); }
                 }
                 if (s5 !== peg$FAILED) {
                   s6 = peg$parse_();
                   s7 = peg$parseType();
                   if (s7 !== peg$FAILED) {
                     peg$savedPos = s0;
-                    s0 = peg$f32(s3, s7);
+                    s0 = peg$f27(s3, s7);
                   } else {
                     peg$currPos = s0;
                     s0 = peg$FAILED;
@@ -1797,7 +1562,7 @@ function peg$parse(input, options) {
               s1 = peg$parsePrimType();
               if (s1 !== peg$FAILED) {
                 peg$savedPos = s0;
-                s1 = peg$f33(s1);
+                s1 = peg$f28(s1);
               }
               s0 = s1;
               if (s0 === peg$FAILED) {
@@ -1805,7 +1570,7 @@ function peg$parse(input, options) {
                 s1 = peg$parseTypeIdent();
                 if (s1 !== peg$FAILED) {
                   peg$savedPos = s0;
-                  s1 = peg$f34(s1);
+                  s1 = peg$f29(s1);
                 }
                 s0 = s1;
               }
@@ -1823,57 +1588,57 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 4);
-    if (s1.toLowerCase() === peg$c27) {
+    if (s1.toLowerCase() === peg$c25) {
       peg$currPos += (4);
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e28); }
+      if (peg$silentFails === 0) { peg$fail(peg$e26); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f35();
+      s1 = peg$f30();
     }
     s0 = s1;
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 3);
-      if (s1.toLowerCase() === peg$c28) {
+      if (s1.toLowerCase() === peg$c26) {
         peg$currPos += (3);
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e29); }
+        if (peg$silentFails === 0) { peg$fail(peg$e27); }
       }
       if (s1 !== peg$FAILED) {
         peg$savedPos = s0;
-        s1 = peg$f36();
+        s1 = peg$f31();
       }
       s0 = s1;
       if (s0 === peg$FAILED) {
         s0 = peg$currPos;
         s1 = input.substr(peg$currPos, 5);
-        if (s1.toLowerCase() === peg$c29) {
+        if (s1.toLowerCase() === peg$c27) {
           peg$currPos += (5);
         } else {
           s1 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e30); }
+          if (peg$silentFails === 0) { peg$fail(peg$e28); }
         }
         if (s1 !== peg$FAILED) {
           peg$savedPos = s0;
-          s1 = peg$f37();
+          s1 = peg$f32();
         }
         s0 = s1;
         if (s0 === peg$FAILED) {
           s0 = peg$currPos;
           s1 = input.substr(peg$currPos, 4);
-          if (s1.toLowerCase() === peg$c30) {
+          if (s1.toLowerCase() === peg$c28) {
             peg$currPos += (4);
           } else {
             s1 = peg$FAILED;
-            if (peg$silentFails === 0) { peg$fail(peg$e31); }
+            if (peg$silentFails === 0) { peg$fail(peg$e29); }
           }
           if (s1 !== peg$FAILED) {
             peg$savedPos = s0;
-            s1 = peg$f38();
+            s1 = peg$f33();
           }
           s0 = s1;
         }
@@ -1902,7 +1667,7 @@ function peg$parse(input, options) {
         s5 = peg$parseIdent();
         if (s5 !== peg$FAILED) {
           peg$savedPos = s3;
-          s3 = peg$f39(s1, s5);
+          s3 = peg$f34(s1, s5);
         } else {
           peg$currPos = s3;
           s3 = peg$FAILED;
@@ -1925,7 +1690,7 @@ function peg$parse(input, options) {
           s5 = peg$parseIdent();
           if (s5 !== peg$FAILED) {
             peg$savedPos = s3;
-            s3 = peg$f39(s1, s5);
+            s3 = peg$f34(s1, s5);
           } else {
             peg$currPos = s3;
             s3 = peg$FAILED;
@@ -1936,7 +1701,7 @@ function peg$parse(input, options) {
         }
       }
       peg$savedPos = s0;
-      s0 = peg$f40(s1);
+      s0 = peg$f35(s1);
     } else {
       peg$currPos = s0;
       s0 = peg$FAILED;
@@ -1955,7 +1720,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s2 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e32); }
+      if (peg$silentFails === 0) { peg$fail(peg$e30); }
     }
     if (s2 !== peg$FAILED) {
       s3 = [];
@@ -1964,7 +1729,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s4 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e33); }
+        if (peg$silentFails === 0) { peg$fail(peg$e31); }
       }
       while (s4 !== peg$FAILED) {
         s3.push(s4);
@@ -1973,7 +1738,7 @@ function peg$parse(input, options) {
           peg$currPos++;
         } else {
           s4 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e33); }
+          if (peg$silentFails === 0) { peg$fail(peg$e31); }
         }
       }
       s2 = [s2, s3];
@@ -2001,7 +1766,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s2 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e34); }
+      if (peg$silentFails === 0) { peg$fail(peg$e32); }
     }
     if (s2 !== peg$FAILED) {
       s3 = [];
@@ -2010,7 +1775,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s4 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e33); }
+        if (peg$silentFails === 0) { peg$fail(peg$e31); }
       }
       while (s4 !== peg$FAILED) {
         s3.push(s4);
@@ -2019,7 +1784,7 @@ function peg$parse(input, options) {
           peg$currPos++;
         } else {
           s4 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e33); }
+          if (peg$silentFails === 0) { peg$fail(peg$e31); }
         }
       }
       s2 = [s2, s3];
@@ -2046,7 +1811,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e35); }
+      if (peg$silentFails === 0) { peg$fail(peg$e33); }
     }
     while (s1 !== peg$FAILED) {
       s0.push(s1);
@@ -2055,7 +1820,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e35); }
+        if (peg$silentFails === 0) { peg$fail(peg$e33); }
       }
     }