@weborigami/language 0.2.6 → 0.2.8

package/src/compiler/parse.js

@@ -202,7 +202,7 @@ function peg$parse(input, options) {
   var peg$FAILED = {};
   var peg$source = options.grammarSource;
 
-  var peg$startRuleFunctions = { __: peg$parse__, additiveExpression: peg$parseadditiveExpression, additiveOperator: peg$parseadditiveOperator, arguments: peg$parsearguments, arrayLiteral: peg$parsearrayLiteral, arrayEntries: peg$parsearrayEntries, arrayEntry: peg$parsearrayEntry, arrowFunction: peg$parsearrowFunction, bitwiseAndExpression: peg$parsebitwiseAndExpression, bitwiseAndOperator: peg$parsebitwiseAndOperator, bitwiseOrExpression: peg$parsebitwiseOrExpression, bitwiseOrOperator: peg$parsebitwiseOrOperator, bitwiseXorExpression: peg$parsebitwiseXorExpression, bitwiseXorOperator: peg$parsebitwiseXorOperator, callExpression: peg$parsecallExpression, closingBrace: peg$parseclosingBrace, closingBracket: peg$parseclosingBracket, closingParenthesis: peg$parseclosingParenthesis, commaExpression: peg$parsecommaExpression, comment: peg$parsecomment, conditionalExpression: peg$parseconditionalExpression, digits: peg$parsedigits, doubleArrow: peg$parsedoubleArrow, doubleQuoteString: peg$parsedoubleQuoteString, doubleQuoteStringChar: peg$parsedoubleQuoteStringChar, ellipsis: peg$parseellipsis, equalityExpression: peg$parseequalityExpression, equalityOperator: peg$parseequalityOperator, escapedChar: peg$parseescapedChar, exponentiationExpression: peg$parseexponentiationExpression, expression: peg$parseexpression, floatLiteral: peg$parsefloatLiteral, group: peg$parsegroup, guillemetString: peg$parseguillemetString, guillemetStringChar: peg$parseguillemetStringChar, homeDirectory: peg$parsehomeDirectory, host: peg$parsehost, identifier: peg$parseidentifier, identifierChar: peg$parseidentifierChar, identifierList: peg$parseidentifierList, implicitParenthesesCallExpression: peg$parseimplicitParenthesesCallExpression, implicitParensthesesArguments: peg$parseimplicitParensthesesArguments, inlineSpace: peg$parseinlineSpace, integerLiteral: peg$parseintegerLiteral, list: peg$parselist, literal: peg$parseliteral, logicalAndExpression: peg$parselogicalAndExpression, logicalOrExpression: peg$parselogicalOrExpression, multiLineComment: peg$parsemultiLineComment, multiplicativeExpression: peg$parsemultiplicativeExpression, multiplicativeOperator: peg$parsemultiplicativeOperator, namespace: peg$parsenamespace, newLine: peg$parsenewLine, numericLiteral: peg$parsenumericLiteral, nullishCoalescingExpression: peg$parsenullishCoalescingExpression, objectLiteral: peg$parseobjectLiteral, objectEntries: peg$parseobjectEntries, objectEntry: peg$parseobjectEntry, objectGetter: peg$parseobjectGetter, objectHiddenKey: peg$parseobjectHiddenKey, objectKey: peg$parseobjectKey, objectProperty: peg$parseobjectProperty, objectShorthandProperty: peg$parseobjectShorthandProperty, objectPublicKey: peg$parseobjectPublicKey, parenthesesArguments: peg$parseparenthesesArguments, path: peg$parsepath, pathArguments: peg$parsepathArguments, pathKey: peg$parsepathKey, pathSegment: peg$parsepathSegment, pathSegmentChar: peg$parsepathSegmentChar, pipelineExpression: peg$parsepipelineExpression, primary: peg$parseprimary, program: peg$parseprogram, protocolExpression: peg$parseprotocolExpression, qualifiedReference: peg$parsequalifiedReference, reference: peg$parsereference, relationalExpression: peg$parserelationalExpression, relationalOperator: peg$parserelationalOperator, rootDirectory: peg$parserootDirectory, scopeReference: peg$parsescopeReference, separator: peg$parseseparator, slashFollows: peg$parseslashFollows, shebang: peg$parseshebang, shiftExpression: peg$parseshiftExpression, shiftOperator: peg$parseshiftOperator, shorthandFunction: peg$parseshorthandFunction, singleArrow: peg$parsesingleArrow, singleLineComment: peg$parsesingleLineComment, singleQuoteString: peg$parsesingleQuoteString, singleQuoteStringChar: peg$parsesingleQuoteStringChar, spreadElement: peg$parsespreadElement, stringLiteral: peg$parsestringLiteral, templateDocument: peg$parsetemplateDocument, templateDocumentChar: peg$parsetemplateDocumentChar, templateDocumentText: peg$parsetemplateDocumentText, templateLiteral: peg$parsetemplateLiteral, templateLiteralChar: peg$parsetemplateLiteralChar, templateLiteralText: peg$parsetemplateLiteralText, templateSubstitution: peg$parsetemplateSubstitution, textChar: peg$parsetextChar, unaryExpression: peg$parseunaryExpression, unaryOperator: peg$parseunaryOperator, whitespace: peg$parsewhitespace, whitespaceWithNewLine: peg$parsewhitespaceWithNewLine };
+  var peg$startRuleFunctions = { __: peg$parse__, additiveExpression: peg$parseadditiveExpression, additiveOperator: peg$parseadditiveOperator, arguments: peg$parsearguments, arrayLiteral: peg$parsearrayLiteral, arrayEntries: peg$parsearrayEntries, arrayEntry: peg$parsearrayEntry, arrowFunction: peg$parsearrowFunction, bitwiseAndExpression: peg$parsebitwiseAndExpression, bitwiseAndOperator: peg$parsebitwiseAndOperator, bitwiseOrExpression: peg$parsebitwiseOrExpression, bitwiseOrOperator: peg$parsebitwiseOrOperator, bitwiseXorExpression: peg$parsebitwiseXorExpression, bitwiseXorOperator: peg$parsebitwiseXorOperator, callExpression: peg$parsecallExpression, closingBrace: peg$parseclosingBrace, closingBracket: peg$parseclosingBracket, closingParenthesis: peg$parseclosingParenthesis, commaExpression: peg$parsecommaExpression, comment: peg$parsecomment, conditionalExpression: peg$parseconditionalExpression, digits: peg$parsedigits, doubleArrow: peg$parsedoubleArrow, doubleQuoteString: peg$parsedoubleQuoteString, doubleQuoteStringChar: peg$parsedoubleQuoteStringChar, ellipsis: peg$parseellipsis, equalityExpression: peg$parseequalityExpression, equalityOperator: peg$parseequalityOperator, escapedChar: peg$parseescapedChar, exponentiationExpression: peg$parseexponentiationExpression, expression: peg$parseexpression, floatLiteral: peg$parsefloatLiteral, group: peg$parsegroup, guillemetString: peg$parseguillemetString, guillemetStringChar: peg$parseguillemetStringChar, homeDirectory: peg$parsehomeDirectory, host: peg$parsehost, identifier: peg$parseidentifier, identifierChar: peg$parseidentifierChar, identifierList: peg$parseidentifierList, implicitParenthesesCallExpression: peg$parseimplicitParenthesesCallExpression, implicitParensthesesArguments: peg$parseimplicitParensthesesArguments, inlineSpace: peg$parseinlineSpace, integerLiteral: peg$parseintegerLiteral, list: peg$parselist, literal: peg$parseliteral, logicalAndExpression: peg$parselogicalAndExpression, logicalOrExpression: peg$parselogicalOrExpression, multiLineComment: peg$parsemultiLineComment, multiplicativeExpression: peg$parsemultiplicativeExpression, multiplicativeOperator: peg$parsemultiplicativeOperator, namespace: peg$parsenamespace, newLine: peg$parsenewLine, numericLiteral: peg$parsenumericLiteral, nullishCoalescingExpression: peg$parsenullishCoalescingExpression, objectLiteral: peg$parseobjectLiteral, objectEntries: peg$parseobjectEntries, objectEntry: peg$parseobjectEntry, objectGetter: peg$parseobjectGetter, objectHiddenKey: peg$parseobjectHiddenKey, objectKey: peg$parseobjectKey, objectProperty: peg$parseobjectProperty, objectShorthandProperty: peg$parseobjectShorthandProperty, objectPublicKey: peg$parseobjectPublicKey, parenthesesArguments: peg$parseparenthesesArguments, path: peg$parsepath, pathArguments: peg$parsepathArguments, pathKey: peg$parsepathKey, pathSegment: peg$parsepathSegment, pathSegmentChar: peg$parsepathSegmentChar, pipelineExpression: peg$parsepipelineExpression, primary: peg$parseprimary, program: peg$parseprogram, protocolExpression: peg$parseprotocolExpression, qualifiedReference: peg$parsequalifiedReference, inherited: peg$parseinherited, relationalExpression: peg$parserelationalExpression, relationalOperator: peg$parserelationalOperator, rootDirectory: peg$parserootDirectory, scopeReference: peg$parsescopeReference, separator: peg$parseseparator, shebang: peg$parseshebang, shiftExpression: peg$parseshiftExpression, shiftOperator: peg$parseshiftOperator, shorthandFunction: peg$parseshorthandFunction, singleArrow: peg$parsesingleArrow, singleLineComment: peg$parsesingleLineComment, singleQuoteString: peg$parsesingleQuoteString, singleQuoteStringChar: peg$parsesingleQuoteStringChar, slash: peg$parseslash, slashFollows: peg$parseslashFollows, spreadElement: peg$parsespreadElement, stringLiteral: peg$parsestringLiteral, templateDocument: peg$parsetemplateDocument, templateDocumentChar: peg$parsetemplateDocumentChar, templateDocumentText: peg$parsetemplateDocumentText, templateLiteral: peg$parsetemplateLiteral, templateLiteralChar: peg$parsetemplateLiteralChar, templateLiteralText: peg$parsetemplateLiteralText, templateSubstitution: peg$parsetemplateSubstitution, textChar: peg$parsetextChar, unaryExpression: peg$parseunaryExpression, unaryOperator: peg$parseunaryOperator, whitespace: peg$parsewhitespace, whitespaceWithNewLine: peg$parsewhitespaceWithNewLine };
   var peg$startRuleFunction = peg$parse__;
 
   var peg$c0 = "[";
@@ -244,27 +244,26 @@ function peg$parse(input, options) {
   var peg$c36 = "||";
   var peg$c37 = "/*";
   var peg$c38 = "*/";
-  var peg$c39 = "@";
-  var peg$c40 = "\n";
-  var peg$c41 = "\r\n";
-  var peg$c42 = "\r";
-  var peg$c43 = "??";
-  var peg$c44 = "{";
-  var peg$c45 = "=";
-  var peg$c46 = "/";
-  var peg$c47 = "//";
-  var peg$c48 = "<=";
-  var peg$c49 = "<";
-  var peg$c50 = ">=";
-  var peg$c51 = "#!";
-  var peg$c52 = "<<";
-  var peg$c53 = ">>>";
-  var peg$c54 = ">>";
-  var peg$c55 = "\u2192";
-  var peg$c56 = "->";
-  var peg$c57 = "'";
-  var peg$c58 = "${";
-  var peg$c59 = "`";
+  var peg$c39 = "\n";
+  var peg$c40 = "\r\n";
+  var peg$c41 = "\r";
+  var peg$c42 = "??";
+  var peg$c43 = "{";
+  var peg$c44 = "=";
+  var peg$c45 = "/";
+  var peg$c46 = "//";
+  var peg$c47 = "<=";
+  var peg$c48 = "<";
+  var peg$c49 = ">=";
+  var peg$c50 = "#!";
+  var peg$c51 = "<<";
+  var peg$c52 = ">>>";
+  var peg$c53 = ">>";
+  var peg$c54 = "\u2192";
+  var peg$c55 = "->";
+  var peg$c56 = "'";
+  var peg$c57 = "${";
+  var peg$c58 = "`";
 
   var peg$r0 = /^[+\-]/;
   var peg$r1 = /^[0-9]/;
@@ -335,57 +334,56 @@ function peg$parse(input, options) {
   var peg$e56 = peg$literalExpectation("/*", false);
   var peg$e57 = peg$literalExpectation("*/", false);
   var peg$e58 = peg$classExpectation(["%", "*", "/"], false, false);
-  var peg$e59 = peg$literalExpectation("@", false);
-  var peg$e60 = peg$classExpectation([["A", "Z"], ["a", "z"]], false, false);
-  var peg$e61 = peg$literalExpectation("\n", false);
-  var peg$e62 = peg$literalExpectation("\r\n", false);
-  var peg$e63 = peg$literalExpectation("\r", false);
-  var peg$e64 = peg$otherExpectation("number");
-  var peg$e65 = peg$literalExpectation("??", false);
-  var peg$e66 = peg$otherExpectation("object literal");
-  var peg$e67 = peg$literalExpectation("{", false);
-  var peg$e68 = peg$otherExpectation("object getter");
-  var peg$e69 = peg$literalExpectation("=", false);
-  var peg$e70 = peg$otherExpectation("object key");
-  var peg$e71 = peg$otherExpectation("object property");
-  var peg$e72 = peg$otherExpectation("object identifier");
-  var peg$e73 = peg$literalExpectation("/", false);
-  var peg$e74 = peg$otherExpectation("function arguments in parentheses");
-  var peg$e75 = peg$otherExpectation("slash-separated path");
-  var peg$e76 = peg$classExpectation(["(", ")", "{", "}", "[", "]", ",", ":", "/", "\\", " ", "\t", "\n", "\r"], true, false);
-  var peg$e77 = peg$otherExpectation("Origami program");
-  var peg$e78 = peg$literalExpectation("//", false);
-  var peg$e79 = peg$literalExpectation("<=", false);
-  var peg$e80 = peg$literalExpectation("<", false);
-  var peg$e81 = peg$literalExpectation(">=", false);
-  var peg$e82 = peg$otherExpectation("scope reference");
-  var peg$e83 = peg$literalExpectation("#!", false);
-  var peg$e84 = peg$classExpectation(["\n", "\r"], true, false);
-  var peg$e85 = peg$literalExpectation("<<", false);
-  var peg$e86 = peg$literalExpectation(">>>", false);
-  var peg$e87 = peg$literalExpectation(">>", false);
-  var peg$e88 = peg$otherExpectation("lambda function");
-  var peg$e89 = peg$literalExpectation("\u2192", false);
-  var peg$e90 = peg$literalExpectation("->", false);
-  var peg$e91 = peg$otherExpectation("single quote string");
-  var peg$e92 = peg$literalExpectation("'", false);
-  var peg$e93 = peg$otherExpectation("string");
-  var peg$e94 = peg$otherExpectation("template");
-  var peg$e95 = peg$literalExpectation("${", false);
-  var peg$e96 = peg$otherExpectation("template text");
-  var peg$e97 = peg$otherExpectation("template literal");
-  var peg$e98 = peg$literalExpectation("`", false);
-  var peg$e99 = peg$otherExpectation("template substitution");
-  var peg$e100 = peg$classExpectation(["!", "+", "-", "~"], false, false);
+  var peg$e59 = peg$classExpectation([["A", "Z"], ["a", "z"]], false, false);
+  var peg$e60 = peg$literalExpectation("\n", false);
+  var peg$e61 = peg$literalExpectation("\r\n", false);
+  var peg$e62 = peg$literalExpectation("\r", false);
+  var peg$e63 = peg$otherExpectation("number");
+  var peg$e64 = peg$literalExpectation("??", false);
+  var peg$e65 = peg$otherExpectation("object literal");
+  var peg$e66 = peg$literalExpectation("{", false);
+  var peg$e67 = peg$otherExpectation("object getter");
+  var peg$e68 = peg$literalExpectation("=", false);
+  var peg$e69 = peg$otherExpectation("object key");
+  var peg$e70 = peg$otherExpectation("object property");
+  var peg$e71 = peg$otherExpectation("object identifier");
+  var peg$e72 = peg$literalExpectation("/", false);
+  var peg$e73 = peg$otherExpectation("function arguments in parentheses");
+  var peg$e74 = peg$otherExpectation("slash-separated path");
+  var peg$e75 = peg$classExpectation(["(", ")", "{", "}", "[", "]", ",", ":", "/", "\\", " ", "\t", "\n", "\r"], true, false);
+  var peg$e76 = peg$otherExpectation("Origami program");
+  var peg$e77 = peg$literalExpectation("//", false);
+  var peg$e78 = peg$literalExpectation("<=", false);
+  var peg$e79 = peg$literalExpectation("<", false);
+  var peg$e80 = peg$literalExpectation(">=", false);
+  var peg$e81 = peg$otherExpectation("scope reference");
+  var peg$e82 = peg$literalExpectation("#!", false);
+  var peg$e83 = peg$classExpectation(["\n", "\r"], true, false);
+  var peg$e84 = peg$literalExpectation("<<", false);
+  var peg$e85 = peg$literalExpectation(">>>", false);
+  var peg$e86 = peg$literalExpectation(">>", false);
+  var peg$e87 = peg$otherExpectation("lambda function");
+  var peg$e88 = peg$literalExpectation("\u2192", false);
+  var peg$e89 = peg$literalExpectation("->", false);
+  var peg$e90 = peg$otherExpectation("single quote string");
+  var peg$e91 = peg$literalExpectation("'", false);
+  var peg$e92 = peg$otherExpectation("string");
+  var peg$e93 = peg$otherExpectation("template");
+  var peg$e94 = peg$literalExpectation("${", false);
+  var peg$e95 = peg$otherExpectation("template text");
+  var peg$e96 = peg$otherExpectation("template literal");
+  var peg$e97 = peg$literalExpectation("`", false);
+  var peg$e98 = peg$otherExpectation("template substitution");
+  var peg$e99 = peg$classExpectation(["!", "+", "-", "~"], false, false);
 
   var peg$f0 = function() {
     return null;
   };
   var peg$f1 = function(head, tail) {
-      return annotate(tail.reduce(makeBinaryOperation, head), location());
+      return tail.reduce(makeBinaryOperation, head);
     };
   var peg$f2 = function(entries) {
-      return annotate(makeArray(entries ?? []), location());
+      return makeArray(entries ?? [], location());
     };
   var peg$f3 = function(entries) {
       return annotate(entries, location());
@@ -394,22 +392,24 @@ function peg$parse(input, options) {
       return annotate([ops.literal, undefined], location());
     };
   var peg$f5 = function(parameters, pipeline) {
-      return annotate([ops.lambda, parameters ?? [], pipeline], location());
+      const lambdaParameters = annotate(parameters ?? [], location());
+      return annotate([ops.lambda, lambdaParameters, pipeline], location());
     };
   var peg$f6 = function(identifier, pipeline) {
-      return annotate([ops.lambda, [identifier], pipeline], location());
+      const lambdaParameters = annotate([identifier], location())
+      return annotate([ops.lambda, lambdaParameters, pipeline], location());
     };
   var peg$f7 = function(head, tail) {
-      return annotate(tail.reduce(makeBinaryOperation, head), location());
+      return tail.reduce(makeBinaryOperation, head);
     };
   var peg$f8 = function(head, tail) {
-      return annotate(tail.reduce(makeBinaryOperation, head), location());
+      return tail.reduce(makeBinaryOperation, head);
     };
   var peg$f9 = function(head, tail) {
-      return annotate(tail.reduce(makeBinaryOperation, head), location());
+      return tail.reduce(makeBinaryOperation, head);
     };
   var peg$f10 = function(head, tail) {
-      return annotate(tail.reduce(makeCall, head), location());
+      return tail.reduce(makeCall, head);
     };
   var peg$f11 = function() {
       error(`An object ended without a closing brace, or contained something that wasn't expected.\nThe top level of an object can only contain definitions ("a: b" or "a = b") or spreads ("...a").`);
@@ -429,18 +429,19 @@ function peg$parse(input, options) {
       if (!tail) {
         return condition;
       }
+      const deferred = makeDeferredArguments(tail);
       return annotate([
         ops.conditional,
         downgradeReference(condition),
-        [ops.lambda, [], downgradeReference(tail[0])],
-        [ops.lambda, [], downgradeReference(tail[1])]
+        downgradeReference(deferred[0]),
+        downgradeReference(deferred[1])
       ], location());
     };
   var peg$f16 = function(chars) {
     return annotate([ops.literal, chars.join("")], location());
   };
   var peg$f17 = function(head, tail) {
-      return annotate(tail.reduce(makeBinaryOperation, head), location());
+      return tail.reduce(makeBinaryOperation, head);
     };
   var peg$f18 = function() { return "\0"; };
   var peg$f19 = function() { return "\b"; };
@@ -504,10 +505,10 @@ function peg$parse(input, options) {
     };
   var peg$f39 = function() { return null; };
   var peg$f40 = function(head, tail) {
-      return annotate(tail.reduce(makeBinaryOperation, head), location());
+      return tail.reduce(makeBinaryOperation, head);
     };
-  var peg$f41 = function(at, chars) {
-    return annotate([ops.builtin, (at ?? "") + chars.join("") + ":"], location());
+  var peg$f41 = function(chars) {
+    return annotate([ops.builtin, chars.join("") + ":"], location());
   };
   var peg$f42 = function(head, tail) {
       return tail.length === 0
@@ -518,7 +519,7 @@ function peg$parse(input, options) {
         );
     };
   var peg$f43 = function(entries) {
-      return annotate(makeObject(entries ?? [], ops.object), location());
+      return makeObject(entries ?? [], location());
     };
   var peg$f44 = function(entries) {
       return annotate(entries, location());
@@ -534,7 +535,8 @@ function peg$parse(input, options) {
       return annotate(makeProperty(key, pipeline), location());
     };
   var peg$f48 = function(key) {
-      return annotate([key, [ops.inherited, key]], location());
+      const inherited = annotate([ops.inherited, key], location());
+      return annotate([key, inherited], location());
     };
   var peg$f49 = function(identifier, slash) {
     return identifier + (slash ?? "");
@@ -567,14 +569,14 @@ function peg$parse(input, options) {
     };
   var peg$f56 = function(fn, host, path) {
       const keys = annotate([host, ...(path ?? [])], location());
-      return annotate(makeCall(fn, keys), location());
+      return makeCall(fn, keys);
     };
   var peg$f57 = function(fn, reference) {
       const literal = annotate([ops.literal, reference[1]], reference.location);
-      return annotate(makeCall(fn, [literal]), location());
+      return makeCall(fn, [literal]);
     };
   var peg$f58 = function(head, tail) {
-      return annotate(tail.reduce(makeBinaryOperation, head), location());
+      return tail.reduce(makeBinaryOperation, head);
     };
   var peg$f59 = function(key) {
       return annotate([ops.rootDirectory, key], location());
@@ -586,43 +588,48 @@ function peg$parse(input, options) {
       const id = identifier + (slashFollows ? "/" : "");
       return annotate(makeReference(id), location());
     };
-  var peg$f62 = function() {
-      return true;
-    };
-  var peg$f63 = function() { return null; };
-  var peg$f64 = function(head, tail) {
-      return annotate(tail.reduce(makeBinaryOperation, head), location());
+  var peg$f62 = function() { return null; };
+  var peg$f63 = function(head, tail) {
+      return tail.reduce(makeBinaryOperation, head);
     };
-  var peg$f65 = function(definition) {
-      return annotate([ops.lambda, ["_"], definition], location());
+  var peg$f64 = function(definition) {
+      const lambdaParameters = annotate(["_"], location());
+      return annotate([ops.lambda, lambdaParameters, definition], location());
     };
-  var peg$f66 = function() { return null; };
-  var peg$f67 = function(chars) {
+  var peg$f65 = function() { return null; };
+  var peg$f66 = function(chars) {
     return annotate([ops.literal, chars.join("")], location());
   };
-  var peg$f68 = function(value) {
+  var peg$f67 = function() {
+    return annotate([ops.literal, "/"], location());
+  };
+  var peg$f68 = function() {
+      return true;
+    };
+  var peg$f69 = function(value) {
       return annotate([ops.spread, value], location());
     };
-  var peg$f69 = function(head, tail) {
+  var peg$f70 = function(head, tail) {
+      const lambdaParameters = annotate(["_"], location());
       return annotate(
-        [ops.lambda, ["_"], makeTemplate(ops.templateIndent, head, tail)],
+        [ops.lambda, lambdaParameters, makeTemplate(ops.templateIndent, head, tail, location())],
         location()
       );
     };
-  var peg$f70 = function(chars) {
-      return chars.join("");
+  var peg$f71 = function(chars) {
+      return annotate([ops.literal, chars.join("")], location());
     };
-  var peg$f71 = function(head, tail) {
-      return annotate(makeTemplate(ops.template, head, tail), location());
+  var peg$f72 = function(head, tail) {
+      return makeTemplate(ops.template, head, tail, location());
     };
-  var peg$f72 = function(chars) {
-      return chars.join("");
+  var peg$f73 = function(chars) {
+      return annotate([ops.literal, chars.join("")], location());
     };
-  var peg$f73 = function(expression) {
+  var peg$f74 = function(expression) {
       return annotate(expression, location());
     };
-  var peg$f74 = function(operator, expression) {
-      return annotate(makeUnaryOperation(operator, expression), location());
+  var peg$f75 = function(operator, expression) {
+      return makeUnaryOperation(operator, expression, location());
     };
   var peg$currPos = options.peg$currPos | 0;
   var peg$savedPos = peg$currPos;
@@ -2950,52 +2957,42 @@ function peg$parse(input, options) {
   }
 
   function peg$parsenamespace() {
-    var s0, s1, s2, s3;
+    var s0, s1, s2;
 
     s0 = peg$currPos;
-    if (input.charCodeAt(peg$currPos) === 64) {
-      s1 = peg$c39;
+    s1 = [];
+    s2 = input.charAt(peg$currPos);
+    if (peg$r5.test(s2)) {
       peg$currPos++;
     } else {
-      s1 = peg$FAILED;
+      s2 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e59); }
     }
-    if (s1 === peg$FAILED) {
-      s1 = null;
-    }
-    s2 = [];
-    s3 = input.charAt(peg$currPos);
-    if (peg$r5.test(s3)) {
-      peg$currPos++;
-    } else {
-      s3 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e60); }
-    }
-    if (s3 !== peg$FAILED) {
-      while (s3 !== peg$FAILED) {
-        s2.push(s3);
-        s3 = input.charAt(peg$currPos);
-        if (peg$r5.test(s3)) {
+    if (s2 !== peg$FAILED) {
+      while (s2 !== peg$FAILED) {
+        s1.push(s2);
+        s2 = input.charAt(peg$currPos);
+        if (peg$r5.test(s2)) {
           peg$currPos++;
         } else {
-          s3 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e60); }
+          s2 = peg$FAILED;
+          if (peg$silentFails === 0) { peg$fail(peg$e59); }
         }
       }
     } else {
-      s2 = peg$FAILED;
+      s1 = peg$FAILED;
     }
-    if (s2 !== peg$FAILED) {
+    if (s1 !== peg$FAILED) {
       if (input.charCodeAt(peg$currPos) === 58) {
-        s3 = peg$c10;
+        s2 = peg$c10;
         peg$currPos++;
       } else {
-        s3 = peg$FAILED;
+        s2 = peg$FAILED;
         if (peg$silentFails === 0) { peg$fail(peg$e16); }
       }
-      if (s3 !== peg$FAILED) {
+      if (s2 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f41(s1, s2);
+        s0 = peg$f41(s1);
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -3012,27 +3009,27 @@ function peg$parse(input, options) {
     var s0;
 
     if (input.charCodeAt(peg$currPos) === 10) {
-      s0 = peg$c40;
+      s0 = peg$c39;
       peg$currPos++;
     } else {
       s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e61); }
+      if (peg$silentFails === 0) { peg$fail(peg$e60); }
     }
     if (s0 === peg$FAILED) {
-      if (input.substr(peg$currPos, 2) === peg$c41) {
-        s0 = peg$c41;
+      if (input.substr(peg$currPos, 2) === peg$c40) {
+        s0 = peg$c40;
         peg$currPos += 2;
       } else {
         s0 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e62); }
+        if (peg$silentFails === 0) { peg$fail(peg$e61); }
       }
       if (s0 === peg$FAILED) {
         if (input.charCodeAt(peg$currPos) === 13) {
-          s0 = peg$c42;
+          s0 = peg$c41;
           peg$currPos++;
         } else {
           s0 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e63); }
+          if (peg$silentFails === 0) { peg$fail(peg$e62); }
         }
       }
     }
@@ -3051,7 +3048,7 @@ function peg$parse(input, options) {
     peg$silentFails--;
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e64); }
+      if (peg$silentFails === 0) { peg$fail(peg$e63); }
     }
 
     return s0;
@@ -3066,12 +3063,12 @@ function peg$parse(input, options) {
       s2 = [];
       s3 = peg$currPos;
       s4 = peg$parse__();
-      if (input.substr(peg$currPos, 2) === peg$c43) {
-        s5 = peg$c43;
+      if (input.substr(peg$currPos, 2) === peg$c42) {
+        s5 = peg$c42;
         peg$currPos += 2;
       } else {
         s5 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e65); }
+        if (peg$silentFails === 0) { peg$fail(peg$e64); }
       }
       if (s5 !== peg$FAILED) {
         s6 = peg$parse__();
@@ -3090,12 +3087,12 @@ function peg$parse(input, options) {
         s2.push(s3);
         s3 = peg$currPos;
         s4 = peg$parse__();
-        if (input.substr(peg$currPos, 2) === peg$c43) {
-          s5 = peg$c43;
+        if (input.substr(peg$currPos, 2) === peg$c42) {
+          s5 = peg$c42;
           peg$currPos += 2;
         } else {
           s5 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e65); }
+          if (peg$silentFails === 0) { peg$fail(peg$e64); }
         }
         if (s5 !== peg$FAILED) {
           s6 = peg$parse__();
@@ -3127,11 +3124,11 @@ function peg$parse(input, options) {
     peg$silentFails++;
     s0 = peg$currPos;
     if (input.charCodeAt(peg$currPos) === 123) {
-      s1 = peg$c44;
+      s1 = peg$c43;
       peg$currPos++;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e67); }
+      if (peg$silentFails === 0) { peg$fail(peg$e66); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$parse__();
@@ -3155,7 +3152,7 @@ function peg$parse(input, options) {
     peg$silentFails--;
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e66); }
+      if (peg$silentFails === 0) { peg$fail(peg$e65); }
     }
 
     return s0;
@@ -3231,11 +3228,11 @@ function peg$parse(input, options) {
     if (s1 !== peg$FAILED) {
       s2 = peg$parse__();
       if (input.charCodeAt(peg$currPos) === 61) {
-        s3 = peg$c45;
+        s3 = peg$c44;
         peg$currPos++;
       } else {
         s3 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e69); }
+        if (peg$silentFails === 0) { peg$fail(peg$e68); }
       }
       if (s3 !== peg$FAILED) {
         s4 = peg$parse__();
@@ -3258,7 +3255,7 @@ function peg$parse(input, options) {
     peg$silentFails--;
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e68); }
+      if (peg$silentFails === 0) { peg$fail(peg$e67); }
     }
 
     return s0;
@@ -3321,7 +3318,7 @@ function peg$parse(input, options) {
     peg$silentFails--;
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e70); }
+      if (peg$silentFails === 0) { peg$fail(peg$e69); }
     }
 
     return s0;
@@ -3363,7 +3360,7 @@ function peg$parse(input, options) {
     peg$silentFails--;
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e71); }
+      if (peg$silentFails === 0) { peg$fail(peg$e70); }
     }
 
     return s0;
@@ -3383,7 +3380,7 @@ function peg$parse(input, options) {
     peg$silentFails--;
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e72); }
+      if (peg$silentFails === 0) { peg$fail(peg$e71); }
     }
 
     return s0;
@@ -3396,11 +3393,11 @@ function peg$parse(input, options) {
     s1 = peg$parseidentifier();
     if (s1 !== peg$FAILED) {
       if (input.charCodeAt(peg$currPos) === 47) {
-        s2 = peg$c46;
+        s2 = peg$c45;
         peg$currPos++;
       } else {
         s2 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e73); }
+        if (peg$silentFails === 0) { peg$fail(peg$e72); }
       }
       if (s2 === peg$FAILED) {
         s2 = null;
@@ -3464,7 +3461,7 @@ function peg$parse(input, options) {
     peg$silentFails--;
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e74); }
+      if (peg$silentFails === 0) { peg$fail(peg$e73); }
     }
 
     return s0;
@@ -3496,7 +3493,7 @@ function peg$parse(input, options) {
     peg$silentFails--;
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e75); }
+      if (peg$silentFails === 0) { peg$fail(peg$e74); }
     }
 
     return s0;
@@ -3550,11 +3547,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     if (input.charCodeAt(peg$currPos) === 47) {
-      s1 = peg$c46;
+      s1 = peg$c45;
       peg$currPos++;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e73); }
+      if (peg$silentFails === 0) { peg$fail(peg$e72); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$parsepathKey();
@@ -3578,7 +3575,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e76); }
+      if (peg$silentFails === 0) { peg$fail(peg$e75); }
     }
     if (s0 === peg$FAILED) {
       s0 = peg$parseescapedChar();
@@ -3652,7 +3649,7 @@ function peg$parse(input, options) {
           if (s0 === peg$FAILED) {
             s0 = peg$parsetemplateLiteral();
             if (s0 === peg$FAILED) {
-              s0 = peg$parsereference();
+              s0 = peg$parseinherited();
             }
           }
         }
@@ -3681,7 +3678,7 @@ function peg$parse(input, options) {
     peg$silentFails--;
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e77); }
+      if (peg$silentFails === 0) { peg$fail(peg$e76); }
     }
 
     return s0;
@@ -3693,15 +3690,18 @@ function peg$parse(input, options) {
     s0 = peg$currPos;
     s1 = peg$parsenamespace();
     if (s1 !== peg$FAILED) {
-      if (input.substr(peg$currPos, 2) === peg$c47) {
-        s2 = peg$c47;
+      if (input.substr(peg$currPos, 2) === peg$c46) {
+        s2 = peg$c46;
         peg$currPos += 2;
       } else {
         s2 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e78); }
+        if (peg$silentFails === 0) { peg$fail(peg$e77); }
       }
       if (s2 !== peg$FAILED) {
         s3 = peg$parsehost();
+        if (s3 === peg$FAILED) {
+          s3 = peg$parseslash();
+        }
         if (s3 !== peg$FAILED) {
           s4 = peg$parsepath();
           if (s4 === peg$FAILED) {
@@ -3750,7 +3750,7 @@ function peg$parse(input, options) {
     return s0;
   }
 
-  function peg$parsereference() {
+  function peg$parseinherited() {
     var s0;
 
     s0 = peg$parserootDirectory();
@@ -3825,28 +3825,28 @@ function peg$parse(input, options) {
   function peg$parserelationalOperator() {
     var s0;
 
-    if (input.substr(peg$currPos, 2) === peg$c48) {
-      s0 = peg$c48;
+    if (input.substr(peg$currPos, 2) === peg$c47) {
+      s0 = peg$c47;
       peg$currPos += 2;
     } else {
       s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e79); }
+      if (peg$silentFails === 0) { peg$fail(peg$e78); }
     }
     if (s0 === peg$FAILED) {
       if (input.charCodeAt(peg$currPos) === 60) {
-        s0 = peg$c49;
+        s0 = peg$c48;
         peg$currPos++;
       } else {
         s0 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e80); }
+        if (peg$silentFails === 0) { peg$fail(peg$e79); }
       }
       if (s0 === peg$FAILED) {
-        if (input.substr(peg$currPos, 2) === peg$c50) {
-          s0 = peg$c50;
+        if (input.substr(peg$currPos, 2) === peg$c49) {
+          s0 = peg$c49;
           peg$currPos += 2;
         } else {
           s0 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e81); }
+          if (peg$silentFails === 0) { peg$fail(peg$e80); }
         }
         if (s0 === peg$FAILED) {
           if (input.charCodeAt(peg$currPos) === 62) {
@@ -3868,11 +3868,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     if (input.charCodeAt(peg$currPos) === 47) {
-      s1 = peg$c46;
+      s1 = peg$c45;
       peg$currPos++;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e73); }
+      if (peg$silentFails === 0) { peg$fail(peg$e72); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$parsepathKey();
@@ -3890,21 +3890,21 @@ function peg$parse(input, options) {
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
       if (input.charCodeAt(peg$currPos) === 47) {
-        s1 = peg$c46;
+        s1 = peg$c45;
         peg$currPos++;
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e73); }
+        if (peg$silentFails === 0) { peg$fail(peg$e72); }
       }
       if (s1 !== peg$FAILED) {
         s2 = peg$currPos;
         peg$silentFails++;
         if (input.charCodeAt(peg$currPos) === 47) {
-          s3 = peg$c46;
+          s3 = peg$c45;
           peg$currPos++;
         } else {
           s3 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e73); }
+          if (peg$silentFails === 0) { peg$fail(peg$e72); }
         }
         peg$silentFails--;
         if (s3 === peg$FAILED) {
@@ -3949,7 +3949,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$e81); }
     }
 
     return s0;
@@ -3982,45 +3982,16 @@ function peg$parse(input, options) {
     return s0;
   }
 
-  function peg$parseslashFollows() {
-    var s0, s1, s2;
-
-    s0 = peg$currPos;
-    s1 = peg$currPos;
-    peg$silentFails++;
-    if (input.charCodeAt(peg$currPos) === 47) {
-      s2 = peg$c46;
-      peg$currPos++;
-    } else {
-      s2 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e73); }
-    }
-    peg$silentFails--;
-    if (s2 !== peg$FAILED) {
-      peg$currPos = s1;
-      s1 = undefined;
-    } else {
-      s1 = peg$FAILED;
-    }
-    if (s1 !== peg$FAILED) {
-      peg$savedPos = s0;
-      s1 = peg$f62();
-    }
-    s0 = s1;
-
-    return s0;
-  }
-
   function peg$parseshebang() {
     var s0, s1, s2, s3;
 
     s0 = peg$currPos;
-    if (input.substr(peg$currPos, 2) === peg$c51) {
-      s1 = peg$c51;
+    if (input.substr(peg$currPos, 2) === peg$c50) {
+      s1 = peg$c50;
       peg$currPos += 2;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e83); }
+      if (peg$silentFails === 0) { peg$fail(peg$e82); }
     }
     if (s1 !== peg$FAILED) {
       s2 = [];
@@ -4029,7 +4000,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s3 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e84); }
+        if (peg$silentFails === 0) { peg$fail(peg$e83); }
       }
       while (s3 !== peg$FAILED) {
         s2.push(s3);
@@ -4038,11 +4009,11 @@ function peg$parse(input, options) {
           peg$currPos++;
         } else {
           s3 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e84); }
+          if (peg$silentFails === 0) { peg$fail(peg$e83); }
         }
       }
       peg$savedPos = s0;
-      s0 = peg$f63();
+      s0 = peg$f62();
     } else {
       peg$currPos = s0;
       s0 = peg$FAILED;
@@ -4094,7 +4065,7 @@ function peg$parse(input, options) {
         }
       }
       peg$savedPos = s0;
-      s0 = peg$f64(s1, s2);
+      s0 = peg$f63(s1, s2);
     } else {
       peg$currPos = s0;
       s0 = peg$FAILED;
@@ -4106,28 +4077,28 @@ function peg$parse(input, options) {
   function peg$parseshiftOperator() {
     var s0;
 
-    if (input.substr(peg$currPos, 2) === peg$c52) {
-      s0 = peg$c52;
+    if (input.substr(peg$currPos, 2) === peg$c51) {
+      s0 = peg$c51;
       peg$currPos += 2;
     } else {
       s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e85); }
+      if (peg$silentFails === 0) { peg$fail(peg$e84); }
     }
     if (s0 === peg$FAILED) {
-      if (input.substr(peg$currPos, 3) === peg$c53) {
-        s0 = peg$c53;
+      if (input.substr(peg$currPos, 3) === peg$c52) {
+        s0 = peg$c52;
         peg$currPos += 3;
       } else {
         s0 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e86); }
+        if (peg$silentFails === 0) { peg$fail(peg$e85); }
       }
       if (s0 === peg$FAILED) {
-        if (input.substr(peg$currPos, 2) === peg$c54) {
-          s0 = peg$c54;
+        if (input.substr(peg$currPos, 2) === peg$c53) {
+          s0 = peg$c53;
           peg$currPos += 2;
         } else {
           s0 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e87); }
+          if (peg$silentFails === 0) { peg$fail(peg$e86); }
         }
       }
     }
@@ -4141,21 +4112,21 @@ function peg$parse(input, options) {
     peg$silentFails++;
     s0 = peg$currPos;
     if (input.charCodeAt(peg$currPos) === 61) {
-      s1 = peg$c45;
+      s1 = peg$c44;
       peg$currPos++;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e69); }
+      if (peg$silentFails === 0) { peg$fail(peg$e68); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$currPos;
       peg$silentFails++;
       if (input.charCodeAt(peg$currPos) === 61) {
-        s3 = peg$c45;
+        s3 = peg$c44;
         peg$currPos++;
       } else {
         s3 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e69); }
+        if (peg$silentFails === 0) { peg$fail(peg$e68); }
       }
       peg$silentFails--;
       if (s3 === peg$FAILED) {
@@ -4169,7 +4140,7 @@ function peg$parse(input, options) {
         s4 = peg$parseimplicitParenthesesCallExpression();
         if (s4 !== peg$FAILED) {
           peg$savedPos = s0;
-          s0 = peg$f65(s4);
+          s0 = peg$f64(s4);
         } else {
           peg$currPos = s0;
           s0 = peg$FAILED;
@@ -4188,7 +4159,7 @@ function peg$parse(input, options) {
     peg$silentFails--;
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e88); }
+      if (peg$silentFails === 0) { peg$fail(peg$e87); }
     }
 
     return s0;
@@ -4198,19 +4169,19 @@ function peg$parse(input, options) {
     var s0;
 
     if (input.charCodeAt(peg$currPos) === 8594) {
-      s0 = peg$c55;
+      s0 = peg$c54;
       peg$currPos++;
     } else {
       s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e89); }
+      if (peg$silentFails === 0) { peg$fail(peg$e88); }
     }
     if (s0 === peg$FAILED) {
-      if (input.substr(peg$currPos, 2) === peg$c56) {
-        s0 = peg$c56;
+      if (input.substr(peg$currPos, 2) === peg$c55) {
+        s0 = peg$c55;
         peg$currPos += 2;
       } else {
         s0 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e90); }
+        if (peg$silentFails === 0) { peg$fail(peg$e89); }
       }
     }
 
@@ -4221,12 +4192,12 @@ function peg$parse(input, options) {
     var s0, s1, s2, s3;
 
     s0 = peg$currPos;
-    if (input.substr(peg$currPos, 2) === peg$c47) {
-      s1 = peg$c47;
+    if (input.substr(peg$currPos, 2) === peg$c46) {
+      s1 = peg$c46;
       peg$currPos += 2;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e78); }
+      if (peg$silentFails === 0) { peg$fail(peg$e77); }
     }
     if (s1 !== peg$FAILED) {
       s2 = [];
@@ -4235,7 +4206,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s3 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e84); }
+        if (peg$silentFails === 0) { peg$fail(peg$e83); }
       }
       while (s3 !== peg$FAILED) {
         s2.push(s3);
@@ -4244,11 +4215,11 @@ function peg$parse(input, options) {
           peg$currPos++;
         } else {
           s3 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e84); }
+          if (peg$silentFails === 0) { peg$fail(peg$e83); }
         }
       }
       peg$savedPos = s0;
-      s0 = peg$f66();
+      s0 = peg$f65();
     } else {
       peg$currPos = s0;
       s0 = peg$FAILED;
@@ -4263,11 +4234,11 @@ function peg$parse(input, options) {
     peg$silentFails++;
     s0 = peg$currPos;
     if (input.charCodeAt(peg$currPos) === 39) {
-      s1 = peg$c57;
+      s1 = peg$c56;
       peg$currPos++;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e92); }
+      if (peg$silentFails === 0) { peg$fail(peg$e91); }
     }
     if (s1 !== peg$FAILED) {
       s2 = [];
@@ -4277,15 +4248,15 @@ function peg$parse(input, options) {
         s3 = peg$parsesingleQuoteStringChar();
       }
       if (input.charCodeAt(peg$currPos) === 39) {
-        s3 = peg$c57;
+        s3 = peg$c56;
         peg$currPos++;
       } else {
         s3 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e92); }
+        if (peg$silentFails === 0) { peg$fail(peg$e91); }
       }
       if (s3 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f67(s2);
+        s0 = peg$f66(s2);
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -4297,7 +4268,7 @@ function peg$parse(input, options) {
     peg$silentFails--;
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e91); }
+      if (peg$silentFails === 0) { peg$fail(peg$e90); }
     }
 
     return s0;
@@ -4310,11 +4281,11 @@ function peg$parse(input, options) {
     s1 = peg$currPos;
     peg$silentFails++;
     if (input.charCodeAt(peg$currPos) === 39) {
-      s2 = peg$c57;
+      s2 = peg$c56;
       peg$currPos++;
     } else {
       s2 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e92); }
+      if (peg$silentFails === 0) { peg$fail(peg$e91); }
     }
     if (s2 === peg$FAILED) {
       s2 = peg$parsenewLine();
@@ -4342,6 +4313,49 @@ function peg$parse(input, options) {
     return s0;
   }
 
+  function peg$parseslash() {
+    var s0, s1;
+
+    s0 = peg$currPos;
+    s1 = peg$parseslashFollows();
+    if (s1 !== peg$FAILED) {
+      peg$savedPos = s0;
+      s1 = peg$f67();
+    }
+    s0 = s1;
+
+    return s0;
+  }
+
+  function peg$parseslashFollows() {
+    var s0, s1, s2;
+
+    s0 = peg$currPos;
+    s1 = peg$currPos;
+    peg$silentFails++;
+    if (input.charCodeAt(peg$currPos) === 47) {
+      s2 = peg$c45;
+      peg$currPos++;
+    } else {
+      s2 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$e72); }
+    }
+    peg$silentFails--;
+    if (s2 !== peg$FAILED) {
+      peg$currPos = s1;
+      s1 = undefined;
+    } else {
+      s1 = peg$FAILED;
+    }
+    if (s1 !== peg$FAILED) {
+      peg$savedPos = s0;
+      s1 = peg$f68();
+    }
+    s0 = s1;
+
+    return s0;
+  }
+
   function peg$parsespreadElement() {
     var s0, s1, s2, s3;
 
@@ -4352,7 +4366,7 @@ function peg$parse(input, options) {
       s3 = peg$parsepipelineExpression();
       if (s3 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f68(s3);
+        s0 = peg$f69(s3);
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -4379,7 +4393,7 @@ function peg$parse(input, options) {
     peg$silentFails--;
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e93); }
+      if (peg$silentFails === 0) { peg$fail(peg$e92); }
     }
 
     return s0;
@@ -4416,10 +4430,10 @@ function peg$parse(input, options) {
       }
     }
     peg$savedPos = s0;
-    s0 = peg$f69(s1, s2);
+    s0 = peg$f70(s1, s2);
     peg$silentFails--;
     s1 = peg$FAILED;
-    if (peg$silentFails === 0) { peg$fail(peg$e94); }
+    if (peg$silentFails === 0) { peg$fail(peg$e93); }
 
     return s0;
   }
@@ -4430,12 +4444,12 @@ function peg$parse(input, options) {
     s0 = peg$currPos;
     s1 = peg$currPos;
     peg$silentFails++;
-    if (input.substr(peg$currPos, 2) === peg$c58) {
-      s2 = peg$c58;
+    if (input.substr(peg$currPos, 2) === peg$c57) {
+      s2 = peg$c57;
       peg$currPos += 2;
     } else {
       s2 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e95); }
+      if (peg$silentFails === 0) { peg$fail(peg$e94); }
     }
     peg$silentFails--;
     if (s2 === peg$FAILED) {
@@ -4472,11 +4486,11 @@ function peg$parse(input, options) {
       s2 = peg$parsetemplateDocumentChar();
     }
     peg$savedPos = s0;
-    s1 = peg$f70(s1);
+    s1 = peg$f71(s1);
     s0 = s1;
     peg$silentFails--;
     s1 = peg$FAILED;
-    if (peg$silentFails === 0) { peg$fail(peg$e96); }
+    if (peg$silentFails === 0) { peg$fail(peg$e95); }
 
     return s0;
   }
@@ -4487,11 +4501,11 @@ function peg$parse(input, options) {
     peg$silentFails++;
     s0 = peg$currPos;
     if (input.charCodeAt(peg$currPos) === 96) {
-      s1 = peg$c59;
+      s1 = peg$c58;
       peg$currPos++;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e98); }
+      if (peg$silentFails === 0) { peg$fail(peg$e97); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$parsetemplateLiteralText();
@@ -4520,15 +4534,15 @@ function peg$parse(input, options) {
         }
       }
       if (input.charCodeAt(peg$currPos) === 96) {
-        s4 = peg$c59;
+        s4 = peg$c58;
         peg$currPos++;
       } else {
         s4 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e98); }
+        if (peg$silentFails === 0) { peg$fail(peg$e97); }
       }
       if (s4 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f71(s2, s3);
+        s0 = peg$f72(s2, s3);
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -4540,7 +4554,7 @@ function peg$parse(input, options) {
     peg$silentFails--;
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e97); }
+      if (peg$silentFails === 0) { peg$fail(peg$e96); }
     }
 
     return s0;
@@ -4553,19 +4567,19 @@ function peg$parse(input, options) {
     s1 = peg$currPos;
     peg$silentFails++;
     if (input.charCodeAt(peg$currPos) === 96) {
-      s2 = peg$c59;
+      s2 = peg$c58;
       peg$currPos++;
     } else {
       s2 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e98); }
+      if (peg$silentFails === 0) { peg$fail(peg$e97); }
     }
     if (s2 === peg$FAILED) {
-      if (input.substr(peg$currPos, 2) === peg$c58) {
-        s2 = peg$c58;
+      if (input.substr(peg$currPos, 2) === peg$c57) {
+        s2 = peg$c57;
         peg$currPos += 2;
       } else {
         s2 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e95); }
+        if (peg$silentFails === 0) { peg$fail(peg$e94); }
       }
     }
     peg$silentFails--;
@@ -4602,7 +4616,7 @@ function peg$parse(input, options) {
       s2 = peg$parsetemplateLiteralChar();
     }
     peg$savedPos = s0;
-    s1 = peg$f72(s1);
+    s1 = peg$f73(s1);
     s0 = s1;
 
     return s0;
@@ -4613,12 +4627,12 @@ function peg$parse(input, options) {
 
     peg$silentFails++;
     s0 = peg$currPos;
-    if (input.substr(peg$currPos, 2) === peg$c58) {
-      s1 = peg$c58;
+    if (input.substr(peg$currPos, 2) === peg$c57) {
+      s1 = peg$c57;
       peg$currPos += 2;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e95); }
+      if (peg$silentFails === 0) { peg$fail(peg$e94); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$parseexpression();
@@ -4632,7 +4646,7 @@ function peg$parse(input, options) {
         }
         if (s3 !== peg$FAILED) {
           peg$savedPos = s0;
-          s0 = peg$f73(s2);
+          s0 = peg$f74(s2);
         } else {
           peg$currPos = s0;
           s0 = peg$FAILED;
@@ -4648,7 +4662,7 @@ function peg$parse(input, options) {
     peg$silentFails--;
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e99); }
+      if (peg$silentFails === 0) { peg$fail(peg$e98); }
     }
 
     return s0;
@@ -4681,7 +4695,7 @@ function peg$parse(input, options) {
       s3 = peg$parseunaryExpression();
       if (s3 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f74(s1, s3);
+        s0 = peg$f75(s1, s3);
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -4705,7 +4719,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e100); }
+      if (peg$silentFails === 0) { peg$fail(peg$e99); }
     }
 
     return s0;
@@ -4856,13 +4870,12 @@ const peg$allowedStartRules = [
   "program",
   "protocolExpression",
   "qualifiedReference",
-  "reference",
+  "inherited",
   "relationalExpression",
   "relationalOperator",
   "rootDirectory",
   "scopeReference",
   "separator",
-  "slashFollows",
   "shebang",
   "shiftExpression",
   "shiftOperator",
@@ -4871,6 +4884,8 @@ const peg$allowedStartRules = [
   "singleLineComment",
   "singleQuoteString",
   "singleQuoteStringChar",
+  "slash",
+  "slashFollows",
   "spreadElement",
   "stringLiteral",
   "templateDocument",