@weborigami/language 0.0.38 → 0.0.40

package/src/compiler/parse.js

@@ -204,13 +204,14 @@ function peg$parse(input, options) {
   var peg$c16 = ",";
   var peg$c17 = "https";
   var peg$c18 = "http";
-  var peg$c19 = "treehttps";
-  var peg$c20 = "treehttp";
-  var peg$c21 = "tree";
-  var peg$c22 = "'";
-  var peg$c23 = "{{";
-  var peg$c24 = "`";
-  var peg$c25 = "}}";
+  var peg$c19 = "package";
+  var peg$c20 = "treehttps";
+  var peg$c21 = "treehttp";
+  var peg$c22 = "tree";
+  var peg$c23 = "'";
+  var peg$c24 = "{{";
+  var peg$c25 = "`";
+  var peg$c26 = "}}";
 
   var peg$r0 = /^[^\n\r]/;
   var peg$r1 = /^[0-9]/;
@@ -218,40 +219,76 @@ function peg$parse(input, options) {
   var peg$r3 = /^[ \t]/;
   var peg$r4 = /^[+\-]/;
 
-  var peg$e0 = peg$literalExpectation("=", false);
-  var peg$e1 = peg$literalExpectation("[", false);
-  var peg$e2 = peg$literalExpectation("]", false);
-  var peg$e3 = peg$literalExpectation("#", false);
-  var peg$e4 = peg$classExpectation(["\n", "\r"], true, false);
-  var peg$e5 = peg$classExpectation([["0", "9"]], false, false);
-  var peg$e6 = peg$literalExpectation("\"", false);
-  var peg$e7 = peg$literalExpectation("\\", false);
-  var peg$e8 = peg$anyExpectation();
-  var peg$e9 = peg$otherExpectation("Origami expression");
-  var peg$e10 = peg$literalExpectation(".", false);
-  var peg$e11 = peg$literalExpectation("(", false);
-  var peg$e12 = peg$literalExpectation(")", false);
-  var peg$e13 = peg$classExpectation(["(", ")", "{", "}", "[", "]", ",", "/", ":", "=", "`", "\"", "'", "\\", "#", " ", "\t", "\n", "\r"], true, false);
-  var peg$e14 = peg$literalExpectation(":", false);
-  var peg$e15 = peg$classExpectation([" ", "\t"], false, false);
-  var peg$e16 = peg$literalExpectation("/", false);
-  var peg$e17 = peg$literalExpectation("\n", false);
-  var peg$e18 = peg$literalExpectation("\r\n", false);
-  var peg$e19 = peg$literalExpectation("\r", false);
-  var peg$e20 = peg$literalExpectation("{", false);
-  var peg$e21 = peg$literalExpectation("}", false);
-  var peg$e22 = peg$literalExpectation(",", false);
-  var peg$e23 = peg$classExpectation(["+", "-"], false, false);
-  var peg$e24 = peg$literalExpectation("https", false);
-  var peg$e25 = peg$literalExpectation("http", false);
-  var peg$e26 = peg$literalExpectation("treehttps", false);
-  var peg$e27 = peg$literalExpectation("treehttp", false);
-  var peg$e28 = peg$literalExpectation("tree", false);
-  var peg$e29 = peg$literalExpectation("'", false);
-  var peg$e30 = peg$otherExpectation("Origami template");
-  var peg$e31 = peg$literalExpectation("{{", false);
-  var peg$e32 = peg$literalExpectation("`", false);
-  var peg$e33 = peg$literalExpectation("}}", false);
+  var peg$e0 = peg$otherExpectation("absolute file path");
+  var peg$e1 = peg$otherExpectation("function arguments");
+  var peg$e2 = peg$otherExpectation("tree assignment");
+  var peg$e3 = peg$literalExpectation("=", false);
+  var peg$e4 = peg$otherExpectation("array");
+  var peg$e5 = peg$literalExpectation("[", false);
+  var peg$e6 = peg$literalExpectation("]", false);
+  var peg$e7 = peg$otherExpectation("function call");
+  var peg$e8 = peg$otherExpectation("comment");
+  var peg$e9 = peg$literalExpectation("#", false);
+  var peg$e10 = peg$classExpectation(["\n", "\r"], true, false);
+  var peg$e11 = peg$classExpectation([["0", "9"]], false, false);
+  var peg$e12 = peg$otherExpectation("double quote string");
+  var peg$e13 = peg$literalExpectation("\"", false);
+  var peg$e14 = peg$otherExpectation("backslash-escaped character");
+  var peg$e15 = peg$literalExpectation("\\", false);
+  var peg$e16 = peg$anyExpectation();
+  var peg$e17 = peg$otherExpectation("expression");
+  var peg$e18 = peg$otherExpectation("Origami expression");
+  var peg$e19 = peg$otherExpectation("floating-point number");
+  var peg$e20 = peg$literalExpectation(".", false);
+  var peg$e21 = peg$otherExpectation("function composition");
+  var peg$e22 = peg$otherExpectation("parenthetical group");
+  var peg$e23 = peg$literalExpectation("(", false);
+  var peg$e24 = peg$literalExpectation(")", false);
+  var peg$e25 = peg$otherExpectation("identifier");
+  var peg$e26 = peg$classExpectation(["(", ")", "{", "}", "[", "]", ",", "/", ":", "=", "`", "\"", "'", "\\", "#", " ", "\t", "\n", "\r"], true, false);
+  var peg$e27 = peg$otherExpectation("function call with implicit parentheses");
+  var peg$e28 = peg$otherExpectation("HTTP/HTTPS host");
+  var peg$e29 = peg$literalExpectation(":", false);
+  var peg$e30 = peg$classExpectation([" ", "\t"], false, false);
+  var peg$e31 = peg$otherExpectation("integer");
+  var peg$e32 = peg$otherExpectation("lambda function");
+  var peg$e33 = peg$otherExpectation("path with a leading slash");
+  var peg$e34 = peg$literalExpectation("/", false);
+  var peg$e35 = peg$otherExpectation("list");
+  var peg$e36 = peg$literalExpectation("\n", false);
+  var peg$e37 = peg$literalExpectation("\r\n", false);
+  var peg$e38 = peg$literalExpectation("\r", false);
+  var peg$e39 = peg$otherExpectation("number");
+  var peg$e40 = peg$otherExpectation("object literal");
+  var peg$e41 = peg$literalExpectation("{", false);
+  var peg$e42 = peg$literalExpectation("}", false);
+  var peg$e43 = peg$otherExpectation("object property");
+  var peg$e44 = peg$otherExpectation("function arguments in parentheses");
+  var peg$e45 = peg$literalExpectation(",", false);
+  var peg$e46 = peg$classExpectation(["+", "-"], false, false);
+  var peg$e47 = peg$otherExpectation("slash-separated path");
+  var peg$e48 = peg$otherExpectation("path element");
+  var peg$e49 = peg$otherExpectation("function call using protocol: syntax");
+  var peg$e50 = peg$otherExpectation("protocol");
+  var peg$e51 = peg$otherExpectation("reserved protocol");
+  var peg$e52 = peg$literalExpectation("https", false);
+  var peg$e53 = peg$literalExpectation("http", false);
+  var peg$e54 = peg$literalExpectation("package", false);
+  var peg$e55 = peg$literalExpectation("treehttps", false);
+  var peg$e56 = peg$literalExpectation("treehttp", false);
+  var peg$e57 = peg$literalExpectation("tree", false);
+  var peg$e58 = peg$otherExpectation("scope reference");
+  var peg$e59 = peg$otherExpectation("single quote string");
+  var peg$e60 = peg$literalExpectation("'", false);
+  var peg$e61 = peg$otherExpectation("string");
+  var peg$e62 = peg$otherExpectation("template");
+  var peg$e63 = peg$literalExpectation("{{", false);
+  var peg$e64 = peg$otherExpectation("template text");
+  var peg$e65 = peg$otherExpectation("template literal");
+  var peg$e66 = peg$literalExpectation("`", false);
+  var peg$e67 = peg$otherExpectation("template substitution");
+  var peg$e68 = peg$literalExpectation("}}", false);
+  var peg$e69 = peg$otherExpectation("tree literal");
 
   var peg$f0 = function() { return ""; };
   var peg$f1 = function(path) { return [[ops.filesRoot], ...path]; };
@@ -288,18 +325,19 @@ function peg$parse(input, options) {
     };
   var peg$f23 = function() { return ops.https; };
   var peg$f24 = function() { return ops.http; };
-  var peg$f25 = function() { return ops.treeHttps; };
-  var peg$f26 = function() { return ops.treeHttp; };
-  var peg$f27 = function() { return ops.treeHttps; };
-  var peg$f28 = function(key) { return [ops.scope, key]; };
-  var peg$f29 = function(chars) { return chars.join(""); };
-  var peg$f30 = function(contents) { return [ops.lambda, contents]; };
-  var peg$f31 = function(parts) { return makeTemplate(parts); };
-  var peg$f32 = function(chars) { return chars.join(""); };
-  var peg$f33 = function(parts) { return makeTemplate(parts); };
-  var peg$f34 = function(chars) { return chars.join(""); };
-  var peg$f35 = function(assignments) { return [ops.tree, ...(assignments ?? [])]; };
-  var peg$f36 = function(head, tail) {
+  var peg$f25 = function() { return [ops.scope, "@package"] };
+  var peg$f26 = function() { return ops.treeHttps; };
+  var peg$f27 = function() { return ops.treeHttp; };
+  var peg$f28 = function() { return ops.treeHttps; };
+  var peg$f29 = function(key) { return [ops.scope, key]; };
+  var peg$f30 = function(chars) { return chars.join(""); };
+  var peg$f31 = function(contents) { return [ops.lambda, contents]; };
+  var peg$f32 = function(parts) { return makeTemplate(parts); };
+  var peg$f33 = function(chars) { return chars.join(""); };
+  var peg$f34 = function(parts) { return makeTemplate(parts); };
+  var peg$f35 = function(chars) { return chars.join(""); };
+  var peg$f36 = function(assignments) { return [ops.tree, ...(assignments ?? [])]; };
+  var peg$f37 = function(head, tail) {
       return [head].concat(tail);
     };
   var peg$currPos = 0;
@@ -494,6 +532,7 @@ function peg$parse(input, options) {
   function peg$parseabsoluteFilePath() {
     var s0, s1;
 
+    peg$silentFails++;
     s0 = peg$currPos;
     s1 = peg$parseleadingSlashPath();
     if (s1 !== peg$FAILED) {
@@ -501,6 +540,11 @@ function peg$parse(input, options) {
       s1 = peg$f1(s1);
     }
     s0 = s1;
+    peg$silentFails--;
+    if (s0 === peg$FAILED) {
+      s1 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$e0); }
+    }
 
     return s0;
   }
@@ -508,6 +552,7 @@ function peg$parse(input, options) {
   function peg$parseargsChain() {
     var s0, s1, s2;
 
+    peg$silentFails++;
     s0 = peg$currPos;
     s1 = [];
     s2 = peg$parseparensArgs();
@@ -530,6 +575,11 @@ function peg$parse(input, options) {
       s1 = peg$f2(s1);
     }
     s0 = s1;
+    peg$silentFails--;
+    if (s0 === peg$FAILED) {
+      s1 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$e1); }
+    }
 
     return s0;
   }
@@ -537,6 +587,7 @@ function peg$parse(input, options) {
   function peg$parseassignment() {
     var s0, s1, s2, s3, s4, s5;
 
+    peg$silentFails++;
     s0 = peg$currPos;
     s1 = peg$parseidentifier();
     if (s1 !== peg$FAILED) {
@@ -546,7 +597,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s3 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e0); }
+        if (peg$silentFails === 0) { peg$fail(peg$e3); }
       }
       if (s3 !== peg$FAILED) {
         s4 = peg$parse__();
@@ -565,6 +616,11 @@ function peg$parse(input, options) {
       peg$currPos = s0;
       s0 = peg$FAILED;
     }
+    peg$silentFails--;
+    if (s0 === peg$FAILED) {
+      s1 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$e2); }
+    }
 
     return s0;
   }
@@ -589,13 +645,14 @@ function peg$parse(input, options) {
   function peg$parsearray() {
     var s0, s1, s2, s3, s4;
 
+    peg$silentFails++;
     s0 = peg$currPos;
     if (input.charCodeAt(peg$currPos) === 91) {
       s1 = peg$c1;
       peg$currPos++;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e1); }
+      if (peg$silentFails === 0) { peg$fail(peg$e5); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$parse__();
@@ -608,7 +665,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$e6); }
       }
       if (s4 !== peg$FAILED) {
         peg$savedPos = s0;
@@ -621,13 +678,19 @@ function peg$parse(input, options) {
       peg$currPos = s0;
       s0 = peg$FAILED;
     }
+    peg$silentFails--;
+    if (s0 === peg$FAILED) {
+      s1 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$e4); }
+    }
 
     return s0;
   }
 
   function peg$parsecallTarget() {
-    var s0;
+    var s0, s1;
 
+    peg$silentFails++;
     s0 = peg$parseabsoluteFilePath();
     if (s0 === peg$FAILED) {
       s0 = peg$parsearray();
@@ -650,6 +713,11 @@ function peg$parse(input, options) {
         }
       }
     }
+    peg$silentFails--;
+    if (s0 === peg$FAILED) {
+      s1 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$e7); }
+    }
 
     return s0;
   }
@@ -657,13 +725,14 @@ function peg$parse(input, options) {
   function peg$parsecomment() {
     var s0, s1, s2, s3;
 
+    peg$silentFails++;
     s0 = peg$currPos;
     if (input.charCodeAt(peg$currPos) === 35) {
       s1 = peg$c3;
       peg$currPos++;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e3); }
+      if (peg$silentFails === 0) { peg$fail(peg$e9); }
     }
     if (s1 !== peg$FAILED) {
       s2 = [];
@@ -672,7 +741,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s3 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e4); }
+        if (peg$silentFails === 0) { peg$fail(peg$e10); }
       }
       while (s3 !== peg$FAILED) {
         s2.push(s3);
@@ -681,7 +750,7 @@ function peg$parse(input, options) {
           peg$currPos++;
         } else {
           s3 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e4); }
+          if (peg$silentFails === 0) { peg$fail(peg$e10); }
         }
       }
       s1 = [s1, s2];
@@ -690,6 +759,11 @@ function peg$parse(input, options) {
       peg$currPos = s0;
       s0 = peg$FAILED;
     }
+    peg$silentFails--;
+    if (s0 === peg$FAILED) {
+      s1 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$e8); }
+    }
 
     return s0;
   }
@@ -704,7 +778,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s2 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e5); }
+      if (peg$silentFails === 0) { peg$fail(peg$e11); }
     }
     if (s2 !== peg$FAILED) {
       while (s2 !== peg$FAILED) {
@@ -714,7 +788,7 @@ function peg$parse(input, options) {
           peg$currPos++;
         } else {
           s2 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e5); }
+          if (peg$silentFails === 0) { peg$fail(peg$e11); }
         }
       }
     } else {
@@ -733,13 +807,14 @@ function peg$parse(input, options) {
   function peg$parsedoubleQuoteString() {
     var s0, s1, s2, s3;
 
+    peg$silentFails++;
     s0 = peg$currPos;
     if (input.charCodeAt(peg$currPos) === 34) {
       s1 = peg$c4;
       peg$currPos++;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e6); }
+      if (peg$silentFails === 0) { peg$fail(peg$e13); }
     }
     if (s1 !== peg$FAILED) {
       s2 = [];
@@ -753,7 +828,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s3 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e6); }
+        if (peg$silentFails === 0) { peg$fail(peg$e13); }
       }
       if (s3 !== peg$FAILED) {
         peg$savedPos = s0;
@@ -766,6 +841,11 @@ function peg$parse(input, options) {
       peg$currPos = s0;
       s0 = peg$FAILED;
     }
+    peg$silentFails--;
+    if (s0 === peg$FAILED) {
+      s1 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$e12); }
+    }
 
     return s0;
   }
@@ -781,7 +861,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s2 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e6); }
+      if (peg$silentFails === 0) { peg$fail(peg$e13); }
     }
     if (s2 === peg$FAILED) {
       s2 = peg$parsenewLine();
@@ -812,13 +892,14 @@ function peg$parse(input, options) {
   function peg$parseescapedChar() {
     var s0, s1, s2;
 
+    peg$silentFails++;
     s0 = peg$currPos;
     if (input.charCodeAt(peg$currPos) === 92) {
       s1 = peg$c5;
       peg$currPos++;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e7); }
+      if (peg$silentFails === 0) { peg$fail(peg$e15); }
     }
     if (s1 !== peg$FAILED) {
       if (input.length > peg$currPos) {
@@ -826,7 +907,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s2 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e8); }
+        if (peg$silentFails === 0) { peg$fail(peg$e16); }
       }
       if (s2 !== peg$FAILED) {
         s0 = s2;
@@ -838,13 +919,19 @@ function peg$parse(input, options) {
       peg$currPos = s0;
       s0 = peg$FAILED;
     }
+    peg$silentFails--;
+    if (s0 === peg$FAILED) {
+      s1 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$e14); }
+    }
 
     return s0;
   }
 
   function peg$parseexpr() {
-    var s0;
+    var s0, s1;
 
+    peg$silentFails++;
     s0 = peg$parseimplicitParensCall();
     if (s0 === peg$FAILED) {
       s0 = peg$parsefunctionComposition();
@@ -882,6 +969,11 @@ function peg$parse(input, options) {
         }
       }
     }
+    peg$silentFails--;
+    if (s0 === peg$FAILED) {
+      s1 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$e17); }
+    }
 
     return s0;
   }
@@ -903,7 +995,7 @@ function peg$parse(input, options) {
     peg$silentFails--;
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e9); }
+      if (peg$silentFails === 0) { peg$fail(peg$e18); }
     }
 
     return s0;
@@ -912,6 +1004,7 @@ function peg$parse(input, options) {
   function peg$parsefloat() {
     var s0, s1, s2, s3, s4;
 
+    peg$silentFails++;
     s0 = peg$currPos;
     s1 = peg$parsesign();
     if (s1 === peg$FAILED) {
@@ -926,7 +1019,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s3 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e10); }
+      if (peg$silentFails === 0) { peg$fail(peg$e20); }
     }
     if (s3 !== peg$FAILED) {
       s4 = peg$parsedigits();
@@ -941,6 +1034,11 @@ function peg$parse(input, options) {
       peg$currPos = s0;
       s0 = peg$FAILED;
     }
+    peg$silentFails--;
+    if (s0 === peg$FAILED) {
+      s1 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$e19); }
+    }
 
     return s0;
   }
@@ -948,6 +1046,7 @@ function peg$parse(input, options) {
   function peg$parsefunctionComposition() {
     var s0, s1, s2;
 
+    peg$silentFails++;
     s0 = peg$currPos;
     s1 = peg$parsecallTarget();
     if (s1 !== peg$FAILED) {
@@ -963,6 +1062,11 @@ function peg$parse(input, options) {
       peg$currPos = s0;
       s0 = peg$FAILED;
     }
+    peg$silentFails--;
+    if (s0 === peg$FAILED) {
+      s1 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$e21); }
+    }
 
     return s0;
   }
@@ -970,13 +1074,14 @@ function peg$parse(input, options) {
   function peg$parsegroup() {
     var s0, s1, s2, s3, s4, s5;
 
+    peg$silentFails++;
     s0 = peg$currPos;
     if (input.charCodeAt(peg$currPos) === 40) {
       s1 = peg$c7;
       peg$currPos++;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e11); }
+      if (peg$silentFails === 0) { peg$fail(peg$e23); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$parse__();
@@ -988,7 +1093,7 @@ function peg$parse(input, options) {
           peg$currPos++;
         } else {
           s5 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e12); }
+          if (peg$silentFails === 0) { peg$fail(peg$e24); }
         }
         if (s5 !== peg$FAILED) {
           s0 = s3;
@@ -1004,6 +1109,11 @@ function peg$parse(input, options) {
       peg$currPos = s0;
       s0 = peg$FAILED;
     }
+    peg$silentFails--;
+    if (s0 === peg$FAILED) {
+      s1 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$e22); }
+    }
 
     return s0;
   }
@@ -1011,6 +1121,7 @@ function peg$parse(input, options) {
   function peg$parseidentifier() {
     var s0, s1, s2;
 
+    peg$silentFails++;
     s0 = peg$currPos;
     s1 = [];
     s2 = peg$parseidentifierChar();
@@ -1027,6 +1138,11 @@ function peg$parse(input, options) {
       s1 = peg$f8(s1);
     }
     s0 = s1;
+    peg$silentFails--;
+    if (s0 === peg$FAILED) {
+      s1 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$e25); }
+    }
 
     return s0;
   }
@@ -1039,7 +1155,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e13); }
+      if (peg$silentFails === 0) { peg$fail(peg$e26); }
     }
     if (s0 === peg$FAILED) {
       s0 = peg$parseescapedChar();
@@ -1051,6 +1167,7 @@ function peg$parse(input, options) {
   function peg$parseimplicitParensCall() {
     var s0, s1, s2, s3;
 
+    peg$silentFails++;
     s0 = peg$currPos;
     s1 = peg$parsefunctionComposition();
     if (s1 === peg$FAILED) {
@@ -1084,6 +1201,11 @@ function peg$parse(input, options) {
       peg$currPos = s0;
       s0 = peg$FAILED;
     }
+    peg$silentFails--;
+    if (s0 === peg$FAILED) {
+      s1 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$e27); }
+    }
 
     return s0;
   }
@@ -1091,6 +1213,7 @@ function peg$parse(input, options) {
   function peg$parsehost() {
     var s0, s1, s2, s3, s4;
 
+    peg$silentFails++;
     s0 = peg$currPos;
     s1 = peg$parseidentifier();
     if (s1 !== peg$FAILED) {
@@ -1100,7 +1223,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s3 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e14); }
+        if (peg$silentFails === 0) { peg$fail(peg$e29); }
       }
       if (s3 !== peg$FAILED) {
         s4 = peg$parsenumber();
@@ -1124,6 +1247,11 @@ function peg$parse(input, options) {
       peg$currPos = s0;
       s0 = peg$FAILED;
     }
+    peg$silentFails--;
+    if (s0 === peg$FAILED) {
+      s1 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$e28); }
+    }
 
     return s0;
   }
@@ -1136,7 +1264,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e15); }
+      if (peg$silentFails === 0) { peg$fail(peg$e30); }
     }
 
     return s0;
@@ -1145,6 +1273,7 @@ function peg$parse(input, options) {
   function peg$parseinteger() {
     var s0, s1, s2;
 
+    peg$silentFails++;
     s0 = peg$currPos;
     s1 = peg$parsesign();
     if (s1 === peg$FAILED) {
@@ -1158,6 +1287,11 @@ function peg$parse(input, options) {
       peg$currPos = s0;
       s0 = peg$FAILED;
     }
+    peg$silentFails--;
+    if (s0 === peg$FAILED) {
+      s1 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$e31); }
+    }
 
     return s0;
   }
@@ -1165,13 +1299,14 @@ function peg$parse(input, options) {
   function peg$parselambda() {
     var s0, s1, s2, s3;
 
+    peg$silentFails++;
     s0 = peg$currPos;
     if (input.charCodeAt(peg$currPos) === 61) {
       s1 = peg$c0;
       peg$currPos++;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e0); }
+      if (peg$silentFails === 0) { peg$fail(peg$e3); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$parse__();
@@ -1187,6 +1322,11 @@ function peg$parse(input, options) {
       peg$currPos = s0;
       s0 = peg$FAILED;
     }
+    peg$silentFails--;
+    if (s0 === peg$FAILED) {
+      s1 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$e32); }
+    }
 
     return s0;
   }
@@ -1194,13 +1334,14 @@ function peg$parse(input, options) {
   function peg$parseleadingSlashPath() {
     var s0, s1, s2;
 
+    peg$silentFails++;
     s0 = peg$currPos;
     if (input.charCodeAt(peg$currPos) === 47) {
       s1 = peg$c10;
       peg$currPos++;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e16); }
+      if (peg$silentFails === 0) { peg$fail(peg$e34); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$parsepath();
@@ -1221,7 +1362,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e16); }
+        if (peg$silentFails === 0) { peg$fail(peg$e34); }
       }
       if (s1 !== peg$FAILED) {
         peg$savedPos = s0;
@@ -1229,6 +1370,11 @@ function peg$parse(input, options) {
       }
       s0 = s1;
     }
+    peg$silentFails--;
+    if (s0 === peg$FAILED) {
+      s1 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$e33); }
+    }
 
     return s0;
   }
@@ -1236,6 +1382,7 @@ function peg$parse(input, options) {
   function peg$parselist() {
     var s0, s1, s2, s3, s4, s5;
 
+    peg$silentFails++;
     s0 = peg$currPos;
     s1 = peg$parseexpr();
     if (s1 !== peg$FAILED) {
@@ -1281,6 +1428,11 @@ function peg$parse(input, options) {
       peg$currPos = s0;
       s0 = peg$FAILED;
     }
+    peg$silentFails--;
+    if (s0 === peg$FAILED) {
+      s1 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$e35); }
+    }
 
     return s0;
   }
@@ -1293,7 +1445,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e17); }
+      if (peg$silentFails === 0) { peg$fail(peg$e36); }
     }
     if (s0 === peg$FAILED) {
       if (input.substr(peg$currPos, 2) === peg$c12) {
@@ -1301,7 +1453,7 @@ function peg$parse(input, options) {
         peg$currPos += 2;
       } else {
         s0 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e18); }
+        if (peg$silentFails === 0) { peg$fail(peg$e37); }
       }
       if (s0 === peg$FAILED) {
         if (input.charCodeAt(peg$currPos) === 13) {
@@ -1309,7 +1461,7 @@ function peg$parse(input, options) {
           peg$currPos++;
         } else {
           s0 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e19); }
+          if (peg$silentFails === 0) { peg$fail(peg$e38); }
         }
       }
     }
@@ -1318,12 +1470,18 @@ function peg$parse(input, options) {
   }
 
   function peg$parsenumber() {
-    var s0;
+    var s0, s1;
 
+    peg$silentFails++;
     s0 = peg$parsefloat();
     if (s0 === peg$FAILED) {
       s0 = peg$parseinteger();
     }
+    peg$silentFails--;
+    if (s0 === peg$FAILED) {
+      s1 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$e39); }
+    }
 
     return s0;
   }
@@ -1331,13 +1489,14 @@ function peg$parse(input, options) {
   function peg$parseobject() {
     var s0, s1, s2, s3, s4;
 
+    peg$silentFails++;
     s0 = peg$currPos;
     if (input.charCodeAt(peg$currPos) === 123) {
       s1 = peg$c14;
       peg$currPos++;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e20); }
+      if (peg$silentFails === 0) { peg$fail(peg$e41); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$parse__();
@@ -1350,7 +1509,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s4 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e21); }
+        if (peg$silentFails === 0) { peg$fail(peg$e42); }
       }
       if (s4 !== peg$FAILED) {
         peg$savedPos = s0;
@@ -1363,6 +1522,11 @@ function peg$parse(input, options) {
       peg$currPos = s0;
       s0 = peg$FAILED;
     }
+    peg$silentFails--;
+    if (s0 === peg$FAILED) {
+      s1 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$e40); }
+    }
 
     return s0;
   }
@@ -1423,6 +1587,7 @@ function peg$parse(input, options) {
   function peg$parseobjectProperty() {
     var s0, s1, s2, s3, s4, s5;
 
+    peg$silentFails++;
     s0 = peg$currPos;
     s1 = peg$parseidentifier();
     if (s1 !== peg$FAILED) {
@@ -1432,7 +1597,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s3 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e14); }
+        if (peg$silentFails === 0) { peg$fail(peg$e29); }
       }
       if (s3 !== peg$FAILED) {
         s4 = peg$parse__();
@@ -1451,6 +1616,11 @@ function peg$parse(input, options) {
       peg$currPos = s0;
       s0 = peg$FAILED;
     }
+    peg$silentFails--;
+    if (s0 === peg$FAILED) {
+      s1 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$e43); }
+    }
 
     return s0;
   }
@@ -1475,13 +1645,14 @@ function peg$parse(input, options) {
   function peg$parseparensArgs() {
     var s0, s1, s2, s3, s4;
 
+    peg$silentFails++;
     s0 = peg$currPos;
     if (input.charCodeAt(peg$currPos) === 40) {
       s1 = peg$c7;
       peg$currPos++;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e11); }
+      if (peg$silentFails === 0) { peg$fail(peg$e23); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$parse__();
@@ -1494,7 +1665,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s4 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e12); }
+        if (peg$silentFails === 0) { peg$fail(peg$e24); }
       }
       if (s4 !== peg$FAILED) {
         peg$savedPos = s0;
@@ -1507,6 +1678,11 @@ function peg$parse(input, options) {
       peg$currPos = s0;
       s0 = peg$FAILED;
     }
+    peg$silentFails--;
+    if (s0 === peg$FAILED) {
+      s1 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$e44); }
+    }
 
     return s0;
   }
@@ -1521,7 +1697,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s2 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e22); }
+      if (peg$silentFails === 0) { peg$fail(peg$e45); }
     }
     if (s2 !== peg$FAILED) {
       s3 = peg$parse__();
@@ -1546,7 +1722,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e23); }
+      if (peg$silentFails === 0) { peg$fail(peg$e46); }
     }
 
     return s0;
@@ -1555,6 +1731,7 @@ function peg$parse(input, options) {
   function peg$parsepath() {
     var s0, s1, s2, s3;
 
+    peg$silentFails++;
     s0 = peg$currPos;
     s1 = peg$parsepathKey();
     if (input.charCodeAt(peg$currPos) === 47) {
@@ -1562,7 +1739,7 @@ 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$e34); }
     }
     if (s2 !== peg$FAILED) {
       s3 = peg$parsepath();
@@ -1584,6 +1761,11 @@ function peg$parse(input, options) {
       s1 = peg$f20(s1);
       s0 = s1;
     }
+    peg$silentFails--;
+    if (s0 === peg$FAILED) {
+      s1 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$e47); }
+    }
 
     return s0;
   }
@@ -1591,6 +1773,7 @@ function peg$parse(input, options) {
   function peg$parsepathKey() {
     var s0, s1, s2;
 
+    peg$silentFails++;
     s0 = peg$currPos;
     s1 = [];
     s2 = peg$parseidentifierChar();
@@ -1601,6 +1784,9 @@ function peg$parse(input, options) {
     peg$savedPos = s0;
     s1 = peg$f21(s1);
     s0 = s1;
+    peg$silentFails--;
+    s1 = peg$FAILED;
+    if (peg$silentFails === 0) { peg$fail(peg$e48); }
 
     return s0;
   }
@@ -1608,6 +1794,7 @@ function peg$parse(input, options) {
   function peg$parseprotocolCall() {
     var s0, s1, s2, s3, s4, s5;
 
+    peg$silentFails++;
     s0 = peg$currPos;
     s1 = peg$parseprotocol();
     if (s1 !== peg$FAILED) {
@@ -1616,7 +1803,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s2 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e14); }
+        if (peg$silentFails === 0) { peg$fail(peg$e29); }
       }
       if (s2 !== peg$FAILED) {
         s3 = [];
@@ -1625,7 +1812,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$e34); }
         }
         while (s4 !== peg$FAILED) {
           s3.push(s4);
@@ -1637,7 +1824,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$e34); }
             }
           }
         }
@@ -1661,17 +1848,28 @@ function peg$parse(input, options) {
       peg$currPos = s0;
       s0 = peg$FAILED;
     }
+    peg$silentFails--;
+    if (s0 === peg$FAILED) {
+      s1 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$e49); }
+    }
 
     return s0;
   }
 
   function peg$parseprotocol() {
-    var s0;
+    var s0, s1;
 
+    peg$silentFails++;
     s0 = peg$parsereservedProtocol();
     if (s0 === peg$FAILED) {
       s0 = peg$parsescopeReference();
     }
+    peg$silentFails--;
+    if (s0 === peg$FAILED) {
+      s1 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$e50); }
+    }
 
     return s0;
   }
@@ -1679,13 +1877,14 @@ function peg$parse(input, options) {
   function peg$parsereservedProtocol() {
     var s0, s1;
 
+    peg$silentFails++;
     s0 = peg$currPos;
     if (input.substr(peg$currPos, 5) === peg$c17) {
       s1 = peg$c17;
       peg$currPos += 5;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e24); }
+      if (peg$silentFails === 0) { peg$fail(peg$e52); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
@@ -1699,7 +1898,7 @@ function peg$parse(input, options) {
         peg$currPos += 4;
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e25); }
+        if (peg$silentFails === 0) { peg$fail(peg$e53); }
       }
       if (s1 !== peg$FAILED) {
         peg$savedPos = s0;
@@ -1708,12 +1907,12 @@ function peg$parse(input, options) {
       s0 = s1;
       if (s0 === peg$FAILED) {
         s0 = peg$currPos;
-        if (input.substr(peg$currPos, 9) === peg$c19) {
+        if (input.substr(peg$currPos, 7) === peg$c19) {
           s1 = peg$c19;
-          peg$currPos += 9;
+          peg$currPos += 7;
         } else {
           s1 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e26); }
+          if (peg$silentFails === 0) { peg$fail(peg$e54); }
         }
         if (s1 !== peg$FAILED) {
           peg$savedPos = s0;
@@ -1722,12 +1921,12 @@ function peg$parse(input, options) {
         s0 = s1;
         if (s0 === peg$FAILED) {
           s0 = peg$currPos;
-          if (input.substr(peg$currPos, 8) === peg$c20) {
+          if (input.substr(peg$currPos, 9) === peg$c20) {
             s1 = peg$c20;
-            peg$currPos += 8;
+            peg$currPos += 9;
           } else {
             s1 = peg$FAILED;
-            if (peg$silentFails === 0) { peg$fail(peg$e27); }
+            if (peg$silentFails === 0) { peg$fail(peg$e55); }
           }
           if (s1 !== peg$FAILED) {
             peg$savedPos = s0;
@@ -1736,22 +1935,42 @@ function peg$parse(input, options) {
           s0 = s1;
           if (s0 === peg$FAILED) {
             s0 = peg$currPos;
-            if (input.substr(peg$currPos, 4) === peg$c21) {
+            if (input.substr(peg$currPos, 8) === peg$c21) {
               s1 = peg$c21;
-              peg$currPos += 4;
+              peg$currPos += 8;
             } else {
               s1 = peg$FAILED;
-              if (peg$silentFails === 0) { peg$fail(peg$e28); }
+              if (peg$silentFails === 0) { peg$fail(peg$e56); }
             }
             if (s1 !== peg$FAILED) {
               peg$savedPos = s0;
               s1 = peg$f27();
             }
             s0 = s1;
+            if (s0 === peg$FAILED) {
+              s0 = peg$currPos;
+              if (input.substr(peg$currPos, 4) === peg$c22) {
+                s1 = peg$c22;
+                peg$currPos += 4;
+              } else {
+                s1 = peg$FAILED;
+                if (peg$silentFails === 0) { peg$fail(peg$e57); }
+              }
+              if (s1 !== peg$FAILED) {
+                peg$savedPos = s0;
+                s1 = peg$f28();
+              }
+              s0 = s1;
+            }
           }
         }
       }
     }
+    peg$silentFails--;
+    if (s0 === peg$FAILED) {
+      s1 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$e51); }
+    }
 
     return s0;
   }
@@ -1759,13 +1978,19 @@ function peg$parse(input, options) {
   function peg$parsescopeReference() {
     var s0, s1;
 
+    peg$silentFails++;
     s0 = peg$currPos;
     s1 = peg$parseidentifier();
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f28(s1);
+      s1 = peg$f29(s1);
     }
     s0 = s1;
+    peg$silentFails--;
+    if (s0 === peg$FAILED) {
+      s1 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$e58); }
+    }
 
     return s0;
   }
@@ -1773,13 +1998,14 @@ function peg$parse(input, options) {
   function peg$parsesingleQuoteString() {
     var s0, s1, s2, s3;
 
+    peg$silentFails++;
     s0 = peg$currPos;
     if (input.charCodeAt(peg$currPos) === 39) {
-      s1 = peg$c22;
+      s1 = peg$c23;
       peg$currPos++;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e29); }
+      if (peg$silentFails === 0) { peg$fail(peg$e60); }
     }
     if (s1 !== peg$FAILED) {
       s2 = [];
@@ -1789,15 +2015,15 @@ function peg$parse(input, options) {
         s3 = peg$parsesingleQuoteStringChar();
       }
       if (input.charCodeAt(peg$currPos) === 39) {
-        s3 = peg$c22;
+        s3 = peg$c23;
         peg$currPos++;
       } else {
         s3 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e29); }
+        if (peg$silentFails === 0) { peg$fail(peg$e60); }
       }
       if (s3 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f29(s2);
+        s0 = peg$f30(s2);
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -1806,6 +2032,11 @@ function peg$parse(input, options) {
       peg$currPos = s0;
       s0 = peg$FAILED;
     }
+    peg$silentFails--;
+    if (s0 === peg$FAILED) {
+      s1 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$e59); }
+    }
 
     return s0;
   }
@@ -1817,11 +2048,11 @@ function peg$parse(input, options) {
     s1 = peg$currPos;
     peg$silentFails++;
     if (input.charCodeAt(peg$currPos) === 39) {
-      s2 = peg$c22;
+      s2 = peg$c23;
       peg$currPos++;
     } else {
       s2 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e29); }
+      if (peg$silentFails === 0) { peg$fail(peg$e60); }
     }
     if (s2 === peg$FAILED) {
       s2 = peg$parsenewLine();
@@ -1858,12 +2089,18 @@ function peg$parse(input, options) {
   }
 
   function peg$parsestring() {
-    var s0;
+    var s0, s1;
 
+    peg$silentFails++;
     s0 = peg$parsedoubleQuoteString();
     if (s0 === peg$FAILED) {
       s0 = peg$parsesingleQuoteString();
     }
+    peg$silentFails--;
+    if (s0 === peg$FAILED) {
+      s1 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$e61); }
+    }
 
     return s0;
   }
@@ -1875,11 +2112,11 @@ function peg$parse(input, options) {
     s0 = peg$currPos;
     s1 = peg$parsetemplateDocumentContents();
     peg$savedPos = s0;
-    s1 = peg$f30(s1);
+    s1 = peg$f31(s1);
     s0 = s1;
     peg$silentFails--;
     s1 = peg$FAILED;
-    if (peg$silentFails === 0) { peg$fail(peg$e30); }
+    if (peg$silentFails === 0) { peg$fail(peg$e62); }
 
     return s0;
   }
@@ -1890,12 +2127,12 @@ function peg$parse(input, options) {
     s0 = peg$currPos;
     s1 = peg$currPos;
     peg$silentFails++;
-    if (input.substr(peg$currPos, 2) === peg$c23) {
-      s2 = peg$c23;
+    if (input.substr(peg$currPos, 2) === peg$c24) {
+      s2 = peg$c24;
       peg$currPos += 2;
     } else {
       s2 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e31); }
+      if (peg$silentFails === 0) { peg$fail(peg$e63); }
     }
     peg$silentFails--;
     if (s2 === peg$FAILED) {
@@ -1937,7 +2174,7 @@ function peg$parse(input, options) {
       }
     }
     peg$savedPos = s0;
-    s1 = peg$f31(s1);
+    s1 = peg$f32(s1);
     s0 = s1;
 
     return s0;
@@ -1946,6 +2183,7 @@ function peg$parse(input, options) {
   function peg$parsetemplateDocumentText() {
     var s0, s1, s2;
 
+    peg$silentFails++;
     s0 = peg$currPos;
     s1 = [];
     s2 = peg$parsetemplateDocumentChar();
@@ -1959,9 +2197,14 @@ function peg$parse(input, options) {
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f32(s1);
+      s1 = peg$f33(s1);
     }
     s0 = s1;
+    peg$silentFails--;
+    if (s0 === peg$FAILED) {
+      s1 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$e64); }
+    }
 
     return s0;
   }
@@ -1969,22 +2212,23 @@ function peg$parse(input, options) {
   function peg$parsetemplateLiteral() {
     var s0, s1, s2, s3;
 
+    peg$silentFails++;
     s0 = peg$currPos;
     if (input.charCodeAt(peg$currPos) === 96) {
-      s1 = peg$c24;
+      s1 = peg$c25;
       peg$currPos++;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e32); }
+      if (peg$silentFails === 0) { peg$fail(peg$e66); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$parsetemplateLiteralContents();
       if (input.charCodeAt(peg$currPos) === 96) {
-        s3 = peg$c24;
+        s3 = peg$c25;
         peg$currPos++;
       } else {
         s3 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e32); }
+        if (peg$silentFails === 0) { peg$fail(peg$e66); }
       }
       if (s3 !== peg$FAILED) {
         s0 = s2;
@@ -1996,6 +2240,11 @@ function peg$parse(input, options) {
       peg$currPos = s0;
       s0 = peg$FAILED;
     }
+    peg$silentFails--;
+    if (s0 === peg$FAILED) {
+      s1 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$e65); }
+    }
 
     return s0;
   }
@@ -2007,19 +2256,19 @@ function peg$parse(input, options) {
     s1 = peg$currPos;
     peg$silentFails++;
     if (input.charCodeAt(peg$currPos) === 96) {
-      s2 = peg$c24;
+      s2 = peg$c25;
       peg$currPos++;
     } else {
       s2 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e32); }
+      if (peg$silentFails === 0) { peg$fail(peg$e66); }
     }
     if (s2 === peg$FAILED) {
-      if (input.substr(peg$currPos, 2) === peg$c23) {
-        s2 = peg$c23;
+      if (input.substr(peg$currPos, 2) === peg$c24) {
+        s2 = peg$c24;
         peg$currPos += 2;
       } else {
         s2 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e31); }
+        if (peg$silentFails === 0) { peg$fail(peg$e63); }
       }
     }
     peg$silentFails--;
@@ -2062,7 +2311,7 @@ function peg$parse(input, options) {
       }
     }
     peg$savedPos = s0;
-    s1 = peg$f33(s1);
+    s1 = peg$f34(s1);
     s0 = s1;
 
     return s0;
@@ -2084,7 +2333,7 @@ function peg$parse(input, options) {
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f34(s1);
+      s1 = peg$f35(s1);
     }
     s0 = s1;
 
@@ -2094,23 +2343,24 @@ function peg$parse(input, options) {
   function peg$parsetemplateSubstitution() {
     var s0, s1, s2, s3;
 
+    peg$silentFails++;
     s0 = peg$currPos;
-    if (input.substr(peg$currPos, 2) === peg$c23) {
-      s1 = peg$c23;
+    if (input.substr(peg$currPos, 2) === peg$c24) {
+      s1 = peg$c24;
       peg$currPos += 2;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e31); }
+      if (peg$silentFails === 0) { peg$fail(peg$e63); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$parseexpression();
       if (s2 !== peg$FAILED) {
-        if (input.substr(peg$currPos, 2) === peg$c25) {
-          s3 = peg$c25;
+        if (input.substr(peg$currPos, 2) === peg$c26) {
+          s3 = peg$c26;
           peg$currPos += 2;
         } else {
           s3 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e33); }
+          if (peg$silentFails === 0) { peg$fail(peg$e68); }
         }
         if (s3 !== peg$FAILED) {
           s0 = s2;
@@ -2126,6 +2376,11 @@ function peg$parse(input, options) {
       peg$currPos = s0;
       s0 = peg$FAILED;
     }
+    peg$silentFails--;
+    if (s0 === peg$FAILED) {
+      s1 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$e67); }
+    }
 
     return s0;
   }
@@ -2140,7 +2395,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s0 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e8); }
+        if (peg$silentFails === 0) { peg$fail(peg$e16); }
       }
     }
 
@@ -2150,13 +2405,14 @@ function peg$parse(input, options) {
   function peg$parsetree() {
     var s0, s1, s2, s3, s4;
 
+    peg$silentFails++;
     s0 = peg$currPos;
     if (input.charCodeAt(peg$currPos) === 123) {
       s1 = peg$c14;
       peg$currPos++;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e20); }
+      if (peg$silentFails === 0) { peg$fail(peg$e41); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$parse__();
@@ -2169,11 +2425,11 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s4 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e21); }
+        if (peg$silentFails === 0) { peg$fail(peg$e42); }
       }
       if (s4 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f35(s3);
+        s0 = peg$f36(s3);
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -2182,6 +2438,11 @@ function peg$parse(input, options) {
       peg$currPos = s0;
       s0 = peg$FAILED;
     }
+    peg$silentFails--;
+    if (s0 === peg$FAILED) {
+      s1 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$e69); }
+    }
 
     return s0;
   }
@@ -2230,7 +2491,7 @@ function peg$parse(input, options) {
       }
       s4 = peg$parse__();
       peg$savedPos = s0;
-      s0 = peg$f36(s1, s2);
+      s0 = peg$f37(s1, s2);
     } else {
       peg$currPos = s0;
       s0 = peg$FAILED;