@knowvah/dot-engine 2.6.5 → 2.6.7

package/src/parser/dot.js

@@ -214,21 +214,21 @@ function peg$parse(input, options) {
 
   const peg$e0 = peg$literalExpectation("{", false);
   const peg$e1 = peg$literalExpectation("}", false);
-  const peg$e2 = peg$literalExpectation(";", false);
-  const peg$e3 = peg$literalExpectation("=", false);
-  const peg$e4 = peg$literalExpectation("[", false);
-  const peg$e5 = peg$literalExpectation("]", false);
-  const peg$e6 = peg$classExpectation([";", ","], false, false, false);
-  const peg$e7 = peg$literalExpectation(":", false);
-  const peg$e8 = peg$otherExpectation("edge operator");
-  const peg$e9 = peg$literalExpectation("->", false);
-  const peg$e10 = peg$literalExpectation("--", false);
-  const peg$e11 = peg$literalExpectation("+", false);
-  const peg$e12 = peg$literalExpectation("\"", false);
-  const peg$e13 = peg$literalExpectation("\\\"", false);
-  const peg$e14 = peg$literalExpectation("\\\n", false);
-  const peg$e15 = peg$literalExpectation("\\", false);
-  const peg$e16 = peg$anyExpectation();
+  const peg$e2 = peg$anyExpectation();
+  const peg$e3 = peg$literalExpectation(";", false);
+  const peg$e4 = peg$literalExpectation("=", false);
+  const peg$e5 = peg$literalExpectation("[", false);
+  const peg$e6 = peg$literalExpectation("]", false);
+  const peg$e7 = peg$classExpectation([";", ","], false, false, false);
+  const peg$e8 = peg$literalExpectation(":", false);
+  const peg$e9 = peg$otherExpectation("edge operator");
+  const peg$e10 = peg$literalExpectation("->", false);
+  const peg$e11 = peg$literalExpectation("--", false);
+  const peg$e12 = peg$literalExpectation("+", false);
+  const peg$e13 = peg$literalExpectation("\"", false);
+  const peg$e14 = peg$literalExpectation("\\\"", false);
+  const peg$e15 = peg$literalExpectation("\\\n", false);
+  const peg$e16 = peg$literalExpectation("\\", false);
   const peg$e17 = peg$classExpectation(["\"", "\\"], true, false, false);
   const peg$e18 = peg$literalExpectation("<", false);
   const peg$e19 = peg$literalExpectation(">", false);
@@ -261,44 +261,46 @@ function peg$parse(input, options) {
   const peg$e46 = peg$literalExpectation("\n", false);
   const peg$e47 = peg$literalExpectation("#", false);
 
-  function peg$f0(s, t, id, stmts) {
+  function peg$f0(s, t, id, stmts, end) {
     return {
       type: "graph",
       strict: s,
       directed: t,
       id: id,
-      stmts: stmts
+      stmts: stmts,
+      end: end
     };
   }
-  function peg$f1() {    return { type: "graph", strict: false, directed: false, id: null, stmts: [] };  }
-  function peg$f2() {    return true;  }
-  function peg$f3() {    return false;  }
-  function peg$f4() {    return true;  }
-  function peg$f5() {    return false;  }
-  function peg$f6(a) {    return a;  }
-  function peg$f7() {    return null;  }
-  function peg$f8(s) {    return s;  }
-  function peg$f9(stmts) {    return stmts;  }
-  function peg$f10(s) {    return s;  }
+  function peg$f1() {    return { type: "graph", strict: false, directed: false, id: null, stmts: [], end: text().length };  }
+  function peg$f2() {    return offset();  }
+  function peg$f3() {    return true;  }
+  function peg$f4() {    return false;  }
+  function peg$f5() {    return true;  }
+  function peg$f6() {    return false;  }
+  function peg$f7(a) {    return a;  }
+  function peg$f8() {    return null;  }
+  function peg$f9(s) {    return s;  }
+  function peg$f10(stmts) {    return stmts;  }
   function peg$f11(s) {    return s;  }
-  function peg$f12(t, m, attrs) {
+  function peg$f12(s) {    return s;  }
+  function peg$f13(t, m, attrs) {
     // grammar.y:attrstmt calls nomacros() when a macro name is present;
     // the attributes are still applied unchanged.
     if (m) console.error("Warning: attribute macros not implemented");
     return { type: "attr", target: t, attrs: attrs };
   }
-  function peg$f13(a) {    return { type: "assign", key: a.key, value: a.value };  }
-  function peg$f14() {    return true;  }
-  function peg$f15() {    return false;  }
-  function peg$f16() {    return "graph";  }
-  function peg$f17() {    return "node";  }
-  function peg$f18() {    return "edge";  }
-  function peg$f19(defs, rest) {    return defs.concat(rest);  }
-  function peg$f20() {    return [];  }
-  function peg$f21(a) {    return a;  }
-  function peg$f22(pairs) {    return pairs;  }
-  function peg$f23(k, v) {    return { key: k, value: v };  }
-  function peg$f24(head, chain, attrs) {
+  function peg$f14(a) {    return { type: "assign", key: a.key, value: a.value };  }
+  function peg$f15() {    return true;  }
+  function peg$f16() {    return false;  }
+  function peg$f17() {    return "graph";  }
+  function peg$f18() {    return "node";  }
+  function peg$f19() {    return "edge";  }
+  function peg$f20(defs, rest) {    return defs.concat(rest);  }
+  function peg$f21() {    return [];  }
+  function peg$f22(a) {    return a;  }
+  function peg$f23(pairs) {    return pairs;  }
+  function peg$f24(k, v) {    return { key: k, value: v };  }
+  function peg$f25(head, chain, attrs) {
     if (chain.length > 0) {
       const nodes = [head].concat(chain);
       return { type: "edge", nodes: nodes, attrs: attrs };
@@ -312,28 +314,28 @@ function peg$parse(input, options) {
       return { type: "node", id: head, attrs: attrs };
     }
   }
-  function peg$f25(s) {    return s;  }
-  function peg$f26(n) {    return n;  }
-  function peg$f27(id, port, compass) {    return { id: id, port: port, compass: compass };  }
-  function peg$f28(id, port) {    return { id: id, port: port, compass: null };  }
-  function peg$f29(id) {    return { id: id, port: null, compass: null };  }
-  function peg$f30(s, rest) {    return [s].concat(rest);  }
-  function peg$f31() {    return [];  }
-  function peg$f32(id, stmts) {    return { type: "subgraph", id: id, stmts: stmts };  }
-  function peg$f33(stmts) {    return { type: "subgraph", id: null, stmts: stmts };  }
+  function peg$f26(s) {    return s;  }
+  function peg$f27(n) {    return n;  }
+  function peg$f28(id, port, compass) {    return { id: id, port: port, compass: compass };  }
+  function peg$f29(id, port) {    return { id: id, port: port, compass: null };  }
+  function peg$f30(id) {    return { id: id, port: null, compass: null };  }
+  function peg$f31(s, rest) {    return [s].concat(rest);  }
+  function peg$f32() {    return [];  }
+  function peg$f33(id, stmts) {    return { type: "subgraph", id: id, stmts: stmts };  }
   function peg$f34(stmts) {    return { type: "subgraph", id: null, stmts: stmts };  }
-  function peg$f35(first, s) {    return s;  }
-  function peg$f36(first, rest) {    return rest.length > 0 ? first + rest.join("") : first;  }
-  function peg$f37(chars) {    return chars.join("");  }
-  function peg$f38() {    return '"';  }
-  function peg$f39() {    return '';  }
-  function peg$f40(c) {    return '\\' + c;  }
-  function peg$f41(content) {    return "\u0001" + content;  }
-  function peg$f42(chars) {    return chars.join("");  }
-  function peg$f43(nested, content) {    return "<" + content + ">";  }
-  function peg$f44(n) {    return n;  }
-  function peg$f45(first, rest) {    return first + rest.join("");  }
-  function peg$f46(s) {    return Array.isArray(s) ? s.flat(Infinity).filter(x => x !== null && x !== undefined).join("") : String(s);  }
+  function peg$f35(stmts) {    return { type: "subgraph", id: null, stmts: stmts };  }
+  function peg$f36(first, s) {    return s;  }
+  function peg$f37(first, rest) {    return rest.length > 0 ? first + rest.join("") : first;  }
+  function peg$f38(chars) {    return chars.join("");  }
+  function peg$f39() {    return '"';  }
+  function peg$f40() {    return '';  }
+  function peg$f41(c) {    return '\\' + c;  }
+  function peg$f42(content) {    return "\u0001" + content;  }
+  function peg$f43(chars) {    return chars.join("");  }
+  function peg$f44(nested, content) {    return "<" + content + ">";  }
+  function peg$f45(n) {    return n;  }
+  function peg$f46(first, rest) {    return first + rest.join("");  }
+  function peg$f47(s) {    return Array.isArray(s) ? s.flat(Infinity).filter(x => x !== null && x !== undefined).join("") : String(s);  }
   let peg$currPos = options.peg$currPos | 0;
   let peg$savedPos = peg$currPos;
   const peg$posDetailsCache = [{ line: 1, column: 1 }];
@@ -537,9 +539,9 @@ function peg$parse(input, options) {
               if (peg$silentFails === 0) { peg$fail(peg$e1); }
             }
             if (s12 !== peg$FAILED) {
-              s13 = peg$parse_();
+              s13 = peg$parseGraphEof();
               peg$savedPos = s0;
-              s0 = peg$f0(s2, s4, s6, s10);
+              s0 = peg$f0(s2, s4, s6, s10, s13);
             } else {
               peg$currPos = s0;
               s0 = peg$FAILED;
@@ -571,6 +573,35 @@ function peg$parse(input, options) {
     return s0;
   }
 
+  function peg$parseGraphEof() {
+    let s0, s1, s2;
+
+    s0 = peg$currPos;
+    s1 = [];
+    if (input.length > peg$currPos) {
+      s2 = input.charAt(peg$currPos);
+      peg$currPos++;
+    } else {
+      s2 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$e2); }
+    }
+    while (s2 !== peg$FAILED) {
+      s1.push(s2);
+      if (input.length > peg$currPos) {
+        s2 = input.charAt(peg$currPos);
+        peg$currPos++;
+      } else {
+        s2 = peg$FAILED;
+        if (peg$silentFails === 0) { peg$fail(peg$e2); }
+      }
+    }
+    peg$savedPos = s0;
+    s1 = peg$f2();
+    s0 = s1;
+
+    return s0;
+  }
+
   function peg$parseOptStrict() {
     let s0, s1, s2;
 
@@ -579,7 +610,7 @@ function peg$parse(input, options) {
     if (s1 !== peg$FAILED) {
       s2 = peg$parse_();
       peg$savedPos = s0;
-      s0 = peg$f2();
+      s0 = peg$f3();
     } else {
       peg$currPos = s0;
       s0 = peg$FAILED;
@@ -588,7 +619,7 @@ function peg$parse(input, options) {
       s0 = peg$currPos;
       s1 = '';
       peg$savedPos = s0;
-      s1 = peg$f3();
+      s1 = peg$f4();
       s0 = s1;
     }
 
@@ -602,7 +633,7 @@ function peg$parse(input, options) {
     s1 = peg$parseDigraphKw();
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f4();
+      s1 = peg$f5();
     }
     s0 = s1;
     if (s0 === peg$FAILED) {
@@ -610,7 +641,7 @@ function peg$parse(input, options) {
       s1 = peg$parseGraphKw();
       if (s1 !== peg$FAILED) {
         peg$savedPos = s0;
-        s1 = peg$f5();
+        s1 = peg$f6();
       }
       s0 = s1;
     }
@@ -626,7 +657,7 @@ function peg$parse(input, options) {
     if (s1 !== peg$FAILED) {
       s2 = peg$parse_();
       peg$savedPos = s0;
-      s0 = peg$f6(s1);
+      s0 = peg$f7(s1);
     } else {
       peg$currPos = s0;
       s0 = peg$FAILED;
@@ -635,7 +666,7 @@ function peg$parse(input, options) {
       s0 = peg$currPos;
       s1 = '';
       peg$savedPos = s0;
-      s1 = peg$f7();
+      s1 = peg$f8();
       s0 = s1;
     }
 
@@ -652,7 +683,7 @@ function peg$parse(input, options) {
     if (s3 !== peg$FAILED) {
       s4 = peg$parse_();
       peg$savedPos = s2;
-      s2 = peg$f8(s3);
+      s2 = peg$f9(s3);
     } else {
       peg$currPos = s2;
       s2 = peg$FAILED;
@@ -664,14 +695,14 @@ function peg$parse(input, options) {
       if (s3 !== peg$FAILED) {
         s4 = peg$parse_();
         peg$savedPos = s2;
-        s2 = peg$f8(s3);
+        s2 = peg$f9(s3);
       } else {
         peg$currPos = s2;
         s2 = peg$FAILED;
       }
     }
     peg$savedPos = s0;
-    s1 = peg$f9(s1);
+    s1 = peg$f10(s1);
     s0 = s1;
 
     return s0;
@@ -690,7 +721,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s4 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e2); }
+        if (peg$silentFails === 0) { peg$fail(peg$e3); }
       }
       if (s4 !== peg$FAILED) {
         s5 = peg$parse_();
@@ -704,7 +735,7 @@ function peg$parse(input, options) {
         s3 = null;
       }
       peg$savedPos = s0;
-      s0 = peg$f10(s1);
+      s0 = peg$f11(s1);
     } else {
       peg$currPos = s0;
       s0 = peg$FAILED;
@@ -720,7 +751,7 @@ function peg$parse(input, options) {
           peg$currPos++;
         } else {
           s4 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e2); }
+          if (peg$silentFails === 0) { peg$fail(peg$e3); }
         }
         if (s4 !== peg$FAILED) {
           s5 = peg$parse_();
@@ -734,7 +765,7 @@ function peg$parse(input, options) {
           s3 = null;
         }
         peg$savedPos = s0;
-        s0 = peg$f11(s1);
+        s0 = peg$f12(s1);
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -756,7 +787,7 @@ function peg$parse(input, options) {
         s4 = peg$parseAttrListReq();
         if (s4 !== peg$FAILED) {
           peg$savedPos = s0;
-          s0 = peg$f12(s1, s3, s4);
+          s0 = peg$f13(s1, s3, s4);
         } else {
           peg$currPos = s0;
           s0 = peg$FAILED;
@@ -774,7 +805,7 @@ function peg$parse(input, options) {
       s1 = peg$parseAttrAssignment();
       if (s1 !== peg$FAILED) {
         peg$savedPos = s0;
-        s1 = peg$f13(s1);
+        s1 = peg$f14(s1);
       }
       s0 = s1;
     }
@@ -794,12 +825,12 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s3 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e3); }
+        if (peg$silentFails === 0) { peg$fail(peg$e4); }
       }
       if (s3 !== peg$FAILED) {
         s4 = peg$parse_();
         peg$savedPos = s0;
-        s0 = peg$f14();
+        s0 = peg$f15();
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -812,7 +843,7 @@ function peg$parse(input, options) {
       s0 = peg$currPos;
       s1 = '';
       peg$savedPos = s0;
-      s1 = peg$f15();
+      s1 = peg$f16();
       s0 = s1;
     }
 
@@ -826,7 +857,7 @@ function peg$parse(input, options) {
     s1 = peg$parseGraphKw();
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f16();
+      s1 = peg$f17();
     }
     s0 = s1;
     if (s0 === peg$FAILED) {
@@ -834,7 +865,7 @@ function peg$parse(input, options) {
       s1 = peg$parseNodeKw();
       if (s1 !== peg$FAILED) {
         peg$savedPos = s0;
-        s1 = peg$f17();
+        s1 = peg$f18();
       }
       s0 = s1;
       if (s0 === peg$FAILED) {
@@ -842,7 +873,7 @@ function peg$parse(input, options) {
         s1 = peg$parseEdgeKw();
         if (s1 !== peg$FAILED) {
           peg$savedPos = s0;
-          s1 = peg$f18();
+          s1 = peg$f19();
         }
         s0 = s1;
       }
@@ -861,7 +892,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s2 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e4); }
+      if (peg$silentFails === 0) { peg$fail(peg$e5); }
     }
     if (s2 !== peg$FAILED) {
       s3 = peg$parse_();
@@ -872,13 +903,13 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s6 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e5); }
+        if (peg$silentFails === 0) { peg$fail(peg$e6); }
       }
       if (s6 !== peg$FAILED) {
         s7 = peg$parseAttrList();
         if (s7 !== peg$FAILED) {
           peg$savedPos = s0;
-          s0 = peg$f19(s4, s7);
+          s0 = peg$f20(s4, s7);
         } else {
           peg$currPos = s0;
           s0 = peg$FAILED;
@@ -903,7 +934,7 @@ function peg$parse(input, options) {
       s0 = peg$currPos;
       s1 = '';
       peg$savedPos = s0;
-      s1 = peg$f20();
+      s1 = peg$f21();
       s0 = s1;
     }
 
@@ -925,7 +956,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s6 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e6); }
+        if (peg$silentFails === 0) { peg$fail(peg$e7); }
       }
       if (s6 !== peg$FAILED) {
         s7 = peg$parse_();
@@ -939,7 +970,7 @@ function peg$parse(input, options) {
         s5 = null;
       }
       peg$savedPos = s2;
-      s2 = peg$f21(s3);
+      s2 = peg$f22(s3);
     } else {
       peg$currPos = s2;
       s2 = peg$FAILED;
@@ -956,7 +987,7 @@ function peg$parse(input, options) {
           peg$currPos++;
         } else {
           s6 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e6); }
+          if (peg$silentFails === 0) { peg$fail(peg$e7); }
         }
         if (s6 !== peg$FAILED) {
           s7 = peg$parse_();
@@ -970,14 +1001,14 @@ function peg$parse(input, options) {
           s5 = null;
         }
         peg$savedPos = s2;
-        s2 = peg$f21(s3);
+        s2 = peg$f22(s3);
       } else {
         peg$currPos = s2;
         s2 = peg$FAILED;
       }
     }
     peg$savedPos = s0;
-    s1 = peg$f22(s1);
+    s1 = peg$f23(s1);
     s0 = s1;
 
     return s0;
@@ -995,14 +1026,14 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s3 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e3); }
+        if (peg$silentFails === 0) { peg$fail(peg$e4); }
       }
       if (s3 !== peg$FAILED) {
         s4 = peg$parse_();
         s5 = peg$parseAtom();
         if (s5 !== peg$FAILED) {
           peg$savedPos = s0;
-          s0 = peg$f23(s1, s5);
+          s0 = peg$f24(s1, s5);
         } else {
           peg$currPos = s0;
           s0 = peg$FAILED;
@@ -1032,7 +1063,7 @@ function peg$parse(input, options) {
         s5 = peg$parseAttrList();
         if (s5 !== peg$FAILED) {
           peg$savedPos = s0;
-          s0 = peg$f24(s1, s3, s5);
+          s0 = peg$f25(s1, s3, s5);
         } else {
           peg$currPos = s0;
           s0 = peg$FAILED;
@@ -1056,7 +1087,7 @@ function peg$parse(input, options) {
     s1 = peg$parseSubgraph();
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f25(s1);
+      s1 = peg$f26(s1);
     }
     s0 = s1;
     if (s0 === peg$FAILED) {
@@ -1064,7 +1095,7 @@ function peg$parse(input, options) {
       s1 = peg$parseNode();
       if (s1 !== peg$FAILED) {
         peg$savedPos = s0;
-        s1 = peg$f26(s1);
+        s1 = peg$f27(s1);
       }
       s0 = s1;
     }
@@ -1084,7 +1115,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s3 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e7); }
+        if (peg$silentFails === 0) { peg$fail(peg$e8); }
       }
       if (s3 !== peg$FAILED) {
         s4 = peg$parse_();
@@ -1096,14 +1127,14 @@ function peg$parse(input, options) {
             peg$currPos++;
           } else {
             s7 = peg$FAILED;
-            if (peg$silentFails === 0) { peg$fail(peg$e7); }
+            if (peg$silentFails === 0) { peg$fail(peg$e8); }
           }
           if (s7 !== peg$FAILED) {
             s8 = peg$parse_();
             s9 = peg$parseAtom();
             if (s9 !== peg$FAILED) {
               peg$savedPos = s0;
-              s0 = peg$f27(s1, s5, s9);
+              s0 = peg$f28(s1, s5, s9);
             } else {
               peg$currPos = s0;
               s0 = peg$FAILED;
@@ -1134,14 +1165,14 @@ function peg$parse(input, options) {
           peg$currPos++;
         } else {
           s3 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e7); }
+          if (peg$silentFails === 0) { peg$fail(peg$e8); }
         }
         if (s3 !== peg$FAILED) {
           s4 = peg$parse_();
           s5 = peg$parseAtom();
           if (s5 !== peg$FAILED) {
             peg$savedPos = s0;
-            s0 = peg$f28(s1, s5);
+            s0 = peg$f29(s1, s5);
           } else {
             peg$currPos = s0;
             s0 = peg$FAILED;
@@ -1159,7 +1190,7 @@ function peg$parse(input, options) {
         s1 = peg$parseAtom();
         if (s1 !== peg$FAILED) {
           peg$savedPos = s0;
-          s1 = peg$f29(s1);
+          s1 = peg$f30(s1);
         }
         s0 = s1;
       }
@@ -1181,7 +1212,7 @@ function peg$parse(input, options) {
         s5 = peg$parseEdgeChain();
         if (s5 !== peg$FAILED) {
           peg$savedPos = s0;
-          s0 = peg$f30(s3, s5);
+          s0 = peg$f31(s3, s5);
         } else {
           peg$currPos = s0;
           s0 = peg$FAILED;
@@ -1198,7 +1229,7 @@ function peg$parse(input, options) {
       s0 = peg$currPos;
       s1 = '';
       peg$savedPos = s0;
-      s1 = peg$f31();
+      s1 = peg$f32();
       s0 = s1;
     }
 
@@ -1214,7 +1245,7 @@ function peg$parse(input, options) {
       peg$currPos += 2;
     } else {
       s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e9); }
+      if (peg$silentFails === 0) { peg$fail(peg$e10); }
     }
     if (s0 === peg$FAILED) {
       if (input.substr(peg$currPos, 2) === peg$c8) {
@@ -1222,13 +1253,13 @@ function peg$parse(input, options) {
         peg$currPos += 2;
       } else {
         s0 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e10); }
+        if (peg$silentFails === 0) { peg$fail(peg$e11); }
       }
     }
     peg$silentFails--;
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e8); }
+      if (peg$silentFails === 0) { peg$fail(peg$e9); }
     }
 
     return s0;
@@ -1265,7 +1296,7 @@ function peg$parse(input, options) {
             }
             if (s9 !== peg$FAILED) {
               peg$savedPos = s0;
-              s0 = peg$f32(s3, s7);
+              s0 = peg$f33(s3, s7);
             } else {
               peg$currPos = s0;
               s0 = peg$FAILED;
@@ -1312,7 +1343,7 @@ function peg$parse(input, options) {
             }
             if (s7 !== peg$FAILED) {
               peg$savedPos = s0;
-              s0 = peg$f33(s5);
+              s0 = peg$f34(s5);
             } else {
               peg$currPos = s0;
               s0 = peg$FAILED;
@@ -1352,7 +1383,7 @@ function peg$parse(input, options) {
             }
             if (s5 !== peg$FAILED) {
               peg$savedPos = s0;
-              s0 = peg$f34(s3);
+              s0 = peg$f35(s3);
             } else {
               peg$currPos = s0;
               s0 = peg$FAILED;
@@ -1385,14 +1416,14 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s5 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e11); }
+        if (peg$silentFails === 0) { peg$fail(peg$e12); }
       }
       if (s5 !== peg$FAILED) {
         s6 = peg$parse_();
         s7 = peg$parseQAtom();
         if (s7 !== peg$FAILED) {
           peg$savedPos = s3;
-          s3 = peg$f35(s1, s7);
+          s3 = peg$f36(s1, s7);
         } else {
           peg$currPos = s3;
           s3 = peg$FAILED;
@@ -1410,14 +1441,14 @@ function peg$parse(input, options) {
           peg$currPos++;
         } else {
           s5 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e11); }
+          if (peg$silentFails === 0) { peg$fail(peg$e12); }
         }
         if (s5 !== peg$FAILED) {
           s6 = peg$parse_();
           s7 = peg$parseQAtom();
           if (s7 !== peg$FAILED) {
             peg$savedPos = s3;
-            s3 = peg$f35(s1, s7);
+            s3 = peg$f36(s1, s7);
           } else {
             peg$currPos = s3;
             s3 = peg$FAILED;
@@ -1428,7 +1459,7 @@ function peg$parse(input, options) {
         }
       }
       peg$savedPos = s0;
-      s0 = peg$f36(s1, s2);
+      s0 = peg$f37(s1, s2);
     } else {
       peg$currPos = s0;
       s0 = peg$FAILED;
@@ -1460,7 +1491,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e12); }
+      if (peg$silentFails === 0) { peg$fail(peg$e13); }
     }
     if (s1 !== peg$FAILED) {
       s2 = [];
@@ -1474,11 +1505,11 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s3 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e12); }
+        if (peg$silentFails === 0) { peg$fail(peg$e13); }
       }
       if (s3 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f37(s2);
+        s0 = peg$f38(s2);
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -1500,11 +1531,11 @@ function peg$parse(input, options) {
       peg$currPos += 2;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e13); }
+      if (peg$silentFails === 0) { peg$fail(peg$e14); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f38();
+      s1 = peg$f39();
     }
     s0 = s1;
     if (s0 === peg$FAILED) {
@@ -1514,11 +1545,11 @@ function peg$parse(input, options) {
         peg$currPos += 2;
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e14); }
+        if (peg$silentFails === 0) { peg$fail(peg$e15); }
       }
       if (s1 !== peg$FAILED) {
         peg$savedPos = s0;
-        s1 = peg$f39();
+        s1 = peg$f40();
       }
       s0 = s1;
       if (s0 === peg$FAILED) {
@@ -1528,7 +1559,7 @@ function peg$parse(input, options) {
           peg$currPos++;
         } else {
           s1 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e15); }
+          if (peg$silentFails === 0) { peg$fail(peg$e16); }
         }
         if (s1 !== peg$FAILED) {
           if (input.length > peg$currPos) {
@@ -1536,11 +1567,11 @@ function peg$parse(input, options) {
             peg$currPos++;
           } else {
             s2 = peg$FAILED;
-            if (peg$silentFails === 0) { peg$fail(peg$e16); }
+            if (peg$silentFails === 0) { peg$fail(peg$e2); }
           }
           if (s2 !== peg$FAILED) {
             peg$savedPos = s0;
-            s0 = peg$f40(s2);
+            s0 = peg$f41(s2);
           } else {
             peg$currPos = s0;
             s0 = peg$FAILED;
@@ -1586,7 +1617,7 @@ function peg$parse(input, options) {
       }
       if (s3 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f41(s2);
+        s0 = peg$f42(s2);
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -1610,7 +1641,7 @@ function peg$parse(input, options) {
       s2 = peg$parseHtmlChar();
     }
     peg$savedPos = s0;
-    s1 = peg$f42(s1);
+    s1 = peg$f43(s1);
     s0 = s1;
 
     return s0;
@@ -1639,7 +1670,7 @@ function peg$parse(input, options) {
         }
         if (s3 !== peg$FAILED) {
           peg$savedPos = s0;
-          s0 = peg$f43(s1, s2);
+          s0 = peg$f44(s1, s2);
         } else {
           peg$currPos = s0;
           s0 = peg$FAILED;
@@ -1685,7 +1716,7 @@ function peg$parse(input, options) {
         s2 = peg$parseName();
         if (s2 !== peg$FAILED) {
           peg$savedPos = s0;
-          s0 = peg$f44(s2);
+          s0 = peg$f45(s2);
         } else {
           peg$currPos = s0;
           s0 = peg$FAILED;
@@ -1730,7 +1761,7 @@ function peg$parse(input, options) {
         }
       }
       peg$savedPos = s0;
-      s0 = peg$f45(s1, s2);
+      s0 = peg$f46(s1, s2);
     } else {
       peg$currPos = s0;
       s0 = peg$FAILED;
@@ -1873,7 +1904,7 @@ function peg$parse(input, options) {
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f46(s1);
+      s1 = peg$f47(s1);
     }
     s0 = s1;
 
@@ -3027,7 +3058,7 @@ function peg$parse(input, options) {
           peg$currPos++;
         } else {
           s5 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e16); }
+          if (peg$silentFails === 0) { peg$fail(peg$e2); }
         }
         if (s5 !== peg$FAILED) {
           s4 = [s4, s5];
@@ -3065,7 +3096,7 @@ function peg$parse(input, options) {
             peg$currPos++;
           } else {
             s5 = peg$FAILED;
-            if (peg$silentFails === 0) { peg$fail(peg$e16); }
+            if (peg$silentFails === 0) { peg$fail(peg$e2); }
           }
           if (s5 !== peg$FAILED) {
             s4 = [s4, s5];
@@ -3146,7 +3177,7 @@ function peg$parse(input, options) {
           peg$currPos++;
         } else {
           s4 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e16); }
+          if (peg$silentFails === 0) { peg$fail(peg$e2); }
         }
         peg$silentFails--;
         if (s4 === peg$FAILED) {
@@ -3216,7 +3247,7 @@ function peg$parse(input, options) {
           peg$currPos++;
         } else {
           s4 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e16); }
+          if (peg$silentFails === 0) { peg$fail(peg$e2); }
         }
         peg$silentFails--;
         if (s4 === peg$FAILED) {