@weborigami/language 0.0.64 → 0.0.65-beta.1

package/src/compiler/parse.js

@@ -12,16 +12,14 @@
 //
 
 import * as ops from "../runtime/ops.js";
-import { makeArray, makeFunctionCall, makeObject, makePipeline, makeTemplate } from "./parserHelpers.js";
-
-// If a parse result is an object that will be evaluated at runtime, attach the
-// location of the source code that produced it for debugging and error messages.
-function annotate(parseResult, location) {
-  if (typeof parseResult === "object" && parseResult !== null) {
-    parseResult.location = location;
-  }
-  return parseResult;
-}
+import {
+  annotate,
+  makeArray,
+  makeFunctionCall,
+  makeObject,
+  makePipeline,
+  makeTemplate
+} from "./parserHelpers.js";
 
 
 function peg$subclass(child, parent) {
@@ -206,36 +204,43 @@ function peg$parse(input, options) {
   var peg$c7 = "\"";
   var peg$c8 = "...";
   var peg$c9 = "\u2026";
-  var peg$c10 = "\\";
-  var peg$c11 = ".";
-  var peg$c12 = "(";
-  var peg$c13 = "\xAB";
-  var peg$c14 = "\xBB";
-  var peg$c15 = ":";
-  var peg$c16 = "-";
-  var peg$c17 = ">";
-  var peg$c18 = "=";
-  var peg$c19 = "/";
-  var peg$c20 = "/*";
-  var peg$c21 = "*/";
-  var peg$c22 = "\n";
-  var peg$c23 = "\r\n";
-  var peg$c24 = "\r";
-  var peg$c25 = "{";
-  var peg$c26 = "https";
-  var peg$c27 = "http";
-  var peg$c28 = "new";
-  var peg$c29 = "package";
-  var peg$c30 = "treehttps";
-  var peg$c31 = "treehttp";
-  var peg$c32 = "tree";
-  var peg$c33 = ",";
-  var peg$c34 = "#!";
-  var peg$c35 = "\u2192";
-  var peg$c36 = "->";
-  var peg$c37 = "'";
-  var peg$c38 = "${";
-  var peg$c39 = "`";
+  var peg$c10 = "\\0";
+  var peg$c11 = "\\b";
+  var peg$c12 = "\\f";
+  var peg$c13 = "\\n";
+  var peg$c14 = "\\r";
+  var peg$c15 = "\\t";
+  var peg$c16 = "\\v";
+  var peg$c17 = "\\";
+  var peg$c18 = ".";
+  var peg$c19 = "(";
+  var peg$c20 = "\xAB";
+  var peg$c21 = "\xBB";
+  var peg$c22 = ":";
+  var peg$c23 = "-";
+  var peg$c24 = ">";
+  var peg$c25 = "=";
+  var peg$c26 = "/";
+  var peg$c27 = "/*";
+  var peg$c28 = "*/";
+  var peg$c29 = "\n";
+  var peg$c30 = "\r\n";
+  var peg$c31 = "\r";
+  var peg$c32 = "{";
+  var peg$c33 = "https";
+  var peg$c34 = "http";
+  var peg$c35 = "new";
+  var peg$c36 = "package";
+  var peg$c37 = "treehttps";
+  var peg$c38 = "treehttp";
+  var peg$c39 = "tree";
+  var peg$c40 = ",";
+  var peg$c41 = "#!";
+  var peg$c42 = "\u2192";
+  var peg$c43 = "->";
+  var peg$c44 = "'";
+  var peg$c45 = "${";
+  var peg$c46 = "`";
 
   var peg$r0 = /^[0-9]/;
   var peg$r1 = /^[^(){}[\]<>\-=,\/:`"'\xAB\xBB\\ \u2192\u21D2\t\n\r]/;
@@ -263,72 +268,79 @@ function peg$parse(input, options) {
   var peg$e16 = peg$literalExpectation("...", false);
   var peg$e17 = peg$literalExpectation("\u2026", false);
   var peg$e18 = peg$otherExpectation("backslash-escaped character");
-  var peg$e19 = peg$literalExpectation("\\", false);
-  var peg$e20 = peg$otherExpectation("Origami expression");
-  var peg$e21 = peg$otherExpectation("floating-point number");
-  var peg$e22 = peg$literalExpectation(".", false);
-  var peg$e23 = peg$otherExpectation("function composition");
-  var peg$e24 = peg$otherExpectation("parenthetical group");
-  var peg$e25 = peg$literalExpectation("(", false);
-  var peg$e26 = peg$otherExpectation("guillemet string");
-  var peg$e27 = peg$literalExpectation("\xAB", false);
-  var peg$e28 = peg$literalExpectation("\xBB", false);
-  var peg$e29 = peg$otherExpectation("HTTP/HTTPS host");
-  var peg$e30 = peg$literalExpectation(":", false);
-  var peg$e31 = peg$otherExpectation("identifier");
-  var peg$e32 = peg$classExpectation(["(", ")", "{", "}", "[", "]", "<", ">", "-", "=", ",", "/", ":", "`", "\"", "'", "\xAB", "\xBB", "\\", " ", "\u2192", "\u21D2", "\t", "\n", "\r"], true, false);
-  var peg$e33 = peg$literalExpectation("-", false);
-  var peg$e34 = peg$literalExpectation(">", false);
-  var peg$e35 = peg$otherExpectation("arguments with implicit parentheses");
-  var peg$e36 = peg$classExpectation([" ", "\t"], false, false);
-  var peg$e37 = peg$otherExpectation("integer");
-  var peg$e38 = peg$otherExpectation("lambda function");
-  var peg$e39 = peg$literalExpectation("=", false);
-  var peg$e40 = peg$otherExpectation("path with a leading slash");
-  var peg$e41 = peg$literalExpectation("/", false);
-  var peg$e42 = peg$otherExpectation("list");
-  var peg$e43 = peg$literalExpectation("/*", false);
-  var peg$e44 = peg$literalExpectation("*/", false);
-  var peg$e45 = peg$literalExpectation("\n", false);
-  var peg$e46 = peg$literalExpectation("\r\n", false);
-  var peg$e47 = peg$literalExpectation("\r", false);
-  var peg$e48 = peg$otherExpectation("number");
-  var peg$e49 = peg$otherExpectation("object literal");
-  var peg$e50 = peg$literalExpectation("{", false);
-  var peg$e51 = peg$otherExpectation("object getter");
-  var peg$e52 = peg$otherExpectation("object identifier");
-  var peg$e53 = peg$otherExpectation("object key");
-  var peg$e54 = peg$otherExpectation("object property");
-  var peg$e55 = peg$otherExpectation("function arguments in parentheses");
-  var peg$e56 = peg$otherExpectation("slash-separated path");
-  var peg$e57 = peg$otherExpectation("path element");
-  var peg$e58 = peg$classExpectation(["(", ")", "{", "}", "[", "]", ",", ":", "/", "\\", " ", "\t", "\n", "\r"], true, false);
-  var peg$e59 = peg$otherExpectation("function call using protocol: syntax");
-  var peg$e60 = peg$otherExpectation("protocol");
-  var peg$e61 = peg$otherExpectation("reserved protocol");
-  var peg$e62 = peg$literalExpectation("https", false);
-  var peg$e63 = peg$literalExpectation("http", false);
-  var peg$e64 = peg$literalExpectation("new", false);
-  var peg$e65 = peg$literalExpectation("package", false);
-  var peg$e66 = peg$literalExpectation("treehttps", false);
-  var peg$e67 = peg$literalExpectation("treehttp", false);
-  var peg$e68 = peg$literalExpectation("tree", false);
-  var peg$e69 = peg$otherExpectation("scope reference");
-  var peg$e70 = peg$literalExpectation(",", false);
-  var peg$e71 = peg$literalExpectation("#!", false);
-  var peg$e72 = peg$classExpectation(["\n", "\r"], true, false);
-  var peg$e73 = peg$classExpectation(["+", "-"], false, false);
-  var peg$e74 = peg$literalExpectation("\u2192", false);
-  var peg$e75 = peg$literalExpectation("->", false);
-  var peg$e76 = peg$otherExpectation("single quote string");
-  var peg$e77 = peg$literalExpectation("'", false);
-  var peg$e78 = peg$otherExpectation("string");
-  var peg$e79 = peg$otherExpectation("template");
-  var peg$e80 = peg$literalExpectation("${", false);
-  var peg$e81 = peg$otherExpectation("template text");
-  var peg$e82 = peg$otherExpectation("template literal");
-  var peg$e83 = peg$literalExpectation("`", false);
-  var peg$e84 = peg$otherExpectation("template substitution");
+  var peg$e19 = peg$literalExpectation("\\0", false);
+  var peg$e20 = peg$literalExpectation("\\b", false);
+  var peg$e21 = peg$literalExpectation("\\f", false);
+  var peg$e22 = peg$literalExpectation("\\n", false);
+  var peg$e23 = peg$literalExpectation("\\r", false);
+  var peg$e24 = peg$literalExpectation("\\t", false);
+  var peg$e25 = peg$literalExpectation("\\v", false);
+  var peg$e26 = peg$literalExpectation("\\", false);
+  var peg$e27 = peg$otherExpectation("Origami expression");
+  var peg$e28 = peg$otherExpectation("floating-point number");
+  var peg$e29 = peg$literalExpectation(".", false);
+  var peg$e30 = peg$otherExpectation("function composition");
+  var peg$e31 = peg$otherExpectation("parenthetical group");
+  var peg$e32 = peg$literalExpectation("(", false);
+  var peg$e33 = peg$otherExpectation("guillemet string");
+  var peg$e34 = peg$literalExpectation("\xAB", false);
+  var peg$e35 = peg$literalExpectation("\xBB", false);
+  var peg$e36 = peg$otherExpectation("HTTP/HTTPS host");
+  var peg$e37 = peg$literalExpectation(":", false);
+  var peg$e38 = peg$otherExpectation("identifier");
+  var peg$e39 = peg$classExpectation(["(", ")", "{", "}", "[", "]", "<", ">", "-", "=", ",", "/", ":", "`", "\"", "'", "\xAB", "\xBB", "\\", " ", "\u2192", "\u21D2", "\t", "\n", "\r"], true, false);
+  var peg$e40 = peg$literalExpectation("-", false);
+  var peg$e41 = peg$literalExpectation(">", false);
+  var peg$e42 = peg$otherExpectation("arguments with implicit parentheses");
+  var peg$e43 = peg$classExpectation([" ", "\t"], false, false);
+  var peg$e44 = peg$otherExpectation("integer");
+  var peg$e45 = peg$otherExpectation("lambda function");
+  var peg$e46 = peg$literalExpectation("=", false);
+  var peg$e47 = peg$otherExpectation("path with a leading slash");
+  var peg$e48 = peg$literalExpectation("/", false);
+  var peg$e49 = peg$otherExpectation("list");
+  var peg$e50 = peg$literalExpectation("/*", false);
+  var peg$e51 = peg$literalExpectation("*/", false);
+  var peg$e52 = peg$literalExpectation("\n", false);
+  var peg$e53 = peg$literalExpectation("\r\n", false);
+  var peg$e54 = peg$literalExpectation("\r", false);
+  var peg$e55 = peg$otherExpectation("number");
+  var peg$e56 = peg$otherExpectation("object literal");
+  var peg$e57 = peg$literalExpectation("{", false);
+  var peg$e58 = peg$otherExpectation("object getter");
+  var peg$e59 = peg$otherExpectation("object identifier");
+  var peg$e60 = peg$otherExpectation("object key");
+  var peg$e61 = peg$otherExpectation("object property");
+  var peg$e62 = peg$otherExpectation("function arguments in parentheses");
+  var peg$e63 = peg$otherExpectation("slash-separated path");
+  var peg$e64 = peg$otherExpectation("path element");
+  var peg$e65 = peg$classExpectation(["(", ")", "{", "}", "[", "]", ",", ":", "/", "\\", " ", "\t", "\n", "\r"], true, false);
+  var peg$e66 = peg$otherExpectation("function call using protocol: syntax");
+  var peg$e67 = peg$otherExpectation("protocol");
+  var peg$e68 = peg$otherExpectation("reserved protocol");
+  var peg$e69 = peg$literalExpectation("https", false);
+  var peg$e70 = peg$literalExpectation("http", false);
+  var peg$e71 = peg$literalExpectation("new", false);
+  var peg$e72 = peg$literalExpectation("package", false);
+  var peg$e73 = peg$literalExpectation("treehttps", false);
+  var peg$e74 = peg$literalExpectation("treehttp", false);
+  var peg$e75 = peg$literalExpectation("tree", false);
+  var peg$e76 = peg$otherExpectation("scope reference");
+  var peg$e77 = peg$literalExpectation(",", false);
+  var peg$e78 = peg$literalExpectation("#!", false);
+  var peg$e79 = peg$classExpectation(["\n", "\r"], true, false);
+  var peg$e80 = peg$classExpectation(["+", "-"], false, false);
+  var peg$e81 = peg$literalExpectation("\u2192", false);
+  var peg$e82 = peg$literalExpectation("->", false);
+  var peg$e83 = peg$otherExpectation("single quote string");
+  var peg$e84 = peg$literalExpectation("'", false);
+  var peg$e85 = peg$otherExpectation("string");
+  var peg$e86 = peg$otherExpectation("template");
+  var peg$e87 = peg$literalExpectation("${", false);
+  var peg$e88 = peg$otherExpectation("template text");
+  var peg$e89 = peg$otherExpectation("template literal");
+  var peg$e90 = peg$literalExpectation("`", false);
+  var peg$e91 = peg$otherExpectation("template substitution");
 
   var peg$f0 = function() { return ""; };
   var peg$f1 = function(path) {
@@ -340,84 +352,129 @@ function peg$parse(input, options) {
   var peg$f3 = function(entries) {
       return annotate(makeArray(entries ?? []), location());
     };
-  var peg$f4 = function() {
-    error("Expected right curly brace");
-  };
+  var peg$f4 = function(entries) {
+      return annotate(entries, location());
+    };
   var peg$f5 = function() {
-    error("Expected right bracket");
-  };
+      error("Expected right curly brace");
+    };
   var peg$f6 = function() {
-    error("Expected right parenthesis");
-  };
-  var peg$f7 = function(chars) { return chars.join(""); };
-  var peg$f8 = function() {
+      error("Expected right bracket");
+    };
+  var peg$f7 = function() {
+      error("Expected right parenthesis");
+    };
+  var peg$f8 = function(chars) { return chars.join(""); };
+  var peg$f9 = function() { return "\0"; };
+  var peg$f10 = function() { return "\b"; };
+  var peg$f11 = function() { return "\f"; };
+  var peg$f12 = function() { return "\n"; };
+  var peg$f13 = function() { return "\r"; };
+  var peg$f14 = function() { return "\t"; };
+  var peg$f15 = function() { return "\v"; };
+  var peg$f16 = function() {
       return parseFloat(text());
     };
-  var peg$f9 = function(target, chain, end) {
-    if (end) {
-      chain.push(end);
-    }
-    return annotate(makeFunctionCall(target, chain), location());
-  };
-  var peg$f10 = function(chars) { return chars.join(""); };
-  var peg$f11 = function() { return text(); };
-  var peg$f12 = function(chars) { return chars.join(""); };
-  var peg$f13 = function() {
+  var peg$f17 = function(target, chain, end) {
+      if (end) {
+        chain.push(end);
+      }
+      return annotate(makeFunctionCall(target, chain), location());
+    };
+  var peg$f18 = function(expr) {
+      return annotate(expr, location());
+    };
+  var peg$f19 = function(chars) { return chars.join(""); };
+  var peg$f20 = function() { return text(); };
+  var peg$f21 = function(chars) { return chars.join(""); };
+  var peg$f22 = function(list) {
+      return annotate(list, location());
+    };
+  var peg$f23 = function(args) {
+      /* Stuff */
+      return annotate(args, location());
+    };
+  var peg$f24 = function() {
       return parseInt(text());
     };
-  var peg$f14 = function(expr) {
+  var peg$f25 = function(expr) {
       return annotate([ops.lambda, null, expr], location());
     };
-  var peg$f15 = function() { return annotate([""], location()); };
-  var peg$f16 = function() { return null; };
-  var peg$f17 = function(entries) {
+  var peg$f26 = function(path) {
+      return annotate(path, location());
+    };
+  var peg$f27 = function() {
+      return annotate([""], location());
+    };
+  var peg$f28 = function(list) {
+      return annotate(list, location());
+    };
+  var peg$f29 = function() { return null; };
+  var peg$f30 = function(entries) {
       return annotate(makeObject(entries ?? [], ops.object), location());
     };
-  var peg$f18 = function(key, value) {
-    return annotate([key, [ops.getter, value]], location());
-  };
-  var peg$f19 = function(key) {
+  var peg$f31 = function(entries) {
+      return annotate(entries, location());
+    };
+  var peg$f32 = function(key, value) {
+      return annotate([key, [ops.getter, value]], location());
+    };
+  var peg$f33 = function(key) {
       return annotate([key, [ops.inherited, key]], location());
     };
-  var peg$f20 = function(hiddenKey) { return hiddenKey.join(""); };
-  var peg$f21 = function(parameters, expr) {
-    return annotate([ops.lambda, parameters ?? [], expr], location());
-  };
-  var peg$f22 = function(list) {
-      return list ?? annotate([undefined], location());
+  var peg$f34 = function(hiddenKey) { return hiddenKey.join(""); };
+  var peg$f35 = function(key, value) {
+      return annotate([key, value], location());  
+    };
+  var peg$f36 = function(parameters, expr) {
+      return annotate([ops.lambda, parameters ?? [], expr], location());
+    };
+  var peg$f37 = function(list) {
+      return annotate(list ?? [undefined], location());
     };
-  var peg$f23 = function(steps) {
+  var peg$f38 = function(steps) {
       return annotate(makePipeline(steps), location());
     };
-  var peg$f24 = function(chars) { return chars.join(""); };
-  var peg$f25 = function(protocol, host, path) {
+  var peg$f39 = function(path) {
+      return annotate(path, location());
+    };
+  var peg$f40 = function(chars) { return chars.join(""); };
+  var peg$f41 = function(protocol, host, path) {
       return annotate([protocol, host, ...(path ?? [])], location());
     };
-  var peg$f26 = function() { return ops.https; };
-  var peg$f27 = function() { return ops.http; };
-  var peg$f28 = function() { return ops.constructor; };
-  var peg$f29 = function() { return [ops.scope, "@package"] };
-  var peg$f30 = function() { return ops.treeHttps; };
-  var peg$f31 = function() { return ops.treeHttp; };
-  var peg$f32 = function() { return ops.treeHttps; };
-  var peg$f33 = function(key) {
+  var peg$f42 = function() { return ops.https; };
+  var peg$f43 = function() { return ops.http; };
+  var peg$f44 = function() { return ops.constructor; };
+  var peg$f45 = function() { return [ops.scope, "@package"] };
+  var peg$f46 = function() { return ops.treeHttps; };
+  var peg$f47 = function() { return ops.treeHttp; };
+  var peg$f48 = function() { return ops.treeHttps; };
+  var peg$f49 = function(key) {
       return annotate([ops.scope, key], location());
     };
-  var peg$f34 = function() { return null; };
-  var peg$f35 = function() { return null; };
-  var peg$f36 = function(chars) { return chars.join(""); };
-  var peg$f37 = function(expr) { return [ops.spread, expr]; };
-  var peg$f38 = function(contents) {
+  var peg$f50 = function() { return null; };
+  var peg$f51 = function() { return null; };
+  var peg$f52 = function(chars) { return chars.join(""); };
+  var peg$f53 = function(expr) {
+      return annotate([ops.spread, expr], location());
+    };
+  var peg$f54 = function(contents) {
       return annotate([ops.lambda, null, contents], location());
     };
-  var peg$f39 = function(parts) {
+  var peg$f55 = function(parts) {
       return annotate(makeTemplate(parts), location());
     };
-  var peg$f40 = function(chars) { return chars.join(""); };
-  var peg$f41 = function(parts) {
+  var peg$f56 = function(chars) { return chars.join(""); };
+  var peg$f57 = function(contents) {
+      return annotate(contents, location());
+    };
+  var peg$f58 = function(parts) {
       return annotate(makeTemplate(parts), location());
     };
-  var peg$f42 = function(chars) { return chars.join(""); };
+  var peg$f59 = function(chars) { return chars.join(""); };
+  var peg$f60 = function(expr) {
+      return annotate(expr, location());
+    };
   var peg$currPos = options.peg$currPos | 0;
   var peg$savedPos = peg$currPos;
   var peg$posDetailsCache = [{ line: 1, column: 1 }];
@@ -749,7 +806,8 @@ function peg$parse(input, options) {
       if (s2 === peg$FAILED) {
         s2 = null;
       }
-      s0 = s1;
+      peg$savedPos = s0;
+      s0 = peg$f4(s1);
     } else {
       peg$currPos = s0;
       s0 = peg$FAILED;
@@ -827,7 +885,7 @@ function peg$parse(input, options) {
         s1 = null;
       }
       peg$savedPos = s0;
-      s1 = peg$f4();
+      s1 = peg$f5();
       s0 = s1;
     }
 
@@ -857,7 +915,7 @@ function peg$parse(input, options) {
         s1 = null;
       }
       peg$savedPos = s0;
-      s1 = peg$f5();
+      s1 = peg$f6();
       s0 = s1;
     }
 
@@ -887,7 +945,7 @@ function peg$parse(input, options) {
         s1 = null;
       }
       peg$savedPos = s0;
-      s1 = peg$f6();
+      s1 = peg$f7();
       s0 = s1;
     }
 
@@ -998,7 +1056,7 @@ function peg$parse(input, options) {
       }
       if (s3 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f7(s2);
+        s0 = peg$f8(s2);
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -1083,30 +1141,135 @@ function peg$parse(input, options) {
 
     peg$silentFails++;
     s0 = peg$currPos;
-    if (input.charCodeAt(peg$currPos) === 92) {
+    if (input.substr(peg$currPos, 2) === peg$c10) {
       s1 = peg$c10;
-      peg$currPos++;
+      peg$currPos += 2;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e19); }
     }
     if (s1 !== peg$FAILED) {
-      if (input.length > peg$currPos) {
-        s2 = input.charAt(peg$currPos);
-        peg$currPos++;
+      peg$savedPos = s0;
+      s1 = peg$f9();
+    }
+    s0 = s1;
+    if (s0 === peg$FAILED) {
+      s0 = peg$currPos;
+      if (input.substr(peg$currPos, 2) === peg$c11) {
+        s1 = peg$c11;
+        peg$currPos += 2;
       } else {
-        s2 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e7); }
+        s1 = peg$FAILED;
+        if (peg$silentFails === 0) { peg$fail(peg$e20); }
       }
-      if (s2 !== peg$FAILED) {
-        s0 = s2;
-      } else {
-        peg$currPos = s0;
-        s0 = peg$FAILED;
+      if (s1 !== peg$FAILED) {
+        peg$savedPos = s0;
+        s1 = peg$f10();
+      }
+      s0 = s1;
+      if (s0 === peg$FAILED) {
+        s0 = peg$currPos;
+        if (input.substr(peg$currPos, 2) === peg$c12) {
+          s1 = peg$c12;
+          peg$currPos += 2;
+        } else {
+          s1 = peg$FAILED;
+          if (peg$silentFails === 0) { peg$fail(peg$e21); }
+        }
+        if (s1 !== peg$FAILED) {
+          peg$savedPos = s0;
+          s1 = peg$f11();
+        }
+        s0 = s1;
+        if (s0 === peg$FAILED) {
+          s0 = peg$currPos;
+          if (input.substr(peg$currPos, 2) === peg$c13) {
+            s1 = peg$c13;
+            peg$currPos += 2;
+          } else {
+            s1 = peg$FAILED;
+            if (peg$silentFails === 0) { peg$fail(peg$e22); }
+          }
+          if (s1 !== peg$FAILED) {
+            peg$savedPos = s0;
+            s1 = peg$f12();
+          }
+          s0 = s1;
+          if (s0 === peg$FAILED) {
+            s0 = peg$currPos;
+            if (input.substr(peg$currPos, 2) === peg$c14) {
+              s1 = peg$c14;
+              peg$currPos += 2;
+            } else {
+              s1 = peg$FAILED;
+              if (peg$silentFails === 0) { peg$fail(peg$e23); }
+            }
+            if (s1 !== peg$FAILED) {
+              peg$savedPos = s0;
+              s1 = peg$f13();
+            }
+            s0 = s1;
+            if (s0 === peg$FAILED) {
+              s0 = peg$currPos;
+              if (input.substr(peg$currPos, 2) === peg$c15) {
+                s1 = peg$c15;
+                peg$currPos += 2;
+              } else {
+                s1 = peg$FAILED;
+                if (peg$silentFails === 0) { peg$fail(peg$e24); }
+              }
+              if (s1 !== peg$FAILED) {
+                peg$savedPos = s0;
+                s1 = peg$f14();
+              }
+              s0 = s1;
+              if (s0 === peg$FAILED) {
+                s0 = peg$currPos;
+                if (input.substr(peg$currPos, 2) === peg$c16) {
+                  s1 = peg$c16;
+                  peg$currPos += 2;
+                } else {
+                  s1 = peg$FAILED;
+                  if (peg$silentFails === 0) { peg$fail(peg$e25); }
+                }
+                if (s1 !== peg$FAILED) {
+                  peg$savedPos = s0;
+                  s1 = peg$f15();
+                }
+                s0 = s1;
+                if (s0 === peg$FAILED) {
+                  s0 = peg$currPos;
+                  if (input.charCodeAt(peg$currPos) === 92) {
+                    s1 = peg$c17;
+                    peg$currPos++;
+                  } else {
+                    s1 = peg$FAILED;
+                    if (peg$silentFails === 0) { peg$fail(peg$e26); }
+                  }
+                  if (s1 !== peg$FAILED) {
+                    if (input.length > peg$currPos) {
+                      s2 = input.charAt(peg$currPos);
+                      peg$currPos++;
+                    } else {
+                      s2 = peg$FAILED;
+                      if (peg$silentFails === 0) { peg$fail(peg$e7); }
+                    }
+                    if (s2 !== peg$FAILED) {
+                      s0 = s2;
+                    } else {
+                      peg$currPos = s0;
+                      s0 = peg$FAILED;
+                    }
+                  } else {
+                    peg$currPos = s0;
+                    s0 = peg$FAILED;
+                  }
+                }
+              }
+            }
+          }
+        }
       }
-    } else {
-      peg$currPos = s0;
-      s0 = peg$FAILED;
     }
     peg$silentFails--;
     if (s0 === peg$FAILED) {
@@ -1146,7 +1309,7 @@ function peg$parse(input, options) {
     peg$silentFails--;
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e20); }
+      if (peg$silentFails === 0) { peg$fail(peg$e27); }
     }
 
     return s0;
@@ -1166,17 +1329,17 @@ function peg$parse(input, options) {
       s2 = null;
     }
     if (input.charCodeAt(peg$currPos) === 46) {
-      s3 = peg$c11;
+      s3 = peg$c18;
       peg$currPos++;
     } else {
       s3 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e22); }
+      if (peg$silentFails === 0) { peg$fail(peg$e29); }
     }
     if (s3 !== peg$FAILED) {
       s4 = peg$parsedigits();
       if (s4 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f8();
+        s0 = peg$f16();
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -1188,7 +1351,7 @@ function peg$parse(input, options) {
     peg$silentFails--;
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e21); }
+      if (peg$silentFails === 0) { peg$fail(peg$e28); }
     }
 
     return s0;
@@ -1212,7 +1375,7 @@ function peg$parse(input, options) {
         s3 = null;
       }
       peg$savedPos = s0;
-      s0 = peg$f9(s1, s2, s3);
+      s0 = peg$f17(s1, s2, s3);
     } else {
       peg$currPos = s0;
       s0 = peg$FAILED;
@@ -1220,7 +1383,7 @@ function peg$parse(input, options) {
     peg$silentFails--;
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e23); }
+      if (peg$silentFails === 0) { peg$fail(peg$e30); }
     }
 
     return s0;
@@ -1232,11 +1395,11 @@ function peg$parse(input, options) {
     peg$silentFails++;
     s0 = peg$currPos;
     if (input.charCodeAt(peg$currPos) === 40) {
-      s1 = peg$c12;
+      s1 = peg$c19;
       peg$currPos++;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e25); }
+      if (peg$silentFails === 0) { peg$fail(peg$e32); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$parse__();
@@ -1245,7 +1408,8 @@ function peg$parse(input, options) {
         s4 = peg$parse__();
         s5 = peg$parseclosingParen();
         if (s5 !== peg$FAILED) {
-          s0 = s3;
+          peg$savedPos = s0;
+          s0 = peg$f18(s3);
         } else {
           peg$currPos = s0;
           s0 = peg$FAILED;
@@ -1261,7 +1425,7 @@ function peg$parse(input, options) {
     peg$silentFails--;
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e24); }
+      if (peg$silentFails === 0) { peg$fail(peg$e31); }
     }
 
     return s0;
@@ -1273,11 +1437,11 @@ function peg$parse(input, options) {
     peg$silentFails++;
     s0 = peg$currPos;
     if (input.charCodeAt(peg$currPos) === 171) {
-      s1 = peg$c13;
+      s1 = peg$c20;
       peg$currPos++;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e27); }
+      if (peg$silentFails === 0) { peg$fail(peg$e34); }
     }
     if (s1 !== peg$FAILED) {
       s2 = [];
@@ -1287,15 +1451,15 @@ function peg$parse(input, options) {
         s3 = peg$parseguillemetStringChar();
       }
       if (input.charCodeAt(peg$currPos) === 187) {
-        s3 = peg$c14;
+        s3 = peg$c21;
         peg$currPos++;
       } else {
         s3 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e28); }
+        if (peg$silentFails === 0) { peg$fail(peg$e35); }
       }
       if (s3 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f10(s2);
+        s0 = peg$f19(s2);
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -1307,7 +1471,7 @@ function peg$parse(input, options) {
     peg$silentFails--;
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e26); }
+      if (peg$silentFails === 0) { peg$fail(peg$e33); }
     }
 
     return s0;
@@ -1320,11 +1484,11 @@ function peg$parse(input, options) {
     s1 = peg$currPos;
     peg$silentFails++;
     if (input.charCodeAt(peg$currPos) === 187) {
-      s2 = peg$c14;
+      s2 = peg$c21;
       peg$currPos++;
     } else {
       s2 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e28); }
+      if (peg$silentFails === 0) { peg$fail(peg$e35); }
     }
     if (s2 === peg$FAILED) {
       s2 = peg$parsenewLine();
@@ -1361,11 +1525,11 @@ function peg$parse(input, options) {
     if (s1 !== peg$FAILED) {
       s2 = peg$currPos;
       if (input.charCodeAt(peg$currPos) === 58) {
-        s3 = peg$c15;
+        s3 = peg$c22;
         peg$currPos++;
       } else {
         s3 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e30); }
+        if (peg$silentFails === 0) { peg$fail(peg$e37); }
       }
       if (s3 !== peg$FAILED) {
         s4 = peg$parsenumber();
@@ -1384,7 +1548,7 @@ function peg$parse(input, options) {
         s2 = null;
       }
       peg$savedPos = s0;
-      s0 = peg$f11();
+      s0 = peg$f20();
     } else {
       peg$currPos = s0;
       s0 = peg$FAILED;
@@ -1392,7 +1556,7 @@ function peg$parse(input, options) {
     peg$silentFails--;
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e29); }
+      if (peg$silentFails === 0) { peg$fail(peg$e36); }
     }
 
     return s0;
@@ -1415,13 +1579,13 @@ function peg$parse(input, options) {
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f12(s1);
+      s1 = peg$f21(s1);
     }
     s0 = s1;
     peg$silentFails--;
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e31); }
+      if (peg$silentFails === 0) { peg$fail(peg$e38); }
     }
 
     return s0;
@@ -1435,26 +1599,26 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e32); }
+      if (peg$silentFails === 0) { peg$fail(peg$e39); }
     }
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
       if (input.charCodeAt(peg$currPos) === 45) {
-        s1 = peg$c16;
+        s1 = peg$c23;
         peg$currPos++;
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e33); }
+        if (peg$silentFails === 0) { peg$fail(peg$e40); }
       }
       if (s1 !== peg$FAILED) {
         s2 = peg$currPos;
         peg$silentFails++;
         if (input.charCodeAt(peg$currPos) === 62) {
-          s3 = peg$c17;
+          s3 = peg$c24;
           peg$currPos++;
         } else {
           s3 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e34); }
+          if (peg$silentFails === 0) { peg$fail(peg$e41); }
         }
         peg$silentFails--;
         if (s3 === peg$FAILED) {
@@ -1515,7 +1679,8 @@ function peg$parse(input, options) {
       if (s2 === peg$FAILED) {
         s2 = null;
       }
-      s0 = s1;
+      peg$savedPos = s0;
+      s0 = peg$f22(s1);
     } else {
       peg$currPos = s0;
       s0 = peg$FAILED;
@@ -1581,7 +1746,8 @@ function peg$parse(input, options) {
         if (s3 === peg$FAILED) {
           s3 = null;
         }
-        s0 = s2;
+        peg$savedPos = s0;
+        s0 = peg$f23(s2);
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -1593,7 +1759,7 @@ function peg$parse(input, options) {
     peg$silentFails--;
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e35); }
+      if (peg$silentFails === 0) { peg$fail(peg$e42); }
     }
 
     return s0;
@@ -1607,7 +1773,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e36); }
+      if (peg$silentFails === 0) { peg$fail(peg$e43); }
     }
 
     return s0;
@@ -1625,7 +1791,7 @@ function peg$parse(input, options) {
     s2 = peg$parsedigits();
     if (s2 !== peg$FAILED) {
       peg$savedPos = s0;
-      s0 = peg$f13();
+      s0 = peg$f24();
     } else {
       peg$currPos = s0;
       s0 = peg$FAILED;
@@ -1633,7 +1799,7 @@ function peg$parse(input, options) {
     peg$silentFails--;
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e37); }
+      if (peg$silentFails === 0) { peg$fail(peg$e44); }
     }
 
     return s0;
@@ -1645,18 +1811,18 @@ function peg$parse(input, options) {
     peg$silentFails++;
     s0 = peg$currPos;
     if (input.charCodeAt(peg$currPos) === 61) {
-      s1 = peg$c18;
+      s1 = peg$c25;
       peg$currPos++;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e39); }
+      if (peg$silentFails === 0) { peg$fail(peg$e46); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$parse__();
       s3 = peg$parsepipeline();
       if (s3 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f14(s3);
+        s0 = peg$f25(s3);
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -1668,7 +1834,7 @@ function peg$parse(input, options) {
     peg$silentFails--;
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e38); }
+      if (peg$silentFails === 0) { peg$fail(peg$e45); }
     }
 
     return s0;
@@ -1680,15 +1846,16 @@ function peg$parse(input, options) {
     peg$silentFails++;
     s0 = peg$currPos;
     if (input.charCodeAt(peg$currPos) === 47) {
-      s1 = peg$c19;
+      s1 = peg$c26;
       peg$currPos++;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e41); }
+      if (peg$silentFails === 0) { peg$fail(peg$e48); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$parsepath();
-      s0 = s2;
+      peg$savedPos = s0;
+      s0 = peg$f26(s2);
     } else {
       peg$currPos = s0;
       s0 = peg$FAILED;
@@ -1696,22 +1863,22 @@ function peg$parse(input, options) {
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
       if (input.charCodeAt(peg$currPos) === 47) {
-        s1 = peg$c19;
+        s1 = peg$c26;
         peg$currPos++;
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e41); }
+        if (peg$silentFails === 0) { peg$fail(peg$e48); }
       }
       if (s1 !== peg$FAILED) {
         peg$savedPos = s0;
-        s1 = peg$f15();
+        s1 = peg$f27();
       }
       s0 = s1;
     }
     peg$silentFails--;
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e40); }
+      if (peg$silentFails === 0) { peg$fail(peg$e47); }
     }
 
     return s0;
@@ -1752,7 +1919,8 @@ function peg$parse(input, options) {
       if (s2 === peg$FAILED) {
         s2 = null;
       }
-      s0 = s1;
+      peg$savedPos = s0;
+      s0 = peg$f28(s1);
     } else {
       peg$currPos = s0;
       s0 = peg$FAILED;
@@ -1760,7 +1928,7 @@ function peg$parse(input, options) {
     peg$silentFails--;
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e42); }
+      if (peg$silentFails === 0) { peg$fail(peg$e49); }
     }
 
     return s0;
@@ -1770,24 +1938,24 @@ function peg$parse(input, options) {
     var s0, s1, s2, s3, s4, s5;
 
     s0 = peg$currPos;
-    if (input.substr(peg$currPos, 2) === peg$c20) {
-      s1 = peg$c20;
+    if (input.substr(peg$currPos, 2) === peg$c27) {
+      s1 = peg$c27;
       peg$currPos += 2;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e43); }
+      if (peg$silentFails === 0) { peg$fail(peg$e50); }
     }
     if (s1 !== peg$FAILED) {
       s2 = [];
       s3 = peg$currPos;
       s4 = peg$currPos;
       peg$silentFails++;
-      if (input.substr(peg$currPos, 2) === peg$c21) {
-        s5 = peg$c21;
+      if (input.substr(peg$currPos, 2) === peg$c28) {
+        s5 = peg$c28;
         peg$currPos += 2;
       } else {
         s5 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e44); }
+        if (peg$silentFails === 0) { peg$fail(peg$e51); }
       }
       peg$silentFails--;
       if (s5 === peg$FAILED) {
@@ -1820,12 +1988,12 @@ function peg$parse(input, options) {
         s3 = peg$currPos;
         s4 = peg$currPos;
         peg$silentFails++;
-        if (input.substr(peg$currPos, 2) === peg$c21) {
-          s5 = peg$c21;
+        if (input.substr(peg$currPos, 2) === peg$c28) {
+          s5 = peg$c28;
           peg$currPos += 2;
         } else {
           s5 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e44); }
+          if (peg$silentFails === 0) { peg$fail(peg$e51); }
         }
         peg$silentFails--;
         if (s5 === peg$FAILED) {
@@ -1854,16 +2022,16 @@ function peg$parse(input, options) {
           s3 = peg$FAILED;
         }
       }
-      if (input.substr(peg$currPos, 2) === peg$c21) {
-        s3 = peg$c21;
+      if (input.substr(peg$currPos, 2) === peg$c28) {
+        s3 = peg$c28;
         peg$currPos += 2;
       } else {
         s3 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e44); }
+        if (peg$silentFails === 0) { peg$fail(peg$e51); }
       }
       if (s3 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f16();
+        s0 = peg$f29();
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -1880,27 +2048,27 @@ function peg$parse(input, options) {
     var s0;
 
     if (input.charCodeAt(peg$currPos) === 10) {
-      s0 = peg$c22;
+      s0 = peg$c29;
       peg$currPos++;
     } else {
       s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e45); }
+      if (peg$silentFails === 0) { peg$fail(peg$e52); }
     }
     if (s0 === peg$FAILED) {
-      if (input.substr(peg$currPos, 2) === peg$c23) {
-        s0 = peg$c23;
+      if (input.substr(peg$currPos, 2) === peg$c30) {
+        s0 = peg$c30;
         peg$currPos += 2;
       } else {
         s0 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e46); }
+        if (peg$silentFails === 0) { peg$fail(peg$e53); }
       }
       if (s0 === peg$FAILED) {
         if (input.charCodeAt(peg$currPos) === 13) {
-          s0 = peg$c24;
+          s0 = peg$c31;
           peg$currPos++;
         } else {
           s0 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e47); }
+          if (peg$silentFails === 0) { peg$fail(peg$e54); }
         }
       }
     }
@@ -1919,7 +2087,7 @@ function peg$parse(input, options) {
     peg$silentFails--;
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e48); }
+      if (peg$silentFails === 0) { peg$fail(peg$e55); }
     }
 
     return s0;
@@ -1931,11 +2099,11 @@ function peg$parse(input, options) {
     peg$silentFails++;
     s0 = peg$currPos;
     if (input.charCodeAt(peg$currPos) === 123) {
-      s1 = peg$c25;
+      s1 = peg$c32;
       peg$currPos++;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e50); }
+      if (peg$silentFails === 0) { peg$fail(peg$e57); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$parse__();
@@ -1947,7 +2115,7 @@ function peg$parse(input, options) {
       s5 = peg$parseclosingBrace();
       if (s5 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f17(s3);
+        s0 = peg$f30(s3);
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -1959,7 +2127,7 @@ function peg$parse(input, options) {
     peg$silentFails--;
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e49); }
+      if (peg$silentFails === 0) { peg$fail(peg$e56); }
     }
 
     return s0;
@@ -1999,7 +2167,8 @@ function peg$parse(input, options) {
       if (s2 === peg$FAILED) {
         s2 = null;
       }
-      s0 = s1;
+      peg$savedPos = s0;
+      s0 = peg$f31(s1);
     } else {
       peg$currPos = s0;
       s0 = peg$FAILED;
@@ -2034,18 +2203,18 @@ function peg$parse(input, options) {
     if (s1 !== peg$FAILED) {
       s2 = peg$parse__();
       if (input.charCodeAt(peg$currPos) === 61) {
-        s3 = peg$c18;
+        s3 = peg$c25;
         peg$currPos++;
       } else {
         s3 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e39); }
+        if (peg$silentFails === 0) { peg$fail(peg$e46); }
       }
       if (s3 !== peg$FAILED) {
         s4 = peg$parse__();
         s5 = peg$parsepipeline();
         if (s5 !== peg$FAILED) {
           peg$savedPos = s0;
-          s0 = peg$f18(s1, s5);
+          s0 = peg$f32(s1, s5);
         } else {
           peg$currPos = s0;
           s0 = peg$FAILED;
@@ -2061,7 +2230,7 @@ function peg$parse(input, options) {
     peg$silentFails--;
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e51); }
+      if (peg$silentFails === 0) { peg$fail(peg$e58); }
     }
 
     return s0;
@@ -2075,13 +2244,13 @@ function peg$parse(input, options) {
     s1 = peg$parseidentifierOrString();
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f19(s1);
+      s1 = peg$f33(s1);
     }
     s0 = s1;
     peg$silentFails--;
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e52); }
+      if (peg$silentFails === 0) { peg$fail(peg$e59); }
     }
 
     return s0;
@@ -2094,11 +2263,11 @@ function peg$parse(input, options) {
     s0 = peg$currPos;
     s1 = peg$currPos;
     if (input.charCodeAt(peg$currPos) === 40) {
-      s2 = peg$c12;
+      s2 = peg$c19;
       peg$currPos++;
     } else {
       s2 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e25); }
+      if (peg$silentFails === 0) { peg$fail(peg$e32); }
     }
     if (s2 !== peg$FAILED) {
       s3 = peg$parseidentifierOrString();
@@ -2127,7 +2296,7 @@ function peg$parse(input, options) {
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f20(s1);
+      s1 = peg$f34(s1);
     }
     s0 = s1;
     if (s0 === peg$FAILED) {
@@ -2136,7 +2305,7 @@ function peg$parse(input, options) {
     peg$silentFails--;
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e53); }
+      if (peg$silentFails === 0) { peg$fail(peg$e60); }
     }
 
     return s0;
@@ -2151,17 +2320,18 @@ function peg$parse(input, options) {
     if (s1 !== peg$FAILED) {
       s2 = peg$parse__();
       if (input.charCodeAt(peg$currPos) === 58) {
-        s3 = peg$c15;
+        s3 = peg$c22;
         peg$currPos++;
       } else {
         s3 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e30); }
+        if (peg$silentFails === 0) { peg$fail(peg$e37); }
       }
       if (s3 !== peg$FAILED) {
         s4 = peg$parse__();
         s5 = peg$parsepipeline();
         if (s5 !== peg$FAILED) {
-          s0 = [ s1, s5 ];
+          peg$savedPos = s0;
+          s0 = peg$f35(s1, s5);
         } else {
           peg$currPos = s0;
           s0 = peg$FAILED;
@@ -2177,7 +2347,7 @@ function peg$parse(input, options) {
     peg$silentFails--;
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e54); }
+      if (peg$silentFails === 0) { peg$fail(peg$e61); }
     }
 
     return s0;
@@ -2188,11 +2358,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     if (input.charCodeAt(peg$currPos) === 40) {
-      s1 = peg$c12;
+      s1 = peg$c19;
       peg$currPos++;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e25); }
+      if (peg$silentFails === 0) { peg$fail(peg$e32); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$parse__();
@@ -2216,7 +2386,7 @@ function peg$parse(input, options) {
           s9 = peg$parsepipeline();
           if (s9 !== peg$FAILED) {
             peg$savedPos = s0;
-            s0 = peg$f21(s3, s9);
+            s0 = peg$f36(s3, s9);
           } else {
             peg$currPos = s0;
             s0 = peg$FAILED;
@@ -2243,11 +2413,11 @@ function peg$parse(input, options) {
     peg$silentFails++;
     s0 = peg$currPos;
     if (input.charCodeAt(peg$currPos) === 40) {
-      s1 = peg$c12;
+      s1 = peg$c19;
       peg$currPos++;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e25); }
+      if (peg$silentFails === 0) { peg$fail(peg$e32); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$parse__();
@@ -2265,7 +2435,7 @@ function peg$parse(input, options) {
       }
       if (s5 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f22(s3);
+        s0 = peg$f37(s3);
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -2277,7 +2447,7 @@ function peg$parse(input, options) {
     peg$silentFails--;
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e55); }
+      if (peg$silentFails === 0) { peg$fail(peg$e62); }
     }
 
     return s0;
@@ -2331,7 +2501,7 @@ function peg$parse(input, options) {
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f23(s1);
+      s1 = peg$f38(s1);
     }
     s0 = s1;
 
@@ -2339,38 +2509,42 @@ function peg$parse(input, options) {
   }
 
   function peg$parsepath() {
-    var s0, s1, s2, s3;
+    var s0, s1, s2, s3, s4;
 
     peg$silentFails++;
     s0 = peg$currPos;
-    s1 = [];
-    s2 = peg$parsepathKey();
-    while (s2 !== peg$FAILED) {
-      s1.push(s2);
-      s2 = peg$currPos;
+    s1 = peg$currPos;
+    s2 = [];
+    s3 = peg$parsepathKey();
+    while (s3 !== peg$FAILED) {
+      s2.push(s3);
+      s3 = peg$currPos;
       if (input.charCodeAt(peg$currPos) === 47) {
-        s3 = peg$c19;
+        s4 = peg$c26;
         peg$currPos++;
       } else {
-        s3 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e41); }
+        s4 = peg$FAILED;
+        if (peg$silentFails === 0) { peg$fail(peg$e48); }
       }
-      if (s3 !== peg$FAILED) {
-        s3 = peg$parsepathKey();
-        s2 = s3;
+      if (s4 !== peg$FAILED) {
+        s4 = peg$parsepathKey();
+        s3 = s4;
       } else {
-        s2 = s3;
+        s3 = s4;
       }
     }
-    if (s1.length < 1) {
-      peg$currPos = s0;
-      s0 = peg$FAILED;
+    if (s2.length < 1) {
+      peg$currPos = s1;
+      s1 = peg$FAILED;
     } else {
-      s0 = s1;
+      s1 = s2;
     }
+    peg$savedPos = s0;
+    s1 = peg$f39(s1);
+    s0 = s1;
     peg$silentFails--;
     s1 = peg$FAILED;
-    if (peg$silentFails === 0) { peg$fail(peg$e56); }
+    if (peg$silentFails === 0) { peg$fail(peg$e63); }
 
     return s0;
   }
@@ -2387,11 +2561,11 @@ function peg$parse(input, options) {
       s2 = peg$parsepathKeyChar();
     }
     peg$savedPos = s0;
-    s1 = peg$f24(s1);
+    s1 = peg$f40(s1);
     s0 = s1;
     peg$silentFails--;
     s1 = peg$FAILED;
-    if (peg$silentFails === 0) { peg$fail(peg$e57); }
+    if (peg$silentFails === 0) { peg$fail(peg$e64); }
 
     return s0;
   }
@@ -2404,7 +2578,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e58); }
+      if (peg$silentFails === 0) { peg$fail(peg$e65); }
     }
     if (s0 === peg$FAILED) {
       s0 = peg$parseescapedChar();
@@ -2421,20 +2595,20 @@ function peg$parse(input, options) {
     s1 = peg$parseprotocol();
     if (s1 !== peg$FAILED) {
       if (input.charCodeAt(peg$currPos) === 58) {
-        s2 = peg$c15;
+        s2 = peg$c22;
         peg$currPos++;
       } else {
         s2 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e30); }
+        if (peg$silentFails === 0) { peg$fail(peg$e37); }
       }
       if (s2 !== peg$FAILED) {
         s3 = [];
         if (input.charCodeAt(peg$currPos) === 47) {
-          s4 = peg$c19;
+          s4 = peg$c26;
           peg$currPos++;
         } else {
           s4 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e41); }
+          if (peg$silentFails === 0) { peg$fail(peg$e48); }
         }
         while (s4 !== peg$FAILED) {
           s3.push(s4);
@@ -2442,11 +2616,11 @@ function peg$parse(input, options) {
             s4 = peg$FAILED;
           } else {
             if (input.charCodeAt(peg$currPos) === 47) {
-              s4 = peg$c19;
+              s4 = peg$c26;
               peg$currPos++;
             } else {
               s4 = peg$FAILED;
-              if (peg$silentFails === 0) { peg$fail(peg$e41); }
+              if (peg$silentFails === 0) { peg$fail(peg$e48); }
             }
           }
         }
@@ -2457,7 +2631,7 @@ function peg$parse(input, options) {
             s5 = null;
           }
           peg$savedPos = s0;
-          s0 = peg$f25(s1, s4, s5);
+          s0 = peg$f41(s1, s4, s5);
         } else {
           peg$currPos = s0;
           s0 = peg$FAILED;
@@ -2473,7 +2647,7 @@ function peg$parse(input, options) {
     peg$silentFails--;
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e59); }
+      if (peg$silentFails === 0) { peg$fail(peg$e66); }
     }
 
     return s0;
@@ -2490,7 +2664,7 @@ function peg$parse(input, options) {
     peg$silentFails--;
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e60); }
+      if (peg$silentFails === 0) { peg$fail(peg$e67); }
     }
 
     return s0;
@@ -2501,100 +2675,100 @@ function peg$parse(input, options) {
 
     peg$silentFails++;
     s0 = peg$currPos;
-    if (input.substr(peg$currPos, 5) === peg$c26) {
-      s1 = peg$c26;
+    if (input.substr(peg$currPos, 5) === peg$c33) {
+      s1 = peg$c33;
       peg$currPos += 5;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e62); }
+      if (peg$silentFails === 0) { peg$fail(peg$e69); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f26();
+      s1 = peg$f42();
     }
     s0 = s1;
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
-      if (input.substr(peg$currPos, 4) === peg$c27) {
-        s1 = peg$c27;
+      if (input.substr(peg$currPos, 4) === peg$c34) {
+        s1 = peg$c34;
         peg$currPos += 4;
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e63); }
+        if (peg$silentFails === 0) { peg$fail(peg$e70); }
       }
       if (s1 !== peg$FAILED) {
         peg$savedPos = s0;
-        s1 = peg$f27();
+        s1 = peg$f43();
       }
       s0 = s1;
       if (s0 === peg$FAILED) {
         s0 = peg$currPos;
-        if (input.substr(peg$currPos, 3) === peg$c28) {
-          s1 = peg$c28;
+        if (input.substr(peg$currPos, 3) === peg$c35) {
+          s1 = peg$c35;
           peg$currPos += 3;
         } else {
           s1 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e64); }
+          if (peg$silentFails === 0) { peg$fail(peg$e71); }
         }
         if (s1 !== peg$FAILED) {
           peg$savedPos = s0;
-          s1 = peg$f28();
+          s1 = peg$f44();
         }
         s0 = s1;
         if (s0 === peg$FAILED) {
           s0 = peg$currPos;
-          if (input.substr(peg$currPos, 7) === peg$c29) {
-            s1 = peg$c29;
+          if (input.substr(peg$currPos, 7) === peg$c36) {
+            s1 = peg$c36;
             peg$currPos += 7;
           } else {
             s1 = peg$FAILED;
-            if (peg$silentFails === 0) { peg$fail(peg$e65); }
+            if (peg$silentFails === 0) { peg$fail(peg$e72); }
           }
           if (s1 !== peg$FAILED) {
             peg$savedPos = s0;
-            s1 = peg$f29();
+            s1 = peg$f45();
           }
           s0 = s1;
           if (s0 === peg$FAILED) {
             s0 = peg$currPos;
-            if (input.substr(peg$currPos, 9) === peg$c30) {
-              s1 = peg$c30;
+            if (input.substr(peg$currPos, 9) === peg$c37) {
+              s1 = peg$c37;
               peg$currPos += 9;
             } else {
               s1 = peg$FAILED;
-              if (peg$silentFails === 0) { peg$fail(peg$e66); }
+              if (peg$silentFails === 0) { peg$fail(peg$e73); }
             }
             if (s1 !== peg$FAILED) {
               peg$savedPos = s0;
-              s1 = peg$f30();
+              s1 = peg$f46();
             }
             s0 = s1;
             if (s0 === peg$FAILED) {
               s0 = peg$currPos;
-              if (input.substr(peg$currPos, 8) === peg$c31) {
-                s1 = peg$c31;
+              if (input.substr(peg$currPos, 8) === peg$c38) {
+                s1 = peg$c38;
                 peg$currPos += 8;
               } else {
                 s1 = peg$FAILED;
-                if (peg$silentFails === 0) { peg$fail(peg$e67); }
+                if (peg$silentFails === 0) { peg$fail(peg$e74); }
               }
               if (s1 !== peg$FAILED) {
                 peg$savedPos = s0;
-                s1 = peg$f31();
+                s1 = peg$f47();
               }
               s0 = s1;
               if (s0 === peg$FAILED) {
                 s0 = peg$currPos;
-                if (input.substr(peg$currPos, 4) === peg$c32) {
-                  s1 = peg$c32;
+                if (input.substr(peg$currPos, 4) === peg$c39) {
+                  s1 = peg$c39;
                   peg$currPos += 4;
                 } else {
                   s1 = peg$FAILED;
-                  if (peg$silentFails === 0) { peg$fail(peg$e68); }
+                  if (peg$silentFails === 0) { peg$fail(peg$e75); }
                 }
                 if (s1 !== peg$FAILED) {
                   peg$savedPos = s0;
-                  s1 = peg$f32();
+                  s1 = peg$f48();
                 }
                 s0 = s1;
               }
@@ -2606,7 +2780,7 @@ function peg$parse(input, options) {
     peg$silentFails--;
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e61); }
+      if (peg$silentFails === 0) { peg$fail(peg$e68); }
     }
 
     return s0;
@@ -2620,13 +2794,13 @@ function peg$parse(input, options) {
     s1 = peg$parseidentifier();
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f33(s1);
+      s1 = peg$f49(s1);
     }
     s0 = s1;
     peg$silentFails--;
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e69); }
+      if (peg$silentFails === 0) { peg$fail(peg$e76); }
     }
 
     return s0;
@@ -2638,11 +2812,11 @@ function peg$parse(input, options) {
     s0 = peg$currPos;
     s1 = peg$parse__();
     if (input.charCodeAt(peg$currPos) === 44) {
-      s2 = peg$c33;
+      s2 = peg$c40;
       peg$currPos++;
     } else {
       s2 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e70); }
+      if (peg$silentFails === 0) { peg$fail(peg$e77); }
     }
     if (s2 !== peg$FAILED) {
       s3 = peg$parse__();
@@ -2663,12 +2837,12 @@ function peg$parse(input, options) {
     var s0, s1, s2, s3;
 
     s0 = peg$currPos;
-    if (input.substr(peg$currPos, 2) === peg$c34) {
-      s1 = peg$c34;
+    if (input.substr(peg$currPos, 2) === peg$c41) {
+      s1 = peg$c41;
       peg$currPos += 2;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e71); }
+      if (peg$silentFails === 0) { peg$fail(peg$e78); }
     }
     if (s1 !== peg$FAILED) {
       s2 = [];
@@ -2677,7 +2851,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s3 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e72); }
+        if (peg$silentFails === 0) { peg$fail(peg$e79); }
       }
       while (s3 !== peg$FAILED) {
         s2.push(s3);
@@ -2686,11 +2860,11 @@ function peg$parse(input, options) {
           peg$currPos++;
         } else {
           s3 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e72); }
+          if (peg$silentFails === 0) { peg$fail(peg$e79); }
         }
       }
       peg$savedPos = s0;
-      s0 = peg$f34();
+      s0 = peg$f50();
     } else {
       peg$currPos = s0;
       s0 = peg$FAILED;
@@ -2707,7 +2881,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e73); }
+      if (peg$silentFails === 0) { peg$fail(peg$e80); }
     }
 
     return s0;
@@ -2717,19 +2891,19 @@ function peg$parse(input, options) {
     var s0;
 
     if (input.charCodeAt(peg$currPos) === 8594) {
-      s0 = peg$c35;
+      s0 = peg$c42;
       peg$currPos++;
     } else {
       s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e74); }
+      if (peg$silentFails === 0) { peg$fail(peg$e81); }
     }
     if (s0 === peg$FAILED) {
-      if (input.substr(peg$currPos, 2) === peg$c36) {
-        s0 = peg$c36;
+      if (input.substr(peg$currPos, 2) === peg$c43) {
+        s0 = peg$c43;
         peg$currPos += 2;
       } else {
         s0 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e75); }
+        if (peg$silentFails === 0) { peg$fail(peg$e82); }
       }
     }
 
@@ -2754,7 +2928,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s3 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e72); }
+        if (peg$silentFails === 0) { peg$fail(peg$e79); }
       }
       while (s3 !== peg$FAILED) {
         s2.push(s3);
@@ -2763,11 +2937,11 @@ function peg$parse(input, options) {
           peg$currPos++;
         } else {
           s3 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e72); }
+          if (peg$silentFails === 0) { peg$fail(peg$e79); }
         }
       }
       peg$savedPos = s0;
-      s0 = peg$f35();
+      s0 = peg$f51();
     } else {
       peg$currPos = s0;
       s0 = peg$FAILED;
@@ -2782,11 +2956,11 @@ function peg$parse(input, options) {
     peg$silentFails++;
     s0 = peg$currPos;
     if (input.charCodeAt(peg$currPos) === 39) {
-      s1 = peg$c37;
+      s1 = peg$c44;
       peg$currPos++;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e77); }
+      if (peg$silentFails === 0) { peg$fail(peg$e84); }
     }
     if (s1 !== peg$FAILED) {
       s2 = [];
@@ -2796,15 +2970,15 @@ function peg$parse(input, options) {
         s3 = peg$parsesingleQuoteStringChar();
       }
       if (input.charCodeAt(peg$currPos) === 39) {
-        s3 = peg$c37;
+        s3 = peg$c44;
         peg$currPos++;
       } else {
         s3 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e77); }
+        if (peg$silentFails === 0) { peg$fail(peg$e84); }
       }
       if (s3 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f36(s2);
+        s0 = peg$f52(s2);
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -2816,7 +2990,7 @@ function peg$parse(input, options) {
     peg$silentFails--;
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e76); }
+      if (peg$silentFails === 0) { peg$fail(peg$e83); }
     }
 
     return s0;
@@ -2829,11 +3003,11 @@ function peg$parse(input, options) {
     s1 = peg$currPos;
     peg$silentFails++;
     if (input.charCodeAt(peg$currPos) === 39) {
-      s2 = peg$c37;
+      s2 = peg$c44;
       peg$currPos++;
     } else {
       s2 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e77); }
+      if (peg$silentFails === 0) { peg$fail(peg$e84); }
     }
     if (s2 === peg$FAILED) {
       s2 = peg$parsenewLine();
@@ -2870,7 +3044,7 @@ function peg$parse(input, options) {
       s2 = peg$parsepipeline();
       if (s2 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f37(s2);
+        s0 = peg$f53(s2);
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -2946,7 +3120,7 @@ function peg$parse(input, options) {
     peg$silentFails--;
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e78); }
+      if (peg$silentFails === 0) { peg$fail(peg$e85); }
     }
 
     return s0;
@@ -2959,11 +3133,11 @@ function peg$parse(input, options) {
     s0 = peg$currPos;
     s1 = peg$parsetemplateDocumentContents();
     peg$savedPos = s0;
-    s1 = peg$f38(s1);
+    s1 = peg$f54(s1);
     s0 = s1;
     peg$silentFails--;
     s1 = peg$FAILED;
-    if (peg$silentFails === 0) { peg$fail(peg$e79); }
+    if (peg$silentFails === 0) { peg$fail(peg$e86); }
 
     return s0;
   }
@@ -2974,12 +3148,12 @@ function peg$parse(input, options) {
     s0 = peg$currPos;
     s1 = peg$currPos;
     peg$silentFails++;
-    if (input.substr(peg$currPos, 2) === peg$c38) {
-      s2 = peg$c38;
+    if (input.substr(peg$currPos, 2) === peg$c45) {
+      s2 = peg$c45;
       peg$currPos += 2;
     } else {
       s2 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e80); }
+      if (peg$silentFails === 0) { peg$fail(peg$e87); }
     }
     peg$silentFails--;
     if (s2 === peg$FAILED) {
@@ -3021,7 +3195,7 @@ function peg$parse(input, options) {
       }
     }
     peg$savedPos = s0;
-    s1 = peg$f39(s1);
+    s1 = peg$f55(s1);
     s0 = s1;
 
     return s0;
@@ -3044,13 +3218,13 @@ function peg$parse(input, options) {
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f40(s1);
+      s1 = peg$f56(s1);
     }
     s0 = s1;
     peg$silentFails--;
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e81); }
+      if (peg$silentFails === 0) { peg$fail(peg$e88); }
     }
 
     return s0;
@@ -3062,23 +3236,24 @@ function peg$parse(input, options) {
     peg$silentFails++;
     s0 = peg$currPos;
     if (input.charCodeAt(peg$currPos) === 96) {
-      s1 = peg$c39;
+      s1 = peg$c46;
       peg$currPos++;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e83); }
+      if (peg$silentFails === 0) { peg$fail(peg$e90); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$parsetemplateLiteralContents();
       if (input.charCodeAt(peg$currPos) === 96) {
-        s3 = peg$c39;
+        s3 = peg$c46;
         peg$currPos++;
       } else {
         s3 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e83); }
+        if (peg$silentFails === 0) { peg$fail(peg$e90); }
       }
       if (s3 !== peg$FAILED) {
-        s0 = s2;
+        peg$savedPos = s0;
+        s0 = peg$f57(s2);
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -3090,7 +3265,7 @@ function peg$parse(input, options) {
     peg$silentFails--;
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e82); }
+      if (peg$silentFails === 0) { peg$fail(peg$e89); }
     }
 
     return s0;
@@ -3103,19 +3278,19 @@ function peg$parse(input, options) {
     s1 = peg$currPos;
     peg$silentFails++;
     if (input.charCodeAt(peg$currPos) === 96) {
-      s2 = peg$c39;
+      s2 = peg$c46;
       peg$currPos++;
     } else {
       s2 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e83); }
+      if (peg$silentFails === 0) { peg$fail(peg$e90); }
     }
     if (s2 === peg$FAILED) {
-      if (input.substr(peg$currPos, 2) === peg$c38) {
-        s2 = peg$c38;
+      if (input.substr(peg$currPos, 2) === peg$c45) {
+        s2 = peg$c45;
         peg$currPos += 2;
       } else {
         s2 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e80); }
+        if (peg$silentFails === 0) { peg$fail(peg$e87); }
       }
     }
     peg$silentFails--;
@@ -3158,7 +3333,7 @@ function peg$parse(input, options) {
       }
     }
     peg$savedPos = s0;
-    s1 = peg$f41(s1);
+    s1 = peg$f58(s1);
     s0 = s1;
 
     return s0;
@@ -3180,7 +3355,7 @@ function peg$parse(input, options) {
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f42(s1);
+      s1 = peg$f59(s1);
     }
     s0 = s1;
 
@@ -3192,12 +3367,12 @@ function peg$parse(input, options) {
 
     peg$silentFails++;
     s0 = peg$currPos;
-    if (input.substr(peg$currPos, 2) === peg$c38) {
-      s1 = peg$c38;
+    if (input.substr(peg$currPos, 2) === peg$c45) {
+      s1 = peg$c45;
       peg$currPos += 2;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e80); }
+      if (peg$silentFails === 0) { peg$fail(peg$e87); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$parse__();
@@ -3212,7 +3387,8 @@ function peg$parse(input, options) {
           if (peg$silentFails === 0) { peg$fail(peg$e6); }
         }
         if (s5 !== peg$FAILED) {
-          s0 = s3;
+          peg$savedPos = s0;
+          s0 = peg$f60(s3);
         } else {
           peg$currPos = s0;
           s0 = peg$FAILED;
@@ -3228,7 +3404,7 @@ function peg$parse(input, options) {
     peg$silentFails--;
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e84); }
+      if (peg$silentFails === 0) { peg$fail(peg$e91); }
     }
 
     return s0;