@aster-cloud/aster-lang-ts 0.0.28 → 0.0.30

package/dist/peg/headers-parser.js

@@ -164,110 +164,122 @@ function peg$parse(input, options) {
   };
   let peg$startRuleFunction = peg$parseStart;
 
-  const peg$c0 = "this module is";
+  const peg$c0 = "module";
   const peg$c1 = ".";
-  const peg$c2 = "use";
-  const peg$c3 = "as";
-  const peg$c4 = "define";
-  const peg$c5 = "with";
-  const peg$c6 = "one";
-  const peg$c7 = "of";
-  const peg$c8 = "to";
-  const peg$c9 = ",";
-  const peg$c10 = "produce";
-  const peg$c11 = ":";
-  const peg$c12 = "it";
-  const peg$c13 = "performs";
-  const peg$c14 = "io";
-  const peg$c15 = "cpu";
-  const peg$c16 = "and";
-  const peg$c17 = "or";
-  const peg$c18 = "maybe";
-  const peg$c19 = "option";
-  const peg$c20 = "result";
-  const peg$c21 = "list";
-  const peg$c22 = "map";
-  const peg$c23 = "text";
-  const peg$c24 = "int";
-  const peg$c25 = "float";
-  const peg$c26 = "bool";
+  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$r0 = /^[.:]/;
-  const peg$r1 = /^[A-Z]/;
-  const peg$r2 = /^[A-Za-z0-9_]/;
-  const peg$r3 = /^[a-z]/;
+  const peg$r1 = /^[A-Z\xC0-\xD6\xD8-\xDE\u0100-\u024F\u4E00-\u9FFF\u3400-\u4DBF]/;
+  const peg$r2 = /^[A-Za-z0-9_\xC0-\u024F\u4E00-\u9FFF\u3400-\u4DBF]/;
+  const peg$r3 = /^[a-z\xDF-\xF6\xF8-\xFF\u0100-\u024F\u4E00-\u9FFF\u3400-\u4DBF]/;
   const peg$r4 = /^[ \t]/;
 
-  const peg$e0 = peg$literalExpectation("this module is", true);
+  const peg$e0 = peg$literalExpectation("Module", true);
   const peg$e1 = peg$literalExpectation(".", 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("with", true);
-  const peg$e6 = peg$literalExpectation("one", true);
-  const peg$e7 = peg$literalExpectation("of", true);
-  const peg$e8 = peg$literalExpectation("to", true);
-  const peg$e9 = peg$literalExpectation(",", false);
-  const peg$e10 = peg$literalExpectation("produce", true);
-  const peg$e11 = peg$literalExpectation(":", false);
-  const peg$e12 = peg$literalExpectation("it", true);
-  const peg$e13 = peg$literalExpectation("performs", true);
-  const peg$e14 = peg$classExpectation([".", ":"], false, false, false);
-  const peg$e15 = peg$literalExpectation("io", true);
-  const peg$e16 = peg$literalExpectation("cpu", true);
-  const peg$e17 = peg$literalExpectation("and", true);
-  const peg$e18 = peg$literalExpectation("or", true);
-  const peg$e19 = peg$literalExpectation("maybe", true);
-  const peg$e20 = peg$literalExpectation("option", true);
-  const peg$e21 = peg$literalExpectation("result", true);
-  const peg$e22 = peg$literalExpectation("list", true);
-  const peg$e23 = peg$literalExpectation("map", true);
-  const peg$e24 = peg$literalExpectation("text", true);
-  const peg$e25 = peg$literalExpectation("int", true);
-  const peg$e26 = peg$literalExpectation("float", true);
-  const peg$e27 = peg$literalExpectation("bool", true);
-  const peg$e28 = peg$classExpectation([["A", "Z"]], false, false, false);
-  const peg$e29 = peg$classExpectation([["A", "Z"], ["a", "z"], ["0", "9"], "_"], false, false, false);
-  const peg$e30 = peg$classExpectation([["a", "z"]], false, false, false);
-  const peg$e31 = peg$classExpectation([" ", "\t"], false, false, 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);
 
   function peg$f0(h) {    return h;  }
   function peg$f1(n) {    return { kind: 'Module', name: n };  }
-  function peg$f2(n, a) {    return a;  }
-  function peg$f3(n) {    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() {    return ':';  }
-  function peg$f8() {    return '.';  }
-  function peg$f9(es) {    return es;  }
-  function peg$f10(e) {    return [e];  }
-  function peg$f11(e) {    return [e];  }
-  function peg$f12() {    return 'io';  }
-  function peg$f13() {    return 'cpu';  }
-  function peg$f14(ps) {    return ps;  }
-  function peg$f15(ps) {    return ps;  }
-  function peg$f16(a, b) {    return b;  }
-  function peg$f17(a) {    return [a].concat(b ?? []);  }
-  function peg$f18(n, t) {    return { name: n, type: t };  }
-  function peg$f19(a, b) {    return b;  }
-  function peg$f20(a) {    return [a].concat(b ?? []);  }
-  function peg$f21(n, t) {    return { name: n, type: t };  }
-  function peg$f22(a, b) {    return b;  }
-  function peg$f23(a) {    return [a].concat(b ?? []);  }
-  function peg$f24(t) {    return { kind: 'Maybe', type: t };  }
-  function peg$f25(t) {    return { kind: 'Option', type: t };  }
-  function peg$f26(ok, err) {    return { kind: 'Result', ok: ok, err: err };  }
-  function peg$f27(t) {    return { kind: 'List', type: t };  }
-  function peg$f28(k, v) {    return { kind: 'Map', key: k, val: v };  }
-  function peg$f29(t) {    return t;  }
-  function peg$f30(t) {    return text(t);  }
-  function peg$f31() {    return text('Text');  }
-  function peg$f32() {    return text('Int');  }
-  function peg$f33() {    return text('Float');  }
-  function peg$f34() {    return text('Bool');  }
-  function peg$f35(a, b) {    return b;  }
-  function peg$f36(a) {    return [a].concat(b ?? []).join('.');  }
+  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('.');  }
   let peg$currPos = options.peg$currPos | 0;
   let peg$savedPos = peg$currPos;
   const peg$posDetailsCache = [{ line: 1, column: 1 }];
@@ -449,9 +461,15 @@ function peg$parse(input, options) {
       if (s2 === peg$FAILED) {
         s2 = peg$parseData();
         if (s2 === peg$FAILED) {
-          s2 = peg$parseEnum();
+          s2 = peg$parseDataHas();
           if (s2 === peg$FAILED) {
-            s2 = peg$parseFuncHeader();
+            s2 = peg$parseEnum();
+            if (s2 === peg$FAILED) {
+              s2 = peg$parseFuncHeader();
+              if (s2 === peg$FAILED) {
+                s2 = peg$parseFuncHeaderLegacy();
+              }
+            }
           }
         }
       }
@@ -472,9 +490,9 @@ function peg$parse(input, options) {
     let s0, s1, s2, s3, s4, s5;
 
     s0 = peg$currPos;
-    s1 = input.substr(peg$currPos, 14);
+    s1 = input.substr(peg$currPos, 6);
     if (s1.toLowerCase() === peg$c0) {
-      peg$currPos += (14);
+      peg$currPos += (6);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e0); }
@@ -506,6 +524,43 @@ 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;
   }
@@ -515,11 +570,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 3);
-    if (s1.toLowerCase() === peg$c2) {
+    if (s1.toLowerCase() === peg$c3) {
       peg$currPos += (3);
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e2); }
+      if (peg$silentFails === 0) { peg$fail(peg$e3); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$parse_();
@@ -528,18 +583,18 @@ function peg$parse(input, options) {
         s4 = peg$parse_();
         s5 = peg$currPos;
         s6 = input.substr(peg$currPos, 2);
-        if (s6.toLowerCase() === peg$c3) {
+        if (s6.toLowerCase() === peg$c4) {
           peg$currPos += (2);
         } else {
           s6 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e3); }
+          if (peg$silentFails === 0) { peg$fail(peg$e4); }
         }
         if (s6 !== peg$FAILED) {
           s7 = peg$parse_();
           s8 = peg$parseIdent();
           if (s8 !== peg$FAILED) {
             peg$savedPos = s5;
-            s5 = peg$f2(s3, s8);
+            s5 = peg$f3(s3, s8);
           } else {
             peg$currPos = s5;
             s5 = peg$FAILED;
@@ -561,7 +616,69 @@ function peg$parse(input, options) {
         }
         if (s7 !== peg$FAILED) {
           peg$savedPos = s0;
-          s0 = peg$f3(s3);
+          s0 = peg$f4(s3, s5);
+        } 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$parseDataHas() {
+    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, 3);
+        if (s5.toLowerCase() === peg$c6) {
+          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;
@@ -583,11 +700,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 6);
-    if (s1.toLowerCase() === peg$c4) {
+    if (s1.toLowerCase() === peg$c5) {
       peg$currPos += (6);
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e4); }
+      if (peg$silentFails === 0) { peg$fail(peg$e5); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$parse_();
@@ -595,11 +712,11 @@ function peg$parse(input, options) {
       if (s3 !== peg$FAILED) {
         s4 = peg$parse_();
         s5 = input.substr(peg$currPos, 4);
-        if (s5.toLowerCase() === peg$c5) {
+        if (s5.toLowerCase() === peg$c7) {
           peg$currPos += (4);
         } else {
           s5 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e5); }
+          if (peg$silentFails === 0) { peg$fail(peg$e7); }
         }
         if (s5 !== peg$FAILED) {
           s6 = peg$parse_();
@@ -615,7 +732,7 @@ function peg$parse(input, options) {
             }
             if (s9 !== peg$FAILED) {
               peg$savedPos = s0;
-              s0 = peg$f4(s3, s7);
+              s0 = peg$f6(s3, s7);
             } else {
               peg$currPos = s0;
               s0 = peg$FAILED;
@@ -645,11 +762,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 6);
-    if (s1.toLowerCase() === peg$c4) {
+    if (s1.toLowerCase() === peg$c5) {
       peg$currPos += (6);
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e4); }
+      if (peg$silentFails === 0) { peg$fail(peg$e5); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$parse_();
@@ -657,29 +774,29 @@ function peg$parse(input, options) {
       if (s3 !== peg$FAILED) {
         s4 = peg$parse_();
         s5 = input.substr(peg$currPos, 2);
-        if (s5.toLowerCase() === peg$c3) {
+        if (s5.toLowerCase() === peg$c4) {
           peg$currPos += (2);
         } else {
           s5 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e3); }
+          if (peg$silentFails === 0) { peg$fail(peg$e4); }
         }
         if (s5 !== peg$FAILED) {
           s6 = peg$parse_();
           s7 = input.substr(peg$currPos, 3);
-          if (s7.toLowerCase() === peg$c6) {
+          if (s7.toLowerCase() === peg$c8) {
             peg$currPos += (3);
           } else {
             s7 = peg$FAILED;
-            if (peg$silentFails === 0) { peg$fail(peg$e6); }
+            if (peg$silentFails === 0) { peg$fail(peg$e8); }
           }
           if (s7 !== peg$FAILED) {
             s8 = peg$parse_();
             s9 = input.substr(peg$currPos, 2);
-            if (s9.toLowerCase() === peg$c7) {
+            if (s9.toLowerCase() === peg$c9) {
               peg$currPos += (2);
             } else {
               s9 = peg$FAILED;
-              if (peg$silentFails === 0) { peg$fail(peg$e7); }
+              if (peg$silentFails === 0) { peg$fail(peg$e9); }
             }
             if (s9 !== peg$FAILED) {
               s10 = peg$parse_();
@@ -695,7 +812,7 @@ function peg$parse(input, options) {
                 }
                 if (s13 !== peg$FAILED) {
                   peg$savedPos = s0;
-                  s0 = peg$f5(s3, s11);
+                  s0 = peg$f7(s3, s11);
                 } else {
                   peg$currPos = s0;
                   s0 = peg$FAILED;
@@ -731,13 +848,92 @@ function peg$parse(input, options) {
   function peg$parseFuncHeader() {
     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, 4);
+    if (s1.toLowerCase() === peg$c10) {
+      peg$currPos += (4);
+    } else {
+      s1 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$e10); }
+    }
+    if (s1 !== peg$FAILED) {
+      s2 = peg$parse_();
+      s3 = peg$parseIdent();
+      if (s3 !== peg$FAILED) {
+        s4 = peg$parse_();
+        s5 = peg$parseGivenParamPart();
+        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 (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$c8) {
+    if (s1.toLowerCase() === peg$c13) {
       peg$currPos += (2);
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e8); }
+      if (peg$silentFails === 0) { peg$fail(peg$e13); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$parse_();
@@ -750,20 +946,20 @@ function peg$parse(input, options) {
         }
         s6 = peg$parse_();
         if (input.charCodeAt(peg$currPos) === 44) {
-          s7 = peg$c9;
+          s7 = peg$c11;
           peg$currPos++;
         } else {
           s7 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e9); }
+          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$c10) {
+          if (s9.toLowerCase() === peg$c12) {
             peg$currPos += (7);
           } else {
             s9 = peg$FAILED;
-            if (peg$silentFails === 0) { peg$fail(peg$e10); }
+            if (peg$silentFails === 0) { peg$fail(peg$e12); }
           }
           if (s9 !== peg$FAILED) {
             s10 = peg$parse_();
@@ -778,7 +974,7 @@ function peg$parse(input, options) {
               s15 = peg$parseHeaderEnd();
               if (s15 !== peg$FAILED) {
                 peg$savedPos = s0;
-                s0 = peg$f6(s3, s5, s11, s13, s15);
+                s0 = peg$f9(s3, s5, s11, s13, s15);
               } else {
                 peg$currPos = s0;
                 s0 = peg$FAILED;
@@ -807,20 +1003,50 @@ function peg$parse(input, options) {
     return s0;
   }
 
+  function peg$parseGivenParamPart() {
+    let s0, s1, s2, s3, s4;
+
+    s0 = peg$currPos;
+    s1 = peg$parse_();
+    s2 = input.substr(peg$currPos, 5);
+    if (s2.toLowerCase() === peg$c14) {
+      peg$currPos += (5);
+    } else {
+      s2 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$e14); }
+    }
+    if (s2 !== peg$FAILED) {
+      s3 = peg$parse_();
+      s4 = peg$parseParamList();
+      if (s4 !== peg$FAILED) {
+        peg$savedPos = s0;
+        s0 = peg$f10(s4);
+      } else {
+        peg$currPos = s0;
+        s0 = peg$FAILED;
+      }
+    } else {
+      peg$currPos = s0;
+      s0 = peg$FAILED;
+    }
+
+    return s0;
+  }
+
   function peg$parseHeaderEnd() {
     let s0, s1;
 
     s0 = peg$currPos;
     if (input.charCodeAt(peg$currPos) === 58) {
-      s1 = peg$c11;
+      s1 = peg$c15;
       peg$currPos++;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e11); }
+      if (peg$silentFails === 0) { peg$fail(peg$e15); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f7();
+      s1 = peg$f11();
     }
     s0 = s1;
     if (s0 === peg$FAILED) {
@@ -834,7 +1060,7 @@ function peg$parse(input, options) {
       }
       if (s1 !== peg$FAILED) {
         peg$savedPos = s0;
-        s1 = peg$f8();
+        s1 = peg$f12();
       }
       s0 = s1;
     }
@@ -849,11 +1075,11 @@ function peg$parse(input, options) {
     s1 = peg$parse_();
     s2 = peg$currPos;
     s3 = input.substr(peg$currPos, 2);
-    if (s3.toLowerCase() === peg$c12) {
+    if (s3.toLowerCase() === peg$c16) {
       peg$currPos += (2);
     } else {
       s3 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e12); }
+      if (peg$silentFails === 0) { peg$fail(peg$e16); }
     }
     if (s3 !== peg$FAILED) {
       s4 = peg$parse_();
@@ -867,11 +1093,11 @@ function peg$parse(input, options) {
       s2 = null;
     }
     s3 = input.substr(peg$currPos, 8);
-    if (s3.toLowerCase() === peg$c13) {
+    if (s3.toLowerCase() === peg$c17) {
       peg$currPos += (8);
     } else {
       s3 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e13); }
+      if (peg$silentFails === 0) { peg$fail(peg$e17); }
     }
     if (s3 !== peg$FAILED) {
       s4 = peg$parse_();
@@ -883,11 +1109,11 @@ function peg$parse(input, options) {
           peg$currPos++;
         } else {
           s7 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e14); }
+          if (peg$silentFails === 0) { peg$fail(peg$e18); }
         }
         if (s7 !== peg$FAILED) {
           peg$savedPos = s0;
-          s0 = peg$f9(s5);
+          s0 = peg$f13(s5);
         } else {
           peg$currPos = s0;
           s0 = peg$FAILED;
@@ -914,11 +1140,11 @@ function peg$parse(input, options) {
       s3 = peg$currPos;
       s4 = peg$parse_();
       if (input.charCodeAt(peg$currPos) === 44) {
-        s5 = peg$c9;
+        s5 = peg$c11;
         peg$currPos++;
       } else {
         s5 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e9); }
+        if (peg$silentFails === 0) { peg$fail(peg$e11); }
       }
       if (s5 !== peg$FAILED) {
         s6 = peg$parse_();
@@ -939,11 +1165,11 @@ function peg$parse(input, options) {
         s3 = peg$currPos;
         s4 = peg$parse_();
         if (input.charCodeAt(peg$currPos) === 44) {
-          s5 = peg$c9;
+          s5 = peg$c11;
           peg$currPos++;
         } else {
           s5 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e9); }
+          if (peg$silentFails === 0) { peg$fail(peg$e11); }
         }
         if (s5 !== peg$FAILED) {
           s6 = peg$parse_();
@@ -961,7 +1187,7 @@ function peg$parse(input, options) {
         }
       }
       peg$savedPos = s0;
-      s0 = peg$f10(s1);
+      s0 = peg$f14(s1);
     } else {
       peg$currPos = s0;
       s0 = peg$FAILED;
@@ -995,7 +1221,7 @@ function peg$parse(input, options) {
           }
         }
         peg$savedPos = s0;
-        s0 = peg$f11(s1);
+        s0 = peg$f15(s1);
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -1010,29 +1236,29 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 2);
-    if (s1.toLowerCase() === peg$c14) {
+    if (s1.toLowerCase() === peg$c18) {
       peg$currPos += (2);
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e15); }
+      if (peg$silentFails === 0) { peg$fail(peg$e19); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f12();
+      s1 = peg$f16();
     }
     s0 = s1;
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 3);
-      if (s1.toLowerCase() === peg$c15) {
+      if (s1.toLowerCase() === peg$c19) {
         peg$currPos += (3);
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e16); }
+        if (peg$silentFails === 0) { peg$fail(peg$e20); }
       }
       if (s1 !== peg$FAILED) {
         peg$savedPos = s0;
-        s1 = peg$f13();
+        s1 = peg$f17();
       }
       s0 = s1;
     }
@@ -1046,18 +1272,18 @@ function peg$parse(input, options) {
     s0 = peg$currPos;
     s1 = peg$parse_();
     s2 = input.substr(peg$currPos, 4);
-    if (s2.toLowerCase() === peg$c5) {
+    if (s2.toLowerCase() === peg$c7) {
       peg$currPos += (4);
     } else {
       s2 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e5); }
+      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$f14(s4);
+        s0 = peg$f18(s4);
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -1072,7 +1298,7 @@ function peg$parse(input, options) {
       s2 = peg$parseParamList();
       if (s2 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f15(s2);
+        s0 = peg$f19(s2);
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -1092,18 +1318,18 @@ function peg$parse(input, options) {
       s3 = peg$currPos;
       s4 = peg$parse_();
       s5 = input.substr(peg$currPos, 3);
-      if (s5.toLowerCase() === peg$c16) {
+      if (s5.toLowerCase() === peg$c20) {
         peg$currPos += (3);
       } else {
         s5 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e17); }
+        if (peg$silentFails === 0) { peg$fail(peg$e21); }
       }
       if (s5 !== peg$FAILED) {
         s6 = peg$parse_();
         s7 = peg$parseParam();
         if (s7 !== peg$FAILED) {
           peg$savedPos = s3;
-          s3 = peg$f16(s1, s7);
+          s3 = peg$f20(s1, s7);
         } else {
           peg$currPos = s3;
           s3 = peg$FAILED;
@@ -1117,18 +1343,18 @@ function peg$parse(input, options) {
         s3 = peg$currPos;
         s4 = peg$parse_();
         s5 = input.substr(peg$currPos, 3);
-        if (s5.toLowerCase() === peg$c16) {
+        if (s5.toLowerCase() === peg$c20) {
           peg$currPos += (3);
         } else {
           s5 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e17); }
+          if (peg$silentFails === 0) { peg$fail(peg$e21); }
         }
         if (s5 !== peg$FAILED) {
           s6 = peg$parse_();
           s7 = peg$parseParam();
           if (s7 !== peg$FAILED) {
             peg$savedPos = s3;
-            s3 = peg$f16(s1, s7);
+            s3 = peg$f20(s1, s7);
           } else {
             peg$currPos = s3;
             s3 = peg$FAILED;
@@ -1139,7 +1365,7 @@ function peg$parse(input, options) {
         }
       }
       peg$savedPos = s0;
-      s0 = peg$f17(s1);
+      s0 = peg$f21(s1);
     } else {
       peg$currPos = s0;
       s0 = peg$FAILED;
@@ -1156,18 +1382,18 @@ function peg$parse(input, options) {
     if (s1 !== peg$FAILED) {
       s2 = peg$parse_();
       if (input.charCodeAt(peg$currPos) === 58) {
-        s3 = peg$c11;
+        s3 = peg$c15;
         peg$currPos++;
       } else {
         s3 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e11); }
+        if (peg$silentFails === 0) { peg$fail(peg$e15); }
       }
       if (s3 !== peg$FAILED) {
         s4 = peg$parse_();
         s5 = peg$parseType();
         if (s5 !== peg$FAILED) {
           peg$savedPos = s0;
-          s0 = peg$f18(s1, s5);
+          s0 = peg$f22(s1, s5);
         } else {
           peg$currPos = s0;
           s0 = peg$FAILED;
@@ -1194,18 +1420,18 @@ function peg$parse(input, options) {
       s3 = peg$currPos;
       s4 = peg$parse_();
       s5 = input.substr(peg$currPos, 3);
-      if (s5.toLowerCase() === peg$c16) {
+      if (s5.toLowerCase() === peg$c20) {
         peg$currPos += (3);
       } else {
         s5 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e17); }
+        if (peg$silentFails === 0) { peg$fail(peg$e21); }
       }
       if (s5 !== peg$FAILED) {
         s6 = peg$parse_();
         s7 = peg$parseField();
         if (s7 !== peg$FAILED) {
           peg$savedPos = s3;
-          s3 = peg$f19(s1, s7);
+          s3 = peg$f23(s1, s7);
         } else {
           peg$currPos = s3;
           s3 = peg$FAILED;
@@ -1219,18 +1445,18 @@ function peg$parse(input, options) {
         s3 = peg$currPos;
         s4 = peg$parse_();
         s5 = input.substr(peg$currPos, 3);
-        if (s5.toLowerCase() === peg$c16) {
+        if (s5.toLowerCase() === peg$c20) {
           peg$currPos += (3);
         } else {
           s5 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e17); }
+          if (peg$silentFails === 0) { peg$fail(peg$e21); }
         }
         if (s5 !== peg$FAILED) {
           s6 = peg$parse_();
           s7 = peg$parseField();
           if (s7 !== peg$FAILED) {
             peg$savedPos = s3;
-            s3 = peg$f19(s1, s7);
+            s3 = peg$f23(s1, s7);
           } else {
             peg$currPos = s3;
             s3 = peg$FAILED;
@@ -1241,7 +1467,7 @@ function peg$parse(input, options) {
         }
       }
       peg$savedPos = s0;
-      s0 = peg$f20(s1);
+      s0 = peg$f24(s1);
     } else {
       peg$currPos = s0;
       s0 = peg$FAILED;
@@ -1258,18 +1484,18 @@ function peg$parse(input, options) {
     if (s1 !== peg$FAILED) {
       s2 = peg$parse_();
       if (input.charCodeAt(peg$currPos) === 58) {
-        s3 = peg$c11;
+        s3 = peg$c15;
         peg$currPos++;
       } else {
         s3 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e11); }
+        if (peg$silentFails === 0) { peg$fail(peg$e15); }
       }
       if (s3 !== peg$FAILED) {
         s4 = peg$parse_();
         s5 = peg$parseType();
         if (s5 !== peg$FAILED) {
           peg$savedPos = s0;
-          s0 = peg$f21(s1, s5);
+          s0 = peg$f25(s1, s5);
         } else {
           peg$currPos = s0;
           s0 = peg$FAILED;
@@ -1296,19 +1522,19 @@ function peg$parse(input, options) {
       s3 = peg$currPos;
       s4 = peg$parse_();
       if (input.charCodeAt(peg$currPos) === 44) {
-        s5 = peg$c9;
+        s5 = peg$c11;
         peg$currPos++;
       } else {
         s5 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e9); }
+        if (peg$silentFails === 0) { peg$fail(peg$e11); }
       }
       if (s5 === peg$FAILED) {
         s5 = input.substr(peg$currPos, 2);
-        if (s5.toLowerCase() === peg$c17) {
+        if (s5.toLowerCase() === peg$c21) {
           peg$currPos += (2);
         } else {
           s5 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e18); }
+          if (peg$silentFails === 0) { peg$fail(peg$e22); }
         }
       }
       if (s5 !== peg$FAILED) {
@@ -1316,7 +1542,7 @@ function peg$parse(input, options) {
         s7 = peg$parseTypeIdent();
         if (s7 !== peg$FAILED) {
           peg$savedPos = s3;
-          s3 = peg$f22(s1, s7);
+          s3 = peg$f26(s1, s7);
         } else {
           peg$currPos = s3;
           s3 = peg$FAILED;
@@ -1330,19 +1556,19 @@ function peg$parse(input, options) {
         s3 = peg$currPos;
         s4 = peg$parse_();
         if (input.charCodeAt(peg$currPos) === 44) {
-          s5 = peg$c9;
+          s5 = peg$c11;
           peg$currPos++;
         } else {
           s5 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e9); }
+          if (peg$silentFails === 0) { peg$fail(peg$e11); }
         }
         if (s5 === peg$FAILED) {
           s5 = input.substr(peg$currPos, 2);
-          if (s5.toLowerCase() === peg$c17) {
+          if (s5.toLowerCase() === peg$c21) {
             peg$currPos += (2);
           } else {
             s5 = peg$FAILED;
-            if (peg$silentFails === 0) { peg$fail(peg$e18); }
+            if (peg$silentFails === 0) { peg$fail(peg$e22); }
           }
         }
         if (s5 !== peg$FAILED) {
@@ -1350,7 +1576,7 @@ function peg$parse(input, options) {
           s7 = peg$parseTypeIdent();
           if (s7 !== peg$FAILED) {
             peg$savedPos = s3;
-            s3 = peg$f22(s1, s7);
+            s3 = peg$f26(s1, s7);
           } else {
             peg$currPos = s3;
             s3 = peg$FAILED;
@@ -1361,7 +1587,7 @@ function peg$parse(input, options) {
         }
       }
       peg$savedPos = s0;
-      s0 = peg$f23(s1);
+      s0 = peg$f27(s1);
     } else {
       peg$currPos = s0;
       s0 = peg$FAILED;
@@ -1375,18 +1601,18 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 5);
-    if (s1.toLowerCase() === peg$c18) {
+    if (s1.toLowerCase() === peg$c22) {
       peg$currPos += (5);
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e19); }
+      if (peg$silentFails === 0) { peg$fail(peg$e23); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$parse_();
       s3 = peg$parseType();
       if (s3 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f24(s3);
+        s0 = peg$f28(s3);
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -1398,27 +1624,27 @@ function peg$parse(input, options) {
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 6);
-      if (s1.toLowerCase() === peg$c19) {
+      if (s1.toLowerCase() === peg$c23) {
         peg$currPos += (6);
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e20); }
+        if (peg$silentFails === 0) { peg$fail(peg$e24); }
       }
       if (s1 !== peg$FAILED) {
         s2 = peg$parse_();
         s3 = input.substr(peg$currPos, 2);
-        if (s3.toLowerCase() === peg$c7) {
+        if (s3.toLowerCase() === peg$c9) {
           peg$currPos += (2);
         } else {
           s3 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e7); }
+          if (peg$silentFails === 0) { peg$fail(peg$e9); }
         }
         if (s3 !== peg$FAILED) {
           s4 = peg$parse_();
           s5 = peg$parseType();
           if (s5 !== peg$FAILED) {
             peg$savedPos = s0;
-            s0 = peg$f25(s5);
+            s0 = peg$f29(s5);
           } else {
             peg$currPos = s0;
             s0 = peg$FAILED;
@@ -1434,20 +1660,20 @@ function peg$parse(input, options) {
       if (s0 === peg$FAILED) {
         s0 = peg$currPos;
         s1 = input.substr(peg$currPos, 6);
-        if (s1.toLowerCase() === peg$c20) {
+        if (s1.toLowerCase() === peg$c24) {
           peg$currPos += (6);
         } else {
           s1 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e21); }
+          if (peg$silentFails === 0) { peg$fail(peg$e25); }
         }
         if (s1 !== peg$FAILED) {
           s2 = peg$parse_();
           s3 = input.substr(peg$currPos, 2);
-          if (s3.toLowerCase() === peg$c7) {
+          if (s3.toLowerCase() === peg$c9) {
             peg$currPos += (2);
           } else {
             s3 = peg$FAILED;
-            if (peg$silentFails === 0) { peg$fail(peg$e7); }
+            if (peg$silentFails === 0) { peg$fail(peg$e9); }
           }
           if (s3 !== peg$FAILED) {
             s4 = peg$parse_();
@@ -1455,18 +1681,18 @@ function peg$parse(input, options) {
             if (s5 !== peg$FAILED) {
               s6 = peg$parse_();
               s7 = input.substr(peg$currPos, 2);
-              if (s7.toLowerCase() === peg$c17) {
+              if (s7.toLowerCase() === peg$c21) {
                 peg$currPos += (2);
               } else {
                 s7 = peg$FAILED;
-                if (peg$silentFails === 0) { peg$fail(peg$e18); }
+                if (peg$silentFails === 0) { peg$fail(peg$e22); }
               }
               if (s7 !== peg$FAILED) {
                 s8 = peg$parse_();
                 s9 = peg$parseType();
                 if (s9 !== peg$FAILED) {
                   peg$savedPos = s0;
-                  s0 = peg$f26(s5, s9);
+                  s0 = peg$f30(s5, s9);
                 } else {
                   peg$currPos = s0;
                   s0 = peg$FAILED;
@@ -1490,27 +1716,27 @@ function peg$parse(input, options) {
         if (s0 === peg$FAILED) {
           s0 = peg$currPos;
           s1 = input.substr(peg$currPos, 4);
-          if (s1.toLowerCase() === peg$c21) {
+          if (s1.toLowerCase() === peg$c25) {
             peg$currPos += (4);
           } else {
             s1 = peg$FAILED;
-            if (peg$silentFails === 0) { peg$fail(peg$e22); }
+            if (peg$silentFails === 0) { peg$fail(peg$e26); }
           }
           if (s1 !== peg$FAILED) {
             s2 = peg$parse_();
             s3 = input.substr(peg$currPos, 2);
-            if (s3.toLowerCase() === peg$c7) {
+            if (s3.toLowerCase() === peg$c9) {
               peg$currPos += (2);
             } else {
               s3 = peg$FAILED;
-              if (peg$silentFails === 0) { peg$fail(peg$e7); }
+              if (peg$silentFails === 0) { peg$fail(peg$e9); }
             }
             if (s3 !== peg$FAILED) {
               s4 = peg$parse_();
               s5 = peg$parseType();
               if (s5 !== peg$FAILED) {
                 peg$savedPos = s0;
-                s0 = peg$f27(s5);
+                s0 = peg$f31(s5);
               } else {
                 peg$currPos = s0;
                 s0 = peg$FAILED;
@@ -1526,11 +1752,11 @@ function peg$parse(input, options) {
           if (s0 === peg$FAILED) {
             s0 = peg$currPos;
             s1 = input.substr(peg$currPos, 3);
-            if (s1.toLowerCase() === peg$c22) {
+            if (s1.toLowerCase() === peg$c26) {
               peg$currPos += (3);
             } else {
               s1 = peg$FAILED;
-              if (peg$silentFails === 0) { peg$fail(peg$e23); }
+              if (peg$silentFails === 0) { peg$fail(peg$e27); }
             }
             if (s1 !== peg$FAILED) {
               s2 = peg$parse_();
@@ -1538,18 +1764,18 @@ function peg$parse(input, options) {
               if (s3 !== peg$FAILED) {
                 s4 = peg$parse_();
                 s5 = input.substr(peg$currPos, 2);
-                if (s5.toLowerCase() === peg$c8) {
+                if (s5.toLowerCase() === peg$c13) {
                   peg$currPos += (2);
                 } else {
                   s5 = peg$FAILED;
-                  if (peg$silentFails === 0) { peg$fail(peg$e8); }
+                  if (peg$silentFails === 0) { peg$fail(peg$e13); }
                 }
                 if (s5 !== peg$FAILED) {
                   s6 = peg$parse_();
                   s7 = peg$parseType();
                   if (s7 !== peg$FAILED) {
                     peg$savedPos = s0;
-                    s0 = peg$f28(s3, s7);
+                    s0 = peg$f32(s3, s7);
                   } else {
                     peg$currPos = s0;
                     s0 = peg$FAILED;
@@ -1571,7 +1797,7 @@ function peg$parse(input, options) {
               s1 = peg$parsePrimType();
               if (s1 !== peg$FAILED) {
                 peg$savedPos = s0;
-                s1 = peg$f29(s1);
+                s1 = peg$f33(s1);
               }
               s0 = s1;
               if (s0 === peg$FAILED) {
@@ -1579,7 +1805,7 @@ function peg$parse(input, options) {
                 s1 = peg$parseTypeIdent();
                 if (s1 !== peg$FAILED) {
                   peg$savedPos = s0;
-                  s1 = peg$f30(s1);
+                  s1 = peg$f34(s1);
                 }
                 s0 = s1;
               }
@@ -1597,57 +1823,57 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 4);
-    if (s1.toLowerCase() === peg$c23) {
+    if (s1.toLowerCase() === peg$c27) {
       peg$currPos += (4);
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e24); }
+      if (peg$silentFails === 0) { peg$fail(peg$e28); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f31();
+      s1 = peg$f35();
     }
     s0 = s1;
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 3);
-      if (s1.toLowerCase() === peg$c24) {
+      if (s1.toLowerCase() === peg$c28) {
         peg$currPos += (3);
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e25); }
+        if (peg$silentFails === 0) { peg$fail(peg$e29); }
       }
       if (s1 !== peg$FAILED) {
         peg$savedPos = s0;
-        s1 = peg$f32();
+        s1 = peg$f36();
       }
       s0 = s1;
       if (s0 === peg$FAILED) {
         s0 = peg$currPos;
         s1 = input.substr(peg$currPos, 5);
-        if (s1.toLowerCase() === peg$c25) {
+        if (s1.toLowerCase() === peg$c29) {
           peg$currPos += (5);
         } else {
           s1 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e26); }
+          if (peg$silentFails === 0) { peg$fail(peg$e30); }
         }
         if (s1 !== peg$FAILED) {
           peg$savedPos = s0;
-          s1 = peg$f33();
+          s1 = peg$f37();
         }
         s0 = s1;
         if (s0 === peg$FAILED) {
           s0 = peg$currPos;
           s1 = input.substr(peg$currPos, 4);
-          if (s1.toLowerCase() === peg$c26) {
+          if (s1.toLowerCase() === peg$c30) {
             peg$currPos += (4);
           } else {
             s1 = peg$FAILED;
-            if (peg$silentFails === 0) { peg$fail(peg$e27); }
+            if (peg$silentFails === 0) { peg$fail(peg$e31); }
           }
           if (s1 !== peg$FAILED) {
             peg$savedPos = s0;
-            s1 = peg$f34();
+            s1 = peg$f38();
           }
           s0 = s1;
         }
@@ -1676,7 +1902,7 @@ function peg$parse(input, options) {
         s5 = peg$parseIdent();
         if (s5 !== peg$FAILED) {
           peg$savedPos = s3;
-          s3 = peg$f35(s1, s5);
+          s3 = peg$f39(s1, s5);
         } else {
           peg$currPos = s3;
           s3 = peg$FAILED;
@@ -1699,7 +1925,7 @@ function peg$parse(input, options) {
           s5 = peg$parseIdent();
           if (s5 !== peg$FAILED) {
             peg$savedPos = s3;
-            s3 = peg$f35(s1, s5);
+            s3 = peg$f39(s1, s5);
           } else {
             peg$currPos = s3;
             s3 = peg$FAILED;
@@ -1710,7 +1936,7 @@ function peg$parse(input, options) {
         }
       }
       peg$savedPos = s0;
-      s0 = peg$f36(s1);
+      s0 = peg$f40(s1);
     } else {
       peg$currPos = s0;
       s0 = peg$FAILED;
@@ -1729,7 +1955,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s2 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e28); }
+      if (peg$silentFails === 0) { peg$fail(peg$e32); }
     }
     if (s2 !== peg$FAILED) {
       s3 = [];
@@ -1738,7 +1964,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s4 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e29); }
+        if (peg$silentFails === 0) { peg$fail(peg$e33); }
       }
       while (s4 !== peg$FAILED) {
         s3.push(s4);
@@ -1747,7 +1973,7 @@ function peg$parse(input, options) {
           peg$currPos++;
         } else {
           s4 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e29); }
+          if (peg$silentFails === 0) { peg$fail(peg$e33); }
         }
       }
       s2 = [s2, s3];
@@ -1775,7 +2001,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s2 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e30); }
+      if (peg$silentFails === 0) { peg$fail(peg$e34); }
     }
     if (s2 !== peg$FAILED) {
       s3 = [];
@@ -1784,7 +2010,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s4 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e29); }
+        if (peg$silentFails === 0) { peg$fail(peg$e33); }
       }
       while (s4 !== peg$FAILED) {
         s3.push(s4);
@@ -1793,7 +2019,7 @@ function peg$parse(input, options) {
           peg$currPos++;
         } else {
           s4 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e29); }
+          if (peg$silentFails === 0) { peg$fail(peg$e33); }
         }
       }
       s2 = [s2, s3];
@@ -1820,7 +2046,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e31); }
+      if (peg$silentFails === 0) { peg$fail(peg$e35); }
     }
     while (s1 !== peg$FAILED) {
       s0.push(s1);
@@ -1829,7 +2055,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e31); }
+        if (peg$silentFails === 0) { peg$fail(peg$e35); }
       }
     }