@wireweave/core 2.4.0 → 2.5.0

package/dist/parser.js

@@ -159,30 +159,32 @@ function peg$parse(input, options) {
   const peg$c49 = "tabs";
   const peg$c50 = "tab";
   const peg$c51 = "breadcrumb";
-  const peg$c52 = "=";
-  const peg$c53 = "//";
-  const peg$c54 = "/*";
-  const peg$c55 = '"';
-  const peg$c56 = "'";
-  const peg$c57 = "\\";
-  const peg$c58 = "n";
-  const peg$c59 = "r";
-  const peg$c60 = "t";
-  const peg$c61 = "-";
-  const peg$c62 = ".";
-  const peg$c63 = "px";
-  const peg$c64 = "%";
-  const peg$c65 = "em";
-  const peg$c66 = "rem";
-  const peg$c67 = "vh";
-  const peg$c68 = "vw";
-  const peg$c69 = "true";
-  const peg$c70 = "false";
-  const peg$c71 = "\n";
-  const peg$c72 = "*/";
-  const peg$r0 = /^[=[{}]/;
-  const peg$r1 = /^[a-zA-Z0-9_\-]/;
-  const peg$r2 = /^[0-9]/;
+  const peg$c52 = "marker";
+  const peg$c53 = "annotations";
+  const peg$c54 = "=";
+  const peg$c55 = "//";
+  const peg$c56 = "/*";
+  const peg$c57 = '"';
+  const peg$c58 = "'";
+  const peg$c59 = "\\";
+  const peg$c60 = "n";
+  const peg$c61 = "r";
+  const peg$c62 = "t";
+  const peg$c63 = "-";
+  const peg$c64 = ".";
+  const peg$c65 = "px";
+  const peg$c66 = "%";
+  const peg$c67 = "em";
+  const peg$c68 = "rem";
+  const peg$c69 = "vh";
+  const peg$c70 = "vw";
+  const peg$c71 = "true";
+  const peg$c72 = "false";
+  const peg$c73 = "\n";
+  const peg$c74 = "*/";
+  const peg$r0 = /^[0-9]/;
+  const peg$r1 = /^[=[{}]/;
+  const peg$r2 = /^[a-zA-Z0-9_\-]/;
   const peg$r3 = /^[a-zA-Z_]/;
   const peg$r4 = /^[ \t\n\r]/;
   const peg$r5 = /^[^\n]/;
@@ -238,40 +240,43 @@ function peg$parse(input, options) {
   const peg$e49 = peg$literalExpectation("tabs", false);
   const peg$e50 = peg$literalExpectation("tab", false);
   const peg$e51 = peg$literalExpectation("breadcrumb", false);
-  const peg$e52 = peg$literalExpectation("=", false);
-  const peg$e53 = peg$classExpectation(["=", "[", "{", "}"], false, false, false);
-  const peg$e54 = peg$literalExpectation("//", false);
-  const peg$e55 = peg$literalExpectation("/*", false);
-  const peg$e56 = peg$anyExpectation();
-  const peg$e57 = peg$classExpectation([["a", "z"], ["A", "Z"], ["0", "9"], "_", "-"], false, false, false);
-  const peg$e58 = peg$otherExpectation("string");
-  const peg$e59 = peg$literalExpectation('"', false);
-  const peg$e60 = peg$literalExpectation("'", false);
-  const peg$e61 = peg$literalExpectation("\\", false);
-  const peg$e62 = peg$literalExpectation("n", false);
-  const peg$e63 = peg$literalExpectation("r", false);
-  const peg$e64 = peg$literalExpectation("t", false);
-  const peg$e65 = peg$otherExpectation("number");
-  const peg$e66 = peg$literalExpectation("-", false);
-  const peg$e67 = peg$classExpectation([["0", "9"]], false, false, false);
-  const peg$e68 = peg$literalExpectation(".", false);
-  const peg$e69 = peg$otherExpectation("value with unit");
-  const peg$e70 = peg$literalExpectation("px", false);
-  const peg$e71 = peg$literalExpectation("%", false);
-  const peg$e72 = peg$literalExpectation("em", false);
-  const peg$e73 = peg$literalExpectation("rem", false);
-  const peg$e74 = peg$literalExpectation("vh", false);
-  const peg$e75 = peg$literalExpectation("vw", false);
-  const peg$e76 = peg$otherExpectation("boolean");
-  const peg$e77 = peg$literalExpectation("true", false);
-  const peg$e78 = peg$literalExpectation("false", false);
-  const peg$e79 = peg$otherExpectation("identifier");
-  const peg$e80 = peg$classExpectation([["a", "z"], ["A", "Z"], "_"], false, false, false);
-  const peg$e81 = peg$classExpectation([" ", "	", "\n", "\r"], false, false, false);
-  const peg$e82 = peg$otherExpectation("comment");
-  const peg$e83 = peg$classExpectation(["\n"], true, false, false);
-  const peg$e84 = peg$literalExpectation("\n", false);
-  const peg$e85 = peg$literalExpectation("*/", false);
+  const peg$e52 = peg$literalExpectation("marker", false);
+  const peg$e53 = peg$literalExpectation("annotations", false);
+  const peg$e54 = peg$otherExpectation("integer");
+  const peg$e55 = peg$classExpectation([["0", "9"]], false, false, false);
+  const peg$e56 = peg$literalExpectation("=", false);
+  const peg$e57 = peg$classExpectation(["=", "[", "{", "}"], false, false, false);
+  const peg$e58 = peg$literalExpectation("//", false);
+  const peg$e59 = peg$literalExpectation("/*", false);
+  const peg$e60 = peg$anyExpectation();
+  const peg$e61 = peg$classExpectation([["a", "z"], ["A", "Z"], ["0", "9"], "_", "-"], false, false, false);
+  const peg$e62 = peg$otherExpectation("string");
+  const peg$e63 = peg$literalExpectation('"', false);
+  const peg$e64 = peg$literalExpectation("'", false);
+  const peg$e65 = peg$literalExpectation("\\", false);
+  const peg$e66 = peg$literalExpectation("n", false);
+  const peg$e67 = peg$literalExpectation("r", false);
+  const peg$e68 = peg$literalExpectation("t", false);
+  const peg$e69 = peg$otherExpectation("number");
+  const peg$e70 = peg$literalExpectation("-", false);
+  const peg$e71 = peg$literalExpectation(".", false);
+  const peg$e72 = peg$otherExpectation("value with unit");
+  const peg$e73 = peg$literalExpectation("px", false);
+  const peg$e74 = peg$literalExpectation("%", false);
+  const peg$e75 = peg$literalExpectation("em", false);
+  const peg$e76 = peg$literalExpectation("rem", false);
+  const peg$e77 = peg$literalExpectation("vh", false);
+  const peg$e78 = peg$literalExpectation("vw", false);
+  const peg$e79 = peg$otherExpectation("boolean");
+  const peg$e80 = peg$literalExpectation("true", false);
+  const peg$e81 = peg$literalExpectation("false", false);
+  const peg$e82 = peg$otherExpectation("identifier");
+  const peg$e83 = peg$classExpectation([["a", "z"], ["A", "Z"], "_"], false, false, false);
+  const peg$e84 = peg$classExpectation([" ", "	", "\n", "\r"], false, false, false);
+  const peg$e85 = peg$otherExpectation("comment");
+  const peg$e86 = peg$classExpectation(["\n"], true, false, false);
+  const peg$e87 = peg$literalExpectation("\n", false);
+  const peg$e88 = peg$literalExpectation("*/", false);
   function peg$f0(children) {
     return createNode("Document", { children: children.filter((c) => c !== null) });
   }
@@ -669,78 +674,115 @@ function peg$parse(input, options) {
       ...attrsToObject(attrs)
     });
   }
-  function peg$f71(attrs) {
+  function peg$f71(num, attrs) {
+    return createNode("Marker", {
+      number: num,
+      ...attrsToObject(attrs)
+    });
+  }
+  function peg$f72(attrs, items) {
+    return createNode("Annotations", {
+      ...attrsToObject(attrs),
+      children: items
+    });
+  }
+  function peg$f73(items) {
+    return items.map((i) => i[0]).filter((i) => i !== null);
+  }
+  function peg$f74(num, title, attrs, children) {
+    return createNode("AnnotationItem", {
+      number: num,
+      title,
+      ...attrsToObject(attrs),
+      children
+    });
+  }
+  function peg$f75(num, title, attrs) {
+    return createNode("AnnotationItem", {
+      number: num,
+      title,
+      ...attrsToObject(attrs),
+      children: []
+    });
+  }
+  function peg$f76() {
+    return null;
+  }
+  function peg$f77(digits) {
+    return parseInt(digits.join(""), 10);
+  }
+  function peg$f78(attrs) {
     return attrs;
   }
-  function peg$f72(name, value) {
+  function peg$f79(name, value) {
     return { name, value };
   }
-  function peg$f73(flag) {
+  function peg$f80(flag) {
     return { name: flag, value: true };
   }
-  function peg$f74(name) {
+  function peg$f81(name) {
     return name;
   }
-  function peg$f75(chars) {
+  function peg$f82(chars) {
     return chars.join("");
   }
-  function peg$f76(chars) {
+  function peg$f83(chars) {
     return chars.join("");
   }
-  function peg$f77(char) {
+  function peg$f84(char) {
     return char;
   }
-  function peg$f78(seq) {
+  function peg$f85(seq) {
     return seq;
   }
-  function peg$f79(char) {
+  function peg$f86(char) {
     return char;
   }
-  function peg$f80(seq) {
+  function peg$f87(seq) {
     return seq;
   }
-  function peg$f81() {
+  function peg$f88() {
     return "\n";
   }
-  function peg$f82() {
+  function peg$f89() {
     return "\r";
   }
-  function peg$f83() {
+  function peg$f90() {
     return "	";
   }
-  function peg$f84() {
+  function peg$f91() {
     return "\\";
   }
-  function peg$f85() {
+  function peg$f92() {
     return '"';
   }
-  function peg$f86() {
+  function peg$f93() {
     return "'";
   }
-  function peg$f87(sign, digits, decimal) {
+  function peg$f94(sign, digits, decimal) {
     const num = (sign || "") + digits.join("") + (decimal ? "." + decimal[1].join("") : "");
     return parseFloat(num);
   }
-  function peg$f88(sign, digits, decimal, unit) {
+  function peg$f95(sign, digits, decimal, unit) {
     const num = (sign || "") + digits.join("") + (decimal ? "." + decimal[1].join("") : "");
     return { value: parseFloat(num), unit };
   }
-  function peg$f89() {
+  function peg$f96() {
     return true;
   }
-  function peg$f90() {
+  function peg$f97() {
     return false;
   }
-  function peg$f91(head, tail) {
+  function peg$f98(head, tail) {
     return head + tail.join("");
   }
-  function peg$f92(items) {
+  function peg$f99(items) {
     return items || [];
   }
-  function peg$f93(head, tail) {
+  function peg$f100(head, tail) {
     return [head, ...tail.map((t) => t[3])];
   }
-  function peg$f94(props) {
+  function peg$f101(props) {
     const result = {};
     if (props) {
       for (const p of props) {
@@ -749,13 +791,13 @@ function peg$parse(input, options) {
     }
     return result;
   }
-  function peg$f95(head, tail) {
+  function peg$f102(head, tail) {
     return [head, ...tail.map((t) => t[3])];
   }
-  function peg$f96(name, value) {
+  function peg$f103(name, value) {
     return { name, value };
   }
-  function peg$f97(name) {
+  function peg$f104(name) {
     return { name, value: true };
   }
   let peg$currPos = options.peg$currPos | 0;
@@ -1985,6 +2027,12 @@ function peg$parse(input, options) {
                                                           s0 = peg$parseBreadcrumb();
                                                           if (s0 === peg$FAILED) {
                                                             s0 = peg$parseDivider();
+                                                            if (s0 === peg$FAILED) {
+                                                              s0 = peg$parseMarker();
+                                                              if (s0 === peg$FAILED) {
+                                                                s0 = peg$parseAnnotations();
+                                                              }
+                                                            }
                                                           }
                                                         }
                                                       }
@@ -3933,6 +3981,297 @@ function peg$parse(input, options) {
     }
     return s0;
   }
+  function peg$parseMarker() {
+    let s0, s1, s2, s3, s4, s5;
+    s0 = peg$currPos;
+    if (input.substr(peg$currPos, 6) === peg$c52) {
+      s1 = peg$c52;
+      peg$currPos += 6;
+    } else {
+      s1 = peg$FAILED;
+      if (peg$silentFails === 0) {
+        peg$fail(peg$e52);
+      }
+    }
+    if (s1 !== peg$FAILED) {
+      s2 = peg$parse_();
+      s3 = peg$parseInteger();
+      if (s3 !== peg$FAILED) {
+        s4 = peg$parse_();
+        s5 = peg$parseAttributes();
+        if (s5 === peg$FAILED) {
+          s5 = null;
+        }
+        peg$savedPos = s0;
+        s0 = peg$f71(s3, s5);
+      } else {
+        peg$currPos = s0;
+        s0 = peg$FAILED;
+      }
+    } else {
+      peg$currPos = s0;
+      s0 = peg$FAILED;
+    }
+    return s0;
+  }
+  function peg$parseAnnotations() {
+    let s0, s1, s2, s3, s4, s5, s6, s7, s8, s9;
+    s0 = peg$currPos;
+    if (input.substr(peg$currPos, 11) === peg$c53) {
+      s1 = peg$c53;
+      peg$currPos += 11;
+    } else {
+      s1 = peg$FAILED;
+      if (peg$silentFails === 0) {
+        peg$fail(peg$e53);
+      }
+    }
+    if (s1 !== peg$FAILED) {
+      s2 = peg$parse_();
+      s3 = peg$parseAttributes();
+      if (s3 === peg$FAILED) {
+        s3 = null;
+      }
+      s4 = peg$parse_();
+      if (input.charCodeAt(peg$currPos) === 123) {
+        s5 = peg$c1;
+        peg$currPos++;
+      } else {
+        s5 = peg$FAILED;
+        if (peg$silentFails === 0) {
+          peg$fail(peg$e1);
+        }
+      }
+      if (s5 !== peg$FAILED) {
+        s6 = peg$parse_();
+        s7 = peg$parseAnnotationContent();
+        s8 = peg$parse_();
+        if (input.charCodeAt(peg$currPos) === 125) {
+          s9 = peg$c2;
+          peg$currPos++;
+        } else {
+          s9 = peg$FAILED;
+          if (peg$silentFails === 0) {
+            peg$fail(peg$e2);
+          }
+        }
+        if (s9 !== peg$FAILED) {
+          peg$savedPos = s0;
+          s0 = peg$f72(s3, s7);
+        } 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$parseAnnotationContent() {
+    let s0, s1, s2, s3, s4;
+    s0 = peg$currPos;
+    s1 = [];
+    s2 = peg$currPos;
+    s3 = peg$parseAnnotationItem();
+    if (s3 !== peg$FAILED) {
+      s4 = peg$parse_();
+      s3 = [s3, s4];
+      s2 = s3;
+    } else {
+      peg$currPos = s2;
+      s2 = peg$FAILED;
+    }
+    while (s2 !== peg$FAILED) {
+      s1.push(s2);
+      s2 = peg$currPos;
+      s3 = peg$parseAnnotationItem();
+      if (s3 !== peg$FAILED) {
+        s4 = peg$parse_();
+        s3 = [s3, s4];
+        s2 = s3;
+      } else {
+        peg$currPos = s2;
+        s2 = peg$FAILED;
+      }
+    }
+    peg$savedPos = s0;
+    s1 = peg$f73(s1);
+    s0 = s1;
+    return s0;
+  }
+  function peg$parseAnnotationItem() {
+    let s0, s1, s2, s3, s4, s5, s6, s7, s8, s9, s10, s11, s12, s13;
+    s0 = peg$currPos;
+    if (input.substr(peg$currPos, 4) === peg$c38) {
+      s1 = peg$c38;
+      peg$currPos += 4;
+    } else {
+      s1 = peg$FAILED;
+      if (peg$silentFails === 0) {
+        peg$fail(peg$e38);
+      }
+    }
+    if (s1 !== peg$FAILED) {
+      s2 = peg$parse_();
+      s3 = peg$parseInteger();
+      if (s3 !== peg$FAILED) {
+        s4 = peg$parse_();
+        s5 = peg$parseStringLiteral();
+        if (s5 !== peg$FAILED) {
+          s6 = peg$parse_();
+          s7 = peg$parseAttributes();
+          if (s7 === peg$FAILED) {
+            s7 = null;
+          }
+          s8 = peg$parse_();
+          if (input.charCodeAt(peg$currPos) === 123) {
+            s9 = peg$c1;
+            peg$currPos++;
+          } else {
+            s9 = peg$FAILED;
+            if (peg$silentFails === 0) {
+              peg$fail(peg$e1);
+            }
+          }
+          if (s9 !== peg$FAILED) {
+            s10 = peg$parse_();
+            s11 = peg$parseChildren();
+            if (s11 !== peg$FAILED) {
+              s12 = peg$parse_();
+              if (input.charCodeAt(peg$currPos) === 125) {
+                s13 = peg$c2;
+                peg$currPos++;
+              } else {
+                s13 = peg$FAILED;
+                if (peg$silentFails === 0) {
+                  peg$fail(peg$e2);
+                }
+              }
+              if (s13 !== peg$FAILED) {
+                peg$savedPos = s0;
+                s0 = peg$f74(s3, s5, s7, s11);
+              } 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;
+    }
+    if (s0 === peg$FAILED) {
+      s0 = peg$currPos;
+      if (input.substr(peg$currPos, 4) === peg$c38) {
+        s1 = peg$c38;
+        peg$currPos += 4;
+      } else {
+        s1 = peg$FAILED;
+        if (peg$silentFails === 0) {
+          peg$fail(peg$e38);
+        }
+      }
+      if (s1 !== peg$FAILED) {
+        s2 = peg$parse_();
+        s3 = peg$parseInteger();
+        if (s3 !== peg$FAILED) {
+          s4 = peg$parse_();
+          s5 = peg$parseStringLiteral();
+          if (s5 !== peg$FAILED) {
+            s6 = peg$parse_();
+            s7 = peg$parseAttributes();
+            if (s7 === peg$FAILED) {
+              s7 = null;
+            }
+            peg$savedPos = s0;
+            s0 = peg$f75(s3, s5, s7);
+          } else {
+            peg$currPos = s0;
+            s0 = peg$FAILED;
+          }
+        } else {
+          peg$currPos = s0;
+          s0 = peg$FAILED;
+        }
+      } else {
+        peg$currPos = s0;
+        s0 = peg$FAILED;
+      }
+      if (s0 === peg$FAILED) {
+        s0 = peg$currPos;
+        s1 = peg$parseComment();
+        if (s1 !== peg$FAILED) {
+          peg$savedPos = s0;
+          s1 = peg$f76();
+        }
+        s0 = s1;
+      }
+    }
+    return s0;
+  }
+  function peg$parseInteger() {
+    let s0, s1, s2;
+    peg$silentFails++;
+    s0 = peg$currPos;
+    s1 = [];
+    s2 = input.charAt(peg$currPos);
+    if (peg$r0.test(s2)) {
+      peg$currPos++;
+    } else {
+      s2 = peg$FAILED;
+      if (peg$silentFails === 0) {
+        peg$fail(peg$e55);
+      }
+    }
+    if (s2 !== peg$FAILED) {
+      while (s2 !== peg$FAILED) {
+        s1.push(s2);
+        s2 = input.charAt(peg$currPos);
+        if (peg$r0.test(s2)) {
+          peg$currPos++;
+        } else {
+          s2 = peg$FAILED;
+          if (peg$silentFails === 0) {
+            peg$fail(peg$e55);
+          }
+        }
+      }
+    } else {
+      s1 = peg$FAILED;
+    }
+    if (s1 !== peg$FAILED) {
+      peg$savedPos = s0;
+      s1 = peg$f77(s1);
+    }
+    s0 = s1;
+    peg$silentFails--;
+    if (s0 === peg$FAILED) {
+      s1 = peg$FAILED;
+      if (peg$silentFails === 0) {
+        peg$fail(peg$e54);
+      }
+    }
+    return s0;
+  }
   function peg$parseAttributes() {
     let s0, s1, s2;
     s0 = peg$currPos;
@@ -3948,7 +4287,7 @@ function peg$parse(input, options) {
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f71(s1);
+      s1 = peg$f78(s1);
     }
     s0 = s1;
     return s0;
@@ -3961,12 +4300,12 @@ function peg$parse(input, options) {
     if (s2 !== peg$FAILED) {
       s3 = peg$parse_();
       if (input.charCodeAt(peg$currPos) === 61) {
-        s4 = peg$c52;
+        s4 = peg$c54;
         peg$currPos++;
       } else {
         s4 = peg$FAILED;
         if (peg$silentFails === 0) {
-          peg$fail(peg$e52);
+          peg$fail(peg$e56);
         }
       }
       if (s4 !== peg$FAILED) {
@@ -3974,7 +4313,7 @@ function peg$parse(input, options) {
         s6 = peg$parseAttributeValue();
         if (s6 !== peg$FAILED) {
           peg$savedPos = s0;
-          s0 = peg$f72(s2, s6);
+          s0 = peg$f79(s2, s6);
         } else {
           peg$currPos = s0;
           s0 = peg$FAILED;
@@ -4001,32 +4340,32 @@ function peg$parse(input, options) {
           s6 = peg$parseAttributeName();
           if (s6 === peg$FAILED) {
             s6 = input.charAt(peg$currPos);
-            if (peg$r0.test(s6)) {
+            if (peg$r1.test(s6)) {
               peg$currPos++;
             } else {
               s6 = peg$FAILED;
               if (peg$silentFails === 0) {
-                peg$fail(peg$e53);
+                peg$fail(peg$e57);
               }
             }
             if (s6 === peg$FAILED) {
-              if (input.substr(peg$currPos, 2) === peg$c53) {
-                s6 = peg$c53;
+              if (input.substr(peg$currPos, 2) === peg$c55) {
+                s6 = peg$c55;
                 peg$currPos += 2;
               } else {
                 s6 = peg$FAILED;
                 if (peg$silentFails === 0) {
-                  peg$fail(peg$e54);
+                  peg$fail(peg$e58);
                 }
               }
               if (s6 === peg$FAILED) {
-                if (input.substr(peg$currPos, 2) === peg$c54) {
-                  s6 = peg$c54;
+                if (input.substr(peg$currPos, 2) === peg$c56) {
+                  s6 = peg$c56;
                   peg$currPos += 2;
                 } else {
                   s6 = peg$FAILED;
                   if (peg$silentFails === 0) {
-                    peg$fail(peg$e55);
+                    peg$fail(peg$e59);
                   }
                 }
                 if (s6 === peg$FAILED) {
@@ -4038,7 +4377,7 @@ function peg$parse(input, options) {
                   } else {
                     s7 = peg$FAILED;
                     if (peg$silentFails === 0) {
-                      peg$fail(peg$e56);
+                      peg$fail(peg$e60);
                     }
                   }
                   peg$silentFails--;
@@ -4069,7 +4408,7 @@ function peg$parse(input, options) {
         }
         if (s3 !== peg$FAILED) {
           peg$savedPos = s0;
-          s0 = peg$f73(s2);
+          s0 = peg$f80(s2);
         } else {
           peg$currPos = s0;
           s0 = peg$FAILED;
@@ -4098,7 +4437,7 @@ function peg$parse(input, options) {
       s2 = peg$parseIdentifier();
       if (s2 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f74(s2);
+        s0 = peg$f81(s2);
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -4551,6 +4890,28 @@ function peg$parse(input, options) {
                                                                                               peg$fail(peg$e48);
                                                                                             }
                                                                                           }
+                                                                                          if (s1 === peg$FAILED) {
+                                                                                            if (input.substr(peg$currPos, 6) === peg$c52) {
+                                                                                              s1 = peg$c52;
+                                                                                              peg$currPos += 6;
+                                                                                            } else {
+                                                                                              s1 = peg$FAILED;
+                                                                                              if (peg$silentFails === 0) {
+                                                                                                peg$fail(peg$e52);
+                                                                                              }
+                                                                                            }
+                                                                                            if (s1 === peg$FAILED) {
+                                                                                              if (input.substr(peg$currPos, 11) === peg$c53) {
+                                                                                                s1 = peg$c53;
+                                                                                                peg$currPos += 11;
+                                                                                              } else {
+                                                                                                s1 = peg$FAILED;
+                                                                                                if (peg$silentFails === 0) {
+                                                                                                  peg$fail(peg$e53);
+                                                                                                }
+                                                                                              }
+                                                                                            }
+                                                                                          }
                                                                                         }
                                                                                       }
                                                                                     }
@@ -4621,12 +4982,12 @@ function peg$parse(input, options) {
   function peg$parseIdentifierChar() {
     let s0;
     s0 = input.charAt(peg$currPos);
-    if (peg$r1.test(s0)) {
+    if (peg$r2.test(s0)) {
       peg$currPos++;
     } else {
       s0 = peg$FAILED;
       if (peg$silentFails === 0) {
-        peg$fail(peg$e57);
+        peg$fail(peg$e61);
       }
     }
     return s0;
@@ -4659,12 +5020,12 @@ function peg$parse(input, options) {
     peg$silentFails++;
     s0 = peg$currPos;
     if (input.charCodeAt(peg$currPos) === 34) {
-      s1 = peg$c55;
+      s1 = peg$c57;
       peg$currPos++;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) {
-        peg$fail(peg$e59);
+        peg$fail(peg$e63);
       }
     }
     if (s1 !== peg$FAILED) {
@@ -4675,17 +5036,17 @@ function peg$parse(input, options) {
         s3 = peg$parseDoubleStringChar();
       }
       if (input.charCodeAt(peg$currPos) === 34) {
-        s3 = peg$c55;
+        s3 = peg$c57;
         peg$currPos++;
       } else {
         s3 = peg$FAILED;
         if (peg$silentFails === 0) {
-          peg$fail(peg$e59);
+          peg$fail(peg$e63);
         }
       }
       if (s3 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f75(s2);
+        s0 = peg$f82(s2);
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -4697,12 +5058,12 @@ function peg$parse(input, options) {
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
       if (input.charCodeAt(peg$currPos) === 39) {
-        s1 = peg$c56;
+        s1 = peg$c58;
         peg$currPos++;
       } else {
         s1 = peg$FAILED;
         if (peg$silentFails === 0) {
-          peg$fail(peg$e60);
+          peg$fail(peg$e64);
         }
       }
       if (s1 !== peg$FAILED) {
@@ -4713,17 +5074,17 @@ function peg$parse(input, options) {
           s3 = peg$parseSingleStringChar();
         }
         if (input.charCodeAt(peg$currPos) === 39) {
-          s3 = peg$c56;
+          s3 = peg$c58;
           peg$currPos++;
         } else {
           s3 = peg$FAILED;
           if (peg$silentFails === 0) {
-            peg$fail(peg$e60);
+            peg$fail(peg$e64);
           }
         }
         if (s3 !== peg$FAILED) {
           peg$savedPos = s0;
-          s0 = peg$f76(s2);
+          s0 = peg$f83(s2);
         } else {
           peg$currPos = s0;
           s0 = peg$FAILED;
@@ -4737,7 +5098,7 @@ function peg$parse(input, options) {
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) {
-        peg$fail(peg$e58);
+        peg$fail(peg$e62);
       }
     }
     return s0;
@@ -4748,12 +5109,12 @@ function peg$parse(input, options) {
     s1 = peg$currPos;
     peg$silentFails++;
     if (input.charCodeAt(peg$currPos) === 34) {
-      s2 = peg$c55;
+      s2 = peg$c57;
       peg$currPos++;
     } else {
       s2 = peg$FAILED;
       if (peg$silentFails === 0) {
-        peg$fail(peg$e59);
+        peg$fail(peg$e63);
       }
     }
     peg$silentFails--;
@@ -4767,12 +5128,12 @@ function peg$parse(input, options) {
       s2 = peg$currPos;
       peg$silentFails++;
       if (input.charCodeAt(peg$currPos) === 92) {
-        s3 = peg$c57;
+        s3 = peg$c59;
         peg$currPos++;
       } else {
         s3 = peg$FAILED;
         if (peg$silentFails === 0) {
-          peg$fail(peg$e61);
+          peg$fail(peg$e65);
         }
       }
       peg$silentFails--;
@@ -4789,12 +5150,12 @@ function peg$parse(input, options) {
         } else {
           s3 = peg$FAILED;
           if (peg$silentFails === 0) {
-            peg$fail(peg$e56);
+            peg$fail(peg$e60);
           }
         }
         if (s3 !== peg$FAILED) {
           peg$savedPos = s0;
-          s0 = peg$f77(s3);
+          s0 = peg$f84(s3);
         } else {
           peg$currPos = s0;
           s0 = peg$FAILED;
@@ -4810,19 +5171,19 @@ function peg$parse(input, options) {
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
       if (input.charCodeAt(peg$currPos) === 92) {
-        s1 = peg$c57;
+        s1 = peg$c59;
         peg$currPos++;
       } else {
         s1 = peg$FAILED;
         if (peg$silentFails === 0) {
-          peg$fail(peg$e61);
+          peg$fail(peg$e65);
         }
       }
       if (s1 !== peg$FAILED) {
         s2 = peg$parseEscapeSequence();
         if (s2 !== peg$FAILED) {
           peg$savedPos = s0;
-          s0 = peg$f78(s2);
+          s0 = peg$f85(s2);
         } else {
           peg$currPos = s0;
           s0 = peg$FAILED;
@@ -4840,12 +5201,12 @@ function peg$parse(input, options) {
     s1 = peg$currPos;
     peg$silentFails++;
     if (input.charCodeAt(peg$currPos) === 39) {
-      s2 = peg$c56;
+      s2 = peg$c58;
       peg$currPos++;
     } else {
       s2 = peg$FAILED;
       if (peg$silentFails === 0) {
-        peg$fail(peg$e60);
+        peg$fail(peg$e64);
       }
     }
     peg$silentFails--;
@@ -4859,12 +5220,12 @@ function peg$parse(input, options) {
       s2 = peg$currPos;
       peg$silentFails++;
       if (input.charCodeAt(peg$currPos) === 92) {
-        s3 = peg$c57;
+        s3 = peg$c59;
         peg$currPos++;
       } else {
         s3 = peg$FAILED;
         if (peg$silentFails === 0) {
-          peg$fail(peg$e61);
+          peg$fail(peg$e65);
         }
       }
       peg$silentFails--;
@@ -4881,12 +5242,12 @@ function peg$parse(input, options) {
         } else {
           s3 = peg$FAILED;
           if (peg$silentFails === 0) {
-            peg$fail(peg$e56);
+            peg$fail(peg$e60);
           }
         }
         if (s3 !== peg$FAILED) {
           peg$savedPos = s0;
-          s0 = peg$f79(s3);
+          s0 = peg$f86(s3);
         } else {
           peg$currPos = s0;
           s0 = peg$FAILED;
@@ -4902,19 +5263,19 @@ function peg$parse(input, options) {
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
       if (input.charCodeAt(peg$currPos) === 92) {
-        s1 = peg$c57;
+        s1 = peg$c59;
         peg$currPos++;
       } else {
         s1 = peg$FAILED;
         if (peg$silentFails === 0) {
-          peg$fail(peg$e61);
+          peg$fail(peg$e65);
         }
       }
       if (s1 !== peg$FAILED) {
         s2 = peg$parseEscapeSequence();
         if (s2 !== peg$FAILED) {
           peg$savedPos = s0;
-          s0 = peg$f80(s2);
+          s0 = peg$f87(s2);
         } else {
           peg$currPos = s0;
           s0 = peg$FAILED;
@@ -4930,97 +5291,97 @@ function peg$parse(input, options) {
     let s0, s1;
     s0 = peg$currPos;
     if (input.charCodeAt(peg$currPos) === 110) {
-      s1 = peg$c58;
+      s1 = peg$c60;
       peg$currPos++;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) {
-        peg$fail(peg$e62);
+        peg$fail(peg$e66);
       }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f81();
+      s1 = peg$f88();
     }
     s0 = s1;
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
       if (input.charCodeAt(peg$currPos) === 114) {
-        s1 = peg$c59;
+        s1 = peg$c61;
         peg$currPos++;
       } else {
         s1 = peg$FAILED;
         if (peg$silentFails === 0) {
-          peg$fail(peg$e63);
+          peg$fail(peg$e67);
         }
       }
       if (s1 !== peg$FAILED) {
         peg$savedPos = s0;
-        s1 = peg$f82();
+        s1 = peg$f89();
       }
       s0 = s1;
       if (s0 === peg$FAILED) {
         s0 = peg$currPos;
         if (input.charCodeAt(peg$currPos) === 116) {
-          s1 = peg$c60;
+          s1 = peg$c62;
           peg$currPos++;
         } else {
           s1 = peg$FAILED;
           if (peg$silentFails === 0) {
-            peg$fail(peg$e64);
+            peg$fail(peg$e68);
           }
         }
         if (s1 !== peg$FAILED) {
           peg$savedPos = s0;
-          s1 = peg$f83();
+          s1 = peg$f90();
         }
         s0 = s1;
         if (s0 === peg$FAILED) {
           s0 = peg$currPos;
           if (input.charCodeAt(peg$currPos) === 92) {
-            s1 = peg$c57;
+            s1 = peg$c59;
             peg$currPos++;
           } else {
             s1 = peg$FAILED;
             if (peg$silentFails === 0) {
-              peg$fail(peg$e61);
+              peg$fail(peg$e65);
             }
           }
           if (s1 !== peg$FAILED) {
             peg$savedPos = s0;
-            s1 = peg$f84();
+            s1 = peg$f91();
           }
           s0 = s1;
           if (s0 === peg$FAILED) {
             s0 = peg$currPos;
             if (input.charCodeAt(peg$currPos) === 34) {
-              s1 = peg$c55;
+              s1 = peg$c57;
               peg$currPos++;
             } else {
               s1 = peg$FAILED;
               if (peg$silentFails === 0) {
-                peg$fail(peg$e59);
+                peg$fail(peg$e63);
               }
             }
             if (s1 !== peg$FAILED) {
               peg$savedPos = s0;
-              s1 = peg$f85();
+              s1 = peg$f92();
             }
             s0 = s1;
             if (s0 === peg$FAILED) {
               s0 = peg$currPos;
               if (input.charCodeAt(peg$currPos) === 39) {
-                s1 = peg$c56;
+                s1 = peg$c58;
                 peg$currPos++;
               } else {
                 s1 = peg$FAILED;
                 if (peg$silentFails === 0) {
-                  peg$fail(peg$e60);
+                  peg$fail(peg$e64);
                 }
               }
               if (s1 !== peg$FAILED) {
                 peg$savedPos = s0;
-                s1 = peg$f86();
+                s1 = peg$f93();
               }
               s0 = s1;
             }
@@ -5035,12 +5396,12 @@ function peg$parse(input, options) {
     peg$silentFails++;
     s0 = peg$currPos;
     if (input.charCodeAt(peg$currPos) === 45) {
-      s1 = peg$c61;
+      s1 = peg$c63;
       peg$currPos++;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) {
-        peg$fail(peg$e66);
+        peg$fail(peg$e70);
       }
     }
     if (s1 === peg$FAILED) {
@@ -5048,24 +5409,24 @@ function peg$parse(input, options) {
     }
     s2 = [];
     s3 = input.charAt(peg$currPos);
-    if (peg$r2.test(s3)) {
+    if (peg$r0.test(s3)) {
       peg$currPos++;
     } else {
       s3 = peg$FAILED;
       if (peg$silentFails === 0) {
-        peg$fail(peg$e67);
+        peg$fail(peg$e55);
       }
     }
     if (s3 !== peg$FAILED) {
       while (s3 !== peg$FAILED) {
         s2.push(s3);
         s3 = input.charAt(peg$currPos);
-        if (peg$r2.test(s3)) {
+        if (peg$r0.test(s3)) {
           peg$currPos++;
         } else {
           s3 = peg$FAILED;
           if (peg$silentFails === 0) {
-            peg$fail(peg$e67);
+            peg$fail(peg$e55);
           }
         }
       }
@@ -5075,35 +5436,35 @@ function peg$parse(input, options) {
     if (s2 !== peg$FAILED) {
       s3 = peg$currPos;
       if (input.charCodeAt(peg$currPos) === 46) {
-        s4 = peg$c62;
+        s4 = peg$c64;
         peg$currPos++;
       } else {
         s4 = peg$FAILED;
         if (peg$silentFails === 0) {
-          peg$fail(peg$e68);
+          peg$fail(peg$e71);
         }
       }
       if (s4 !== peg$FAILED) {
         s5 = [];
         s6 = input.charAt(peg$currPos);
-        if (peg$r2.test(s6)) {
+        if (peg$r0.test(s6)) {
           peg$currPos++;
         } else {
           s6 = peg$FAILED;
           if (peg$silentFails === 0) {
-            peg$fail(peg$e67);
+            peg$fail(peg$e55);
           }
         }
         if (s6 !== peg$FAILED) {
           while (s6 !== peg$FAILED) {
             s5.push(s6);
             s6 = input.charAt(peg$currPos);
-            if (peg$r2.test(s6)) {
+            if (peg$r0.test(s6)) {
               peg$currPos++;
             } else {
               s6 = peg$FAILED;
               if (peg$silentFails === 0) {
-                peg$fail(peg$e67);
+                peg$fail(peg$e55);
               }
             }
           }
@@ -5125,7 +5486,7 @@ function peg$parse(input, options) {
         s3 = null;
       }
       peg$savedPos = s0;
-      s0 = peg$f87(s1, s2, s3);
+      s0 = peg$f94(s1, s2, s3);
     } else {
       peg$currPos = s0;
       s0 = peg$FAILED;
@@ -5134,7 +5495,7 @@ function peg$parse(input, options) {
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) {
-        peg$fail(peg$e65);
+        peg$fail(peg$e69);
       }
     }
     return s0;
@@ -5144,12 +5505,12 @@ function peg$parse(input, options) {
     peg$silentFails++;
     s0 = peg$currPos;
     if (input.charCodeAt(peg$currPos) === 45) {
-      s1 = peg$c61;
+      s1 = peg$c63;
       peg$currPos++;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) {
-        peg$fail(peg$e66);
+        peg$fail(peg$e70);
       }
     }
     if (s1 === peg$FAILED) {
@@ -5157,24 +5518,24 @@ function peg$parse(input, options) {
     }
     s2 = [];
     s3 = input.charAt(peg$currPos);
-    if (peg$r2.test(s3)) {
+    if (peg$r0.test(s3)) {
       peg$currPos++;
     } else {
       s3 = peg$FAILED;
       if (peg$silentFails === 0) {
-        peg$fail(peg$e67);
+        peg$fail(peg$e55);
       }
     }
     if (s3 !== peg$FAILED) {
       while (s3 !== peg$FAILED) {
         s2.push(s3);
         s3 = input.charAt(peg$currPos);
-        if (peg$r2.test(s3)) {
+        if (peg$r0.test(s3)) {
           peg$currPos++;
         } else {
           s3 = peg$FAILED;
           if (peg$silentFails === 0) {
-            peg$fail(peg$e67);
+            peg$fail(peg$e55);
           }
         }
       }
@@ -5184,35 +5545,35 @@ function peg$parse(input, options) {
     if (s2 !== peg$FAILED) {
       s3 = peg$currPos;
       if (input.charCodeAt(peg$currPos) === 46) {
-        s4 = peg$c62;
+        s4 = peg$c64;
         peg$currPos++;
       } else {
         s4 = peg$FAILED;
         if (peg$silentFails === 0) {
-          peg$fail(peg$e68);
+          peg$fail(peg$e71);
         }
       }
       if (s4 !== peg$FAILED) {
         s5 = [];
         s6 = input.charAt(peg$currPos);
-        if (peg$r2.test(s6)) {
+        if (peg$r0.test(s6)) {
           peg$currPos++;
         } else {
           s6 = peg$FAILED;
           if (peg$silentFails === 0) {
-            peg$fail(peg$e67);
+            peg$fail(peg$e55);
           }
         }
         if (s6 !== peg$FAILED) {
           while (s6 !== peg$FAILED) {
             s5.push(s6);
             s6 = input.charAt(peg$currPos);
-            if (peg$r2.test(s6)) {
+            if (peg$r0.test(s6)) {
               peg$currPos++;
             } else {
               s6 = peg$FAILED;
               if (peg$silentFails === 0) {
-                peg$fail(peg$e67);
+                peg$fail(peg$e55);
               }
             }
           }
@@ -5233,63 +5594,63 @@ function peg$parse(input, options) {
       if (s3 === peg$FAILED) {
         s3 = null;
       }
-      if (input.substr(peg$currPos, 2) === peg$c63) {
-        s4 = peg$c63;
+      if (input.substr(peg$currPos, 2) === peg$c65) {
+        s4 = peg$c65;
         peg$currPos += 2;
       } else {
         s4 = peg$FAILED;
         if (peg$silentFails === 0) {
-          peg$fail(peg$e70);
+          peg$fail(peg$e73);
         }
       }
       if (s4 === peg$FAILED) {
         if (input.charCodeAt(peg$currPos) === 37) {
-          s4 = peg$c64;
+          s4 = peg$c66;
           peg$currPos++;
         } else {
           s4 = peg$FAILED;
           if (peg$silentFails === 0) {
-            peg$fail(peg$e71);
+            peg$fail(peg$e74);
           }
         }
         if (s4 === peg$FAILED) {
-          if (input.substr(peg$currPos, 2) === peg$c65) {
-            s4 = peg$c65;
+          if (input.substr(peg$currPos, 2) === peg$c67) {
+            s4 = peg$c67;
             peg$currPos += 2;
           } else {
             s4 = peg$FAILED;
             if (peg$silentFails === 0) {
-              peg$fail(peg$e72);
+              peg$fail(peg$e75);
             }
           }
           if (s4 === peg$FAILED) {
-            if (input.substr(peg$currPos, 3) === peg$c66) {
-              s4 = peg$c66;
+            if (input.substr(peg$currPos, 3) === peg$c68) {
+              s4 = peg$c68;
               peg$currPos += 3;
             } else {
               s4 = peg$FAILED;
               if (peg$silentFails === 0) {
-                peg$fail(peg$e73);
+                peg$fail(peg$e76);
               }
             }
             if (s4 === peg$FAILED) {
-              if (input.substr(peg$currPos, 2) === peg$c67) {
-                s4 = peg$c67;
+              if (input.substr(peg$currPos, 2) === peg$c69) {
+                s4 = peg$c69;
                 peg$currPos += 2;
               } else {
                 s4 = peg$FAILED;
                 if (peg$silentFails === 0) {
-                  peg$fail(peg$e74);
+                  peg$fail(peg$e77);
                 }
               }
               if (s4 === peg$FAILED) {
-                if (input.substr(peg$currPos, 2) === peg$c68) {
-                  s4 = peg$c68;
+                if (input.substr(peg$currPos, 2) === peg$c70) {
+                  s4 = peg$c70;
                   peg$currPos += 2;
                 } else {
                   s4 = peg$FAILED;
                   if (peg$silentFails === 0) {
-                    peg$fail(peg$e75);
+                    peg$fail(peg$e78);
                   }
                 }
               }
@@ -5299,7 +5660,7 @@ function peg$parse(input, options) {
       }
       if (s4 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f88(s1, s2, s3, s4);
+        s0 = peg$f95(s1, s2, s3, s4);
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -5312,7 +5673,7 @@ function peg$parse(input, options) {
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) {
-        peg$fail(peg$e69);
+        peg$fail(peg$e72);
       }
     }
     return s0;
@@ -5321,34 +5682,34 @@ function peg$parse(input, options) {
     let s0, s1;
     peg$silentFails++;
     s0 = peg$currPos;
-    if (input.substr(peg$currPos, 4) === peg$c69) {
-      s1 = peg$c69;
+    if (input.substr(peg$currPos, 4) === peg$c71) {
+      s1 = peg$c71;
       peg$currPos += 4;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) {
-        peg$fail(peg$e77);
+        peg$fail(peg$e80);
       }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f89();
+      s1 = peg$f96();
     }
     s0 = s1;
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
-      if (input.substr(peg$currPos, 5) === peg$c70) {
-        s1 = peg$c70;
+      if (input.substr(peg$currPos, 5) === peg$c72) {
+        s1 = peg$c72;
         peg$currPos += 5;
       } else {
         s1 = peg$FAILED;
         if (peg$silentFails === 0) {
-          peg$fail(peg$e78);
+          peg$fail(peg$e81);
         }
       }
       if (s1 !== peg$FAILED) {
         peg$savedPos = s0;
-        s1 = peg$f90();
+        s1 = peg$f97();
       }
       s0 = s1;
     }
@@ -5356,7 +5717,7 @@ function peg$parse(input, options) {
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) {
-        peg$fail(peg$e76);
+        peg$fail(peg$e79);
       }
     }
     return s0;
@@ -5371,34 +5732,34 @@ function peg$parse(input, options) {
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) {
-        peg$fail(peg$e80);
+        peg$fail(peg$e83);
       }
     }
     if (s1 !== peg$FAILED) {
       s2 = [];
       s3 = input.charAt(peg$currPos);
-      if (peg$r1.test(s3)) {
+      if (peg$r2.test(s3)) {
         peg$currPos++;
       } else {
         s3 = peg$FAILED;
         if (peg$silentFails === 0) {
-          peg$fail(peg$e57);
+          peg$fail(peg$e61);
         }
       }
       while (s3 !== peg$FAILED) {
         s2.push(s3);
         s3 = input.charAt(peg$currPos);
-        if (peg$r1.test(s3)) {
+        if (peg$r2.test(s3)) {
           peg$currPos++;
         } else {
           s3 = peg$FAILED;
           if (peg$silentFails === 0) {
-            peg$fail(peg$e57);
+            peg$fail(peg$e61);
           }
         }
       }
       peg$savedPos = s0;
-      s0 = peg$f91(s1, s2);
+      s0 = peg$f98(s1, s2);
     } else {
       peg$currPos = s0;
       s0 = peg$FAILED;
@@ -5407,7 +5768,7 @@ function peg$parse(input, options) {
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) {
-        peg$fail(peg$e79);
+        peg$fail(peg$e82);
       }
     }
     return s0;
@@ -5442,7 +5803,7 @@ function peg$parse(input, options) {
       }
       if (s5 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f92(s3);
+        s0 = peg$f99(s3);
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -5530,7 +5891,7 @@ function peg$parse(input, options) {
         s3 = null;
       }
       peg$savedPos = s0;
-      s0 = peg$f93(s1, s2);
+      s0 = peg$f100(s1, s2);
     } else {
       peg$currPos = s0;
       s0 = peg$FAILED;
@@ -5584,7 +5945,7 @@ function peg$parse(input, options) {
       }
       if (s5 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f94(s3);
+        s0 = peg$f101(s3);
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -5651,7 +6012,7 @@ function peg$parse(input, options) {
         }
       }
       peg$savedPos = s0;
-      s0 = peg$f95(s1, s2);
+      s0 = peg$f102(s1, s2);
     } else {
       peg$currPos = s0;
       s0 = peg$FAILED;
@@ -5665,12 +6026,12 @@ function peg$parse(input, options) {
     if (s1 !== peg$FAILED) {
       s2 = peg$parse_();
       if (input.charCodeAt(peg$currPos) === 61) {
-        s3 = peg$c52;
+        s3 = peg$c54;
         peg$currPos++;
       } else {
         s3 = peg$FAILED;
         if (peg$silentFails === 0) {
-          peg$fail(peg$e52);
+          peg$fail(peg$e56);
         }
       }
       if (s3 !== peg$FAILED) {
@@ -5678,7 +6039,7 @@ function peg$parse(input, options) {
         s5 = peg$parseAttributeValue();
         if (s5 !== peg$FAILED) {
           peg$savedPos = s0;
-          s0 = peg$f96(s1, s5);
+          s0 = peg$f103(s1, s5);
         } else {
           peg$currPos = s0;
           s0 = peg$FAILED;
@@ -5696,7 +6057,7 @@ function peg$parse(input, options) {
       s1 = peg$parseIdentifier();
       if (s1 !== peg$FAILED) {
         peg$savedPos = s0;
-        s1 = peg$f97(s1);
+        s1 = peg$f104(s1);
       }
       s0 = s1;
     }
@@ -5729,7 +6090,7 @@ function peg$parse(input, options) {
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) {
-        peg$fail(peg$e81);
+        peg$fail(peg$e84);
       }
     }
     if (s1 !== peg$FAILED) {
@@ -5741,7 +6102,7 @@ function peg$parse(input, options) {
         } else {
           s1 = peg$FAILED;
           if (peg$silentFails === 0) {
-            peg$fail(peg$e81);
+            peg$fail(peg$e84);
           }
         }
       }
@@ -5761,7 +6122,7 @@ function peg$parse(input, options) {
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) {
-        peg$fail(peg$e82);
+        peg$fail(peg$e85);
       }
     }
     return s0;
@@ -5769,13 +6130,13 @@ function peg$parse(input, options) {
   function peg$parseLineComment() {
     let s0, s1, s2, s3, s4;
     s0 = peg$currPos;
-    if (input.substr(peg$currPos, 2) === peg$c53) {
-      s1 = peg$c53;
+    if (input.substr(peg$currPos, 2) === peg$c55) {
+      s1 = peg$c55;
       peg$currPos += 2;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) {
-        peg$fail(peg$e54);
+        peg$fail(peg$e58);
       }
     }
     if (s1 !== peg$FAILED) {
@@ -5786,7 +6147,7 @@ function peg$parse(input, options) {
       } else {
         s3 = peg$FAILED;
         if (peg$silentFails === 0) {
-          peg$fail(peg$e83);
+          peg$fail(peg$e86);
         }
       }
       while (s3 !== peg$FAILED) {
@@ -5797,17 +6158,17 @@ function peg$parse(input, options) {
         } else {
           s3 = peg$FAILED;
           if (peg$silentFails === 0) {
-            peg$fail(peg$e83);
+            peg$fail(peg$e86);
           }
         }
       }
       if (input.charCodeAt(peg$currPos) === 10) {
-        s3 = peg$c71;
+        s3 = peg$c73;
         peg$currPos++;
       } else {
         s3 = peg$FAILED;
         if (peg$silentFails === 0) {
-          peg$fail(peg$e84);
+          peg$fail(peg$e87);
         }
       }
       if (s3 === peg$FAILED) {
@@ -5819,7 +6180,7 @@ function peg$parse(input, options) {
         } else {
           s4 = peg$FAILED;
           if (peg$silentFails === 0) {
-            peg$fail(peg$e56);
+            peg$fail(peg$e60);
           }
         }
         peg$silentFails--;
@@ -5846,13 +6207,13 @@ function peg$parse(input, options) {
   function peg$parseBlockComment() {
     let s0, s1, s2, s3, s4, s5;
     s0 = peg$currPos;
-    if (input.substr(peg$currPos, 2) === peg$c54) {
-      s1 = peg$c54;
+    if (input.substr(peg$currPos, 2) === peg$c56) {
+      s1 = peg$c56;
       peg$currPos += 2;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) {
-        peg$fail(peg$e55);
+        peg$fail(peg$e59);
       }
     }
     if (s1 !== peg$FAILED) {
@@ -5860,13 +6221,13 @@ function peg$parse(input, options) {
       s3 = peg$currPos;
       s4 = peg$currPos;
       peg$silentFails++;
-      if (input.substr(peg$currPos, 2) === peg$c72) {
-        s5 = peg$c72;
+      if (input.substr(peg$currPos, 2) === peg$c74) {
+        s5 = peg$c74;
         peg$currPos += 2;
       } else {
         s5 = peg$FAILED;
         if (peg$silentFails === 0) {
-          peg$fail(peg$e85);
+          peg$fail(peg$e88);
         }
       }
       peg$silentFails--;
@@ -5883,7 +6244,7 @@ function peg$parse(input, options) {
         } else {
           s5 = peg$FAILED;
           if (peg$silentFails === 0) {
-            peg$fail(peg$e56);
+            peg$fail(peg$e60);
           }
         }
         if (s5 !== peg$FAILED) {
@@ -5902,13 +6263,13 @@ function peg$parse(input, options) {
         s3 = peg$currPos;
         s4 = peg$currPos;
         peg$silentFails++;
-        if (input.substr(peg$currPos, 2) === peg$c72) {
-          s5 = peg$c72;
+        if (input.substr(peg$currPos, 2) === peg$c74) {
+          s5 = peg$c74;
           peg$currPos += 2;
         } else {
           s5 = peg$FAILED;
           if (peg$silentFails === 0) {
-            peg$fail(peg$e85);
+            peg$fail(peg$e88);
           }
         }
         peg$silentFails--;
@@ -5925,7 +6286,7 @@ function peg$parse(input, options) {
           } else {
             s5 = peg$FAILED;
             if (peg$silentFails === 0) {
-              peg$fail(peg$e56);
+              peg$fail(peg$e60);
             }
           }
           if (s5 !== peg$FAILED) {
@@ -5940,13 +6301,13 @@ function peg$parse(input, options) {
           s3 = peg$FAILED;
         }
       }
-      if (input.substr(peg$currPos, 2) === peg$c72) {
-        s3 = peg$c72;
+      if (input.substr(peg$currPos, 2) === peg$c74) {
+        s3 = peg$c74;
         peg$currPos += 2;
       } else {
         s3 = peg$FAILED;
         if (peg$silentFails === 0) {
-          peg$fail(peg$e85);
+          peg$fail(peg$e88);
         }
       }
       if (s3 !== peg$FAILED) {