@weborigami/language 0.0.72 → 0.1.0

package/src/compiler/parse.js

@@ -192,7 +192,7 @@ function peg$parse(input, options) {
   var peg$FAILED = {};
   var peg$source = options.grammarSource;
 
-  var peg$startRuleFunctions = { __: peg$parse__, absoluteFilePath: peg$parseabsoluteFilePath, args: peg$parseargs, array: peg$parsearray, arrayEntries: peg$parsearrayEntries, arrayEntry: peg$parsearrayEntry, callTarget: peg$parsecallTarget, closingBrace: peg$parseclosingBrace, closingBracket: peg$parseclosingBracket, closingParen: peg$parseclosingParen, comment: peg$parsecomment, digits: peg$parsedigits, doubleArrow: peg$parsedoubleArrow, doubleQuoteString: peg$parsedoubleQuoteString, doubleQuoteStringChar: peg$parsedoubleQuoteStringChar, ellipsis: peg$parseellipsis, escapedChar: peg$parseescapedChar, expr: peg$parseexpr, expression: peg$parseexpression, float: peg$parsefloat, functionComposition: peg$parsefunctionComposition, group: peg$parsegroup, guillemetString: peg$parseguillemetString, guillemetStringChar: peg$parseguillemetStringChar, host: peg$parsehost, identifier: peg$parseidentifier, identifierChar: peg$parseidentifierChar, identifierList: peg$parseidentifierList, implicitParensArgs: peg$parseimplicitParensArgs, inlineSpace: peg$parseinlineSpace, integer: peg$parseinteger, lambda: peg$parselambda, leadingSlashPath: peg$parseleadingSlashPath, list: peg$parselist, multiLineComment: peg$parsemultiLineComment, newLine: peg$parsenewLine, number: peg$parsenumber, object: peg$parseobject, objectEntries: peg$parseobjectEntries, objectEntry: peg$parseobjectEntry, objectGetter: peg$parseobjectGetter, objectHiddenKey: peg$parseobjectHiddenKey, objectKey: peg$parseobjectKey, objectProperty: peg$parseobjectProperty, objectShorthandProperty: peg$parseobjectShorthandProperty, objectPublicKey: peg$parseobjectPublicKey, parameterizedLambda: peg$parseparameterizedLambda, parensArgs: peg$parseparensArgs, pipeline: peg$parsepipeline, path: peg$parsepath, pathElement: peg$parsepathElement, pathKeyChar: peg$parsepathKeyChar, pathTail: peg$parsepathTail, protocolCall: peg$parseprotocolCall, protocol: peg$parseprotocol, reservedProtocol: peg$parsereservedProtocol, scopeReference: peg$parsescopeReference, scopeTraverse: peg$parsescopeTraverse, separator: peg$parseseparator, shebang: peg$parseshebang, sign: peg$parsesign, singleArrow: peg$parsesingleArrow, singleLineComment: peg$parsesingleLineComment, singleQuoteString: peg$parsesingleQuoteString, singleQuoteStringChar: peg$parsesingleQuoteStringChar, spread: peg$parsespread, step: peg$parsestep, start: peg$parsestart, string: peg$parsestring, taggedTemplate: peg$parsetaggedTemplate, templateDocument: peg$parsetemplateDocument, templateDocumentChar: peg$parsetemplateDocumentChar, templateDocumentContents: peg$parsetemplateDocumentContents, templateDocumentText: peg$parsetemplateDocumentText, templateLiteral: peg$parsetemplateLiteral, templateLiteralChar: peg$parsetemplateLiteralChar, templateLiteralContents: peg$parsetemplateLiteralContents, templateLiteralText: peg$parsetemplateLiteralText, templateSubstitution: peg$parsetemplateSubstitution, textChar: peg$parsetextChar, whitespaceWithNewLine: peg$parsewhitespaceWithNewLine };
+  var peg$startRuleFunctions = { __: peg$parse__, absoluteFilePath: peg$parseabsoluteFilePath, args: peg$parseargs, array: peg$parsearray, arrayEntries: peg$parsearrayEntries, arrayEntry: peg$parsearrayEntry, callTarget: peg$parsecallTarget, closingBrace: peg$parseclosingBrace, closingBracket: peg$parseclosingBracket, closingParen: peg$parseclosingParen, comment: peg$parsecomment, digits: peg$parsedigits, doubleArrow: peg$parsedoubleArrow, doubleQuoteString: peg$parsedoubleQuoteString, doubleQuoteStringChar: peg$parsedoubleQuoteStringChar, doubleSlashPath: peg$parsedoubleSlashPath, ellipsis: peg$parseellipsis, escapedChar: peg$parseescapedChar, expression: peg$parseexpression, float: peg$parsefloat, functionComposition: peg$parsefunctionComposition, functionReference: peg$parsefunctionReference, group: peg$parsegroup, guillemetString: peg$parseguillemetString, guillemetStringChar: peg$parseguillemetStringChar, homeTree: peg$parsehomeTree, host: peg$parsehost, identifier: peg$parseidentifier, identifierChar: peg$parseidentifierChar, identifierList: peg$parseidentifierList, implicitParensArgs: peg$parseimplicitParensArgs, inlineSpace: peg$parseinlineSpace, integer: peg$parseinteger, lambda: peg$parselambda, leadingSlashPath: peg$parseleadingSlashPath, list: peg$parselist, multiLineComment: peg$parsemultiLineComment, namespace: peg$parsenamespace, namespacePath: peg$parsenamespacePath, newLine: peg$parsenewLine, number: peg$parsenumber, object: peg$parseobject, objectEntries: peg$parseobjectEntries, objectEntry: peg$parseobjectEntry, objectGetter: peg$parseobjectGetter, objectHiddenKey: peg$parseobjectHiddenKey, objectKey: peg$parseobjectKey, objectProperty: peg$parseobjectProperty, objectShorthandProperty: peg$parseobjectShorthandProperty, objectPublicKey: peg$parseobjectPublicKey, parameterizedLambda: peg$parseparameterizedLambda, parensArgs: peg$parseparensArgs, path: peg$parsepath, pathElement: peg$parsepathElement, pathKeyChar: peg$parsepathKeyChar, pathTail: peg$parsepathTail, pipeline: peg$parsepipeline, pipelineStep: peg$parsepipelineStep, program: peg$parseprogram, scopeReference: peg$parsescopeReference, scopeTraverse: peg$parsescopeTraverse, separator: peg$parseseparator, shebang: peg$parseshebang, sign: peg$parsesign, singleArrow: peg$parsesingleArrow, singleLineComment: peg$parsesingleLineComment, singleQuoteString: peg$parsesingleQuoteString, singleQuoteStringChar: peg$parsesingleQuoteStringChar, spread: peg$parsespread, start: peg$parsestart, string: peg$parsestring, taggedTemplate: peg$parsetaggedTemplate, templateDocument: peg$parsetemplateDocument, templateDocumentChar: peg$parsetemplateDocumentChar, templateDocumentContents: peg$parsetemplateDocumentContents, templateDocumentText: peg$parsetemplateDocumentText, templateLiteral: peg$parsetemplateLiteral, templateLiteralChar: peg$parsetemplateLiteralChar, templateLiteralContents: peg$parsetemplateLiteralContents, templateLiteralText: peg$parsetemplateLiteralText, templateSubstitution: peg$parsetemplateSubstitution, textChar: peg$parsetextChar, value: peg$parsevalue, whitespaceWithNewLine: peg$parsewhitespaceWithNewLine };
   var peg$startRuleFunction = peg$parse__;
 
   var peg$c0 = "//";
@@ -217,39 +217,34 @@ function peg$parse(input, options) {
   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 = "explore";
-  var peg$c34 = "https";
-  var peg$c35 = "http";
-  var peg$c36 = "new";
-  var peg$c37 = "package";
-  var peg$c38 = "treehttps";
-  var peg$c39 = "treehttp";
-  var peg$c40 = "tree";
-  var peg$c41 = ",";
-  var peg$c42 = "#!";
-  var peg$c43 = "\u2192";
-  var peg$c44 = "->";
-  var peg$c45 = "'";
-  var peg$c46 = "`";
-  var peg$c47 = "${";
+  var peg$c22 = "~";
+  var peg$c23 = ":";
+  var peg$c24 = "/";
+  var peg$c25 = "-";
+  var peg$c26 = ">";
+  var peg$c27 = "=";
+  var peg$c28 = "/*";
+  var peg$c29 = "*/";
+  var peg$c30 = "@";
+  var peg$c31 = "\n";
+  var peg$c32 = "\r\n";
+  var peg$c33 = "\r";
+  var peg$c34 = "{";
+  var peg$c35 = ",";
+  var peg$c36 = "#!";
+  var peg$c37 = "\u2192";
+  var peg$c38 = "->";
+  var peg$c39 = "'";
+  var peg$c40 = "`";
+  var peg$c41 = "${";
 
   var peg$r0 = /^[0-9]/;
   var peg$r1 = /^[^(){}[\]<>\-=,\/:`"'\xAB\xBB\\ \u2192\u21D2\t\n\r]/;
   var peg$r2 = /^[ \t]/;
-  var peg$r3 = /^[^(){}[\],:\/\\ \t\n\r]/;
-  var peg$r4 = /^[^\n\r]/;
-  var peg$r5 = /^[+\-]/;
+  var peg$r3 = /^[A-Za-z]/;
+  var peg$r4 = /^[^(){}[\],:\/\\ \t\n\r]/;
+  var peg$r5 = /^[^\n\r]/;
+  var peg$r6 = /^[+\-]/;
 
   var peg$e0 = peg$otherExpectation("absolute file path");
   var peg$e1 = peg$literalExpectation("//", false);
@@ -278,71 +273,63 @@ function peg$parse(input, options) {
   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$e27 = peg$otherExpectation("floating-point number");
+  var peg$e28 = peg$literalExpectation(".", false);
+  var peg$e29 = peg$otherExpectation("function composition");
+  var peg$e30 = peg$otherExpectation("parenthetical group");
+  var peg$e31 = peg$literalExpectation("(", false);
+  var peg$e32 = peg$otherExpectation("guillemet string");
+  var peg$e33 = peg$literalExpectation("\xAB", false);
+  var peg$e34 = peg$literalExpectation("\xBB", false);
+  var peg$e35 = peg$literalExpectation("~", 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$e38 = peg$literalExpectation("/", false);
+  var peg$e39 = peg$otherExpectation("identifier");
+  var peg$e40 = peg$classExpectation(["(", ")", "{", "}", "[", "]", "<", ">", "-", "=", ",", "/", ":", "`", "\"", "'", "\xAB", "\xBB", "\\", " ", "\u2192", "\u21D2", "\t", "\n", "\r"], true, false);
+  var peg$e41 = peg$literalExpectation("-", false);
+  var peg$e42 = peg$literalExpectation(">", false);
+  var peg$e43 = peg$otherExpectation("arguments with implicit parentheses");
+  var peg$e44 = peg$classExpectation([" ", "\t"], false, false);
+  var peg$e45 = peg$otherExpectation("integer");
+  var peg$e46 = peg$otherExpectation("lambda function");
+  var peg$e47 = peg$literalExpectation("=", false);
+  var peg$e48 = peg$otherExpectation("path with a leading slash");
   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 key");
-  var peg$e60 = peg$otherExpectation("object property");
-  var peg$e61 = peg$otherExpectation("object identifier");
-  var peg$e62 = peg$otherExpectation("function arguments in parentheses");
-  var peg$e63 = peg$otherExpectation("slash-separated path");
-  var peg$e64 = peg$classExpectation(["(", ")", "{", "}", "[", "]", ",", ":", "/", "\\", " ", "\t", "\n", "\r"], true, false);
-  var peg$e65 = peg$otherExpectation("function call using protocol: syntax");
-  var peg$e66 = peg$otherExpectation("protocol");
-  var peg$e67 = peg$otherExpectation("reserved protocol");
-  var peg$e68 = peg$literalExpectation("explore", false);
-  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$literalExpectation("`", false);
-  var peg$e87 = peg$otherExpectation("template");
-  var peg$e88 = peg$literalExpectation("${", false);
-  var peg$e89 = peg$otherExpectation("template text");
-  var peg$e90 = peg$otherExpectation("template literal");
-  var peg$e91 = peg$otherExpectation("template substitution");
+  var peg$e52 = peg$literalExpectation("@", false);
+  var peg$e53 = peg$classExpectation([["A", "Z"], ["a", "z"]], false, false);
+  var peg$e54 = peg$literalExpectation("\n", false);
+  var peg$e55 = peg$literalExpectation("\r\n", false);
+  var peg$e56 = peg$literalExpectation("\r", false);
+  var peg$e57 = peg$otherExpectation("number");
+  var peg$e58 = peg$otherExpectation("object literal");
+  var peg$e59 = peg$literalExpectation("{", false);
+  var peg$e60 = peg$otherExpectation("object getter");
+  var peg$e61 = peg$otherExpectation("object key");
+  var peg$e62 = peg$otherExpectation("object property");
+  var peg$e63 = peg$otherExpectation("object identifier");
+  var peg$e64 = peg$otherExpectation("function arguments in parentheses");
+  var peg$e65 = peg$otherExpectation("slash-separated path");
+  var peg$e66 = peg$classExpectation(["(", ")", "{", "}", "[", "]", ",", ":", "/", "\\", " ", "\t", "\n", "\r"], true, false);
+  var peg$e67 = peg$otherExpectation("Origami program");
+  var peg$e68 = peg$otherExpectation("scope reference");
+  var peg$e69 = peg$literalExpectation(",", false);
+  var peg$e70 = peg$literalExpectation("#!", false);
+  var peg$e71 = peg$classExpectation(["\n", "\r"], true, false);
+  var peg$e72 = peg$classExpectation(["+", "-"], false, false);
+  var peg$e73 = peg$literalExpectation("\u2192", false);
+  var peg$e74 = peg$literalExpectation("->", false);
+  var peg$e75 = peg$otherExpectation("single quote string");
+  var peg$e76 = peg$literalExpectation("'", false);
+  var peg$e77 = peg$otherExpectation("string");
+  var peg$e78 = peg$literalExpectation("`", false);
+  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$otherExpectation("template substitution");
 
   var peg$f0 = function() {
     return null;
@@ -371,147 +358,168 @@ function peg$parse(input, options) {
   var peg$f8 = function(chars) {
     return annotate([ops.literal, chars.join("")], location());
   };
-  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() {
+  var peg$f9 = function(host, path) {
+      return annotate([host, ...(path ?? [])], location());
+    };
+  var peg$f10 = function() { return "\0"; };
+  var peg$f11 = function() { return "\b"; };
+  var peg$f12 = function() { return "\f"; };
+  var peg$f13 = function() { return "\n"; };
+  var peg$f14 = function() { return "\r"; };
+  var peg$f15 = function() { return "\t"; };
+  var peg$f16 = function() { return "\v"; };
+  var peg$f17 = function() {
       return annotate([ops.literal, parseFloat(text())], location());
     };
-  var peg$f17 = function(target, chain, end) {
+  var peg$f18 = function(target, chain, end) {
       if (end) {
         chain.push(end);
       }
       return annotate(makeFunctionCall(target, chain, location()), location());
     };
-  var peg$f18 = function(target, chain, end) {
+  var peg$f19 = function(target, chain, end) {
       if (end) {
         chain.push(end);
       }
       return annotate(makeFunctionCall(target, chain, location()), location());
     };
-  var peg$f19 = function(expr) {
-      return annotate(expr, location());
+  var peg$f20 = function(ref) {
+    // If the reference looks like a builtin name, we treat it as a builtin
+    // reference, otherwise it's a regular scope reference. We can't make this
+    // distinction in the grammar.
+    const name = ref[1];
+      const builtinRegex = /^[A-Za-z][A-Za-z0-9]*$/;
+      const op = builtinRegex.test(name) ? ops.builtin : ops.scope;
+      return annotate([op, name], location());
     };
-  var peg$f20 = function(chars) {
+  var peg$f21 = function(pipeline) {
+    return annotate(pipeline, location());
+  };
+  var peg$f22 = function(chars) {
     return annotate([ops.literal, chars.join("")], location());
   };
-  var peg$f21 = function(identifier, port) {
+  var peg$f23 = function() {
+      return annotate([ops.homeTree], location());
+    };
+  var peg$f24 = function(identifier, port, slash) {
     const portText = port ? `:${port[1]}` : "";
-    const hostText = identifier + portText;
+    const slashText = slash ? "/" : "";
+    const hostText = identifier + portText + slashText;
     return annotate([ops.literal, hostText], location());
   };
-  var peg$f22 = function(chars) { return chars.join(""); };
-  var peg$f23 = function(list) {
+  var peg$f25 = function(chars) { return chars.join(""); };
+  var peg$f26 = function(list) {
       return annotate(list, location());
     };
-  var peg$f24 = function(args) {
-      /* Stuff */
-      return annotate(args, location());
-    };
-  var peg$f25 = function() {
+  var peg$f27 = function() {
       return annotate([ops.literal, parseInt(text())], location());
     };
-  var peg$f26 = function(expr) {
-      return annotate([ops.lambda, ["_"], expr], location());
+  var peg$f28 = function(pipeline) {
+      return annotate([ops.lambda, ["_"], pipeline], location());
     };
-  var peg$f27 = function(path) {
+  var peg$f29 = function(path) {
       return annotate(path ?? [], location());
     };
-  var peg$f28 = function(list) {
-      return annotate(list, location());
+  var peg$f30 = function(values) {
+      return annotate(values, location());
+    };
+  var peg$f31 = function() { return null; };
+  var peg$f32 = function(at, chars) {
+    return annotate([ops.builtin, (at ?? "") + chars.join("") + ":"], location());
+  };
+  var peg$f33 = function(fn, path) {
+      return annotate(makeFunctionCall(fn, [path], location()), location());
+    };
+  var peg$f34 = function(fn, path) {
+      return annotate(makeFunctionCall(fn, [path], location()), location());
     };
-  var peg$f29 = function() { return null; };
-  var peg$f30 = function(entries) {
+  var peg$f35 = function(entries) {
       return annotate(makeObject(entries ?? [], ops.object), location());
     };
-  var peg$f31 = function(entries) {
+  var peg$f36 = function(entries) {
       return annotate(entries, location());
     };
-  var peg$f32 = function(key, value) {
-      return annotate(makeProperty(key, [ops.getter, value]), location());
+  var peg$f37 = function(key, pipeline) {
+      return annotate(
+        makeProperty(key, annotate([ops.getter, pipeline], location())),
+        location()
+      );
     };
-  var peg$f33 = function(hiddenKey) { return hiddenKey.join(""); };
-  var peg$f34 = function(key, value) {
-      return annotate(makeProperty(key, value), location());
+  var peg$f38 = function(hiddenKey) { return hiddenKey.join(""); };
+  var peg$f39 = function(key, pipeline) {
+      return annotate(makeProperty(key, pipeline), location());
     };
-  var peg$f35 = function(key) {
+  var peg$f40 = function(key) {
       return annotate([key, [ops.inherited, key]], location());
     };
-  var peg$f36 = function(identifier, slash) {
+  var peg$f41 = function(identifier, slash) {
     return identifier + (slash ?? "");
   };
-  var peg$f37 = function(string) {
+  var peg$f42 = function(string) {
     // Remove `ops.literal` from the string code
     return string[1];
   };
-  var peg$f38 = function(parameters, expr) {
-      return annotate([ops.lambda, parameters ?? [], expr], location());
+  var peg$f43 = function(parameters, pipeline) {
+      return annotate([ops.lambda, parameters ?? [], pipeline], location());
     };
-  var peg$f39 = function(list) {
+  var peg$f44 = function(list) {
       return annotate(list ?? [undefined], location());
     };
-  var peg$f40 = function(steps) {
-      return annotate(makePipeline(steps), location());
-    };
-  var peg$f41 = function(head, tail) {
+  var peg$f45 = function(head, tail) {
       let path = tail ? [...head, tail] : head;
       // Remove parts for consecutive slashes
       path = path.filter((part) => part[1] !== "/");
       return annotate(path, location());
     };
-  var peg$f42 = function(chars) {
+  var peg$f46 = function(head, tail) {
+      let path = tail ? [...head, tail] : head;
+      // Remove parts for consecutive slashes
+      path = path.filter((part) => part[1] !== "/");
+      return annotate(path, location());
+  };
+  var peg$f47 = function(chars) {
     return annotate([ops.literal, chars.join("") + "/"], location());
   };
-  var peg$f43 = function(chars) {
+  var peg$f48 = function(chars) {
     return annotate([ops.literal, chars.join("")], location());
   };
-  var peg$f44 = function(protocol, host, path) {
-      return annotate([protocol, host, ...(path ?? [])], location());
+  var peg$f49 = function(head, tail) {
+      return tail.length === 0
+        ? head
+        : annotate(makePipeline([head, ...tail]), location());
     };
-  var peg$f45 = function() { return ops.explorableSite; };
-  var peg$f46 = function() { return ops.https; };
-  var peg$f47 = function() { return ops.http; };
-  var peg$f48 = function() { return ops.constructor; };
-  var peg$f49 = function() { return [ops.scope, "@package"] };
-  var peg$f50 = function() { return ops.treeHttps; };
-  var peg$f51 = function() { return ops.treeHttp; };
-  var peg$f52 = function() { return ops.treeHttps; };
-  var peg$f53 = function(key) {
+  var peg$f50 = function(key) {
       return annotate([ops.scope, key], location());
     };
-  var peg$f54 = function(ref, path) {
+  var peg$f51 = function(ref, path) {
       const head = [ops.scope, `${ ref[1] }/`];
       head.location = ref.location;
-      return annotate([ops.traverse, head, ...path], location());
+      return annotate([ops.traverse, head, ...(path ?? [])], location());
     };
-  var peg$f55 = function() { return null; };
-  var peg$f56 = function() { return null; };
-  var peg$f57 = function(chars) {
+  var peg$f52 = function() { return null; };
+  var peg$f53 = function() { return null; };
+  var peg$f54 = function(chars) {
     return annotate([ops.literal, chars.join("")], location());
   };
-  var peg$f58 = function(expr) {
-      return annotate([ops.spread, expr], location());
+  var peg$f55 = function(value) {
+      return annotate([ops.spread, value], location());
     };
-  var peg$f59 = function(tag, contents) {
+  var peg$f56 = function(tag, contents) {
       return annotate(makeTemplate(tag, contents[0], contents[1]), location());
     };
-  var peg$f60 = function(contents) {
+  var peg$f57 = function(contents) {
       return annotate([ops.lambda, ["_"], contents], location());
     };
-  var peg$f61 = function(head, tail) {
+  var peg$f58 = function(head, tail) {
       return annotate(makeTemplate(ops.template, head, tail), location());
     };
-  var peg$f62 = function(chars) {
+  var peg$f59 = function(chars) {
       return chars.join("");
     };
-  var peg$f63 = function(contents) {
+  var peg$f60 = function(contents) {
       return annotate(makeTemplate(ops.template, contents[0], contents[1]), location());
     };
-  var peg$f64 = function(chars) {
+  var peg$f61 = function(chars) {
       return chars.join("");
     };
   var peg$currPos = options.peg$currPos | 0;
@@ -872,22 +880,19 @@ function peg$parse(input, options) {
     peg$silentFails++;
     s0 = peg$parseabsoluteFilePath();
     if (s0 === peg$FAILED) {
-      s0 = peg$parsearray();
+      s0 = peg$parsescopeTraverse();
       if (s0 === peg$FAILED) {
-        s0 = peg$parseobject();
+        s0 = peg$parsearray();
         if (s0 === peg$FAILED) {
-          s0 = peg$parselambda();
+          s0 = peg$parseobject();
           if (s0 === peg$FAILED) {
-            s0 = peg$parseparameterizedLambda();
+            s0 = peg$parsegroup();
             if (s0 === peg$FAILED) {
-              s0 = peg$parseprotocolCall();
+              s0 = peg$parsenamespacePath();
               if (s0 === peg$FAILED) {
-                s0 = peg$parsegroup();
+                s0 = peg$parsenamespace();
                 if (s0 === peg$FAILED) {
-                  s0 = peg$parsescopeTraverse();
-                  if (s0 === peg$FAILED) {
-                    s0 = peg$parsescopeReference();
-                  }
+                  s0 = peg$parsefunctionReference();
                 }
               }
             }
@@ -1155,6 +1160,38 @@ function peg$parse(input, options) {
     return s0;
   }
 
+  function peg$parsedoubleSlashPath() {
+    var s0, s1, s2, s3;
+
+    s0 = peg$currPos;
+    if (input.substr(peg$currPos, 2) === peg$c0) {
+      s1 = peg$c0;
+      peg$currPos += 2;
+    } else {
+      s1 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$e1); }
+    }
+    if (s1 !== peg$FAILED) {
+      s2 = peg$parsehost();
+      if (s2 !== peg$FAILED) {
+        s3 = peg$parsepath();
+        if (s3 === peg$FAILED) {
+          s3 = null;
+        }
+        peg$savedPos = s0;
+        s0 = peg$f9(s2, s3);
+      } else {
+        peg$currPos = s0;
+        s0 = peg$FAILED;
+      }
+    } else {
+      peg$currPos = s0;
+      s0 = peg$FAILED;
+    }
+
+    return s0;
+  }
+
   function peg$parseellipsis() {
     var s0;
 
@@ -1192,7 +1229,7 @@ function peg$parse(input, options) {
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f9();
+      s1 = peg$f10();
     }
     s0 = s1;
     if (s0 === peg$FAILED) {
@@ -1206,7 +1243,7 @@ function peg$parse(input, options) {
       }
       if (s1 !== peg$FAILED) {
         peg$savedPos = s0;
-        s1 = peg$f10();
+        s1 = peg$f11();
       }
       s0 = s1;
       if (s0 === peg$FAILED) {
@@ -1220,7 +1257,7 @@ function peg$parse(input, options) {
         }
         if (s1 !== peg$FAILED) {
           peg$savedPos = s0;
-          s1 = peg$f11();
+          s1 = peg$f12();
         }
         s0 = s1;
         if (s0 === peg$FAILED) {
@@ -1234,7 +1271,7 @@ function peg$parse(input, options) {
           }
           if (s1 !== peg$FAILED) {
             peg$savedPos = s0;
-            s1 = peg$f12();
+            s1 = peg$f13();
           }
           s0 = s1;
           if (s0 === peg$FAILED) {
@@ -1248,7 +1285,7 @@ function peg$parse(input, options) {
             }
             if (s1 !== peg$FAILED) {
               peg$savedPos = s0;
-              s1 = peg$f13();
+              s1 = peg$f14();
             }
             s0 = s1;
             if (s0 === peg$FAILED) {
@@ -1262,7 +1299,7 @@ function peg$parse(input, options) {
               }
               if (s1 !== peg$FAILED) {
                 peg$savedPos = s0;
-                s1 = peg$f14();
+                s1 = peg$f15();
               }
               s0 = s1;
               if (s0 === peg$FAILED) {
@@ -1276,7 +1313,7 @@ function peg$parse(input, options) {
                 }
                 if (s1 !== peg$FAILED) {
                   peg$savedPos = s0;
-                  s1 = peg$f15();
+                  s1 = peg$f16();
                 }
                 s0 = s1;
                 if (s0 === peg$FAILED) {
@@ -1322,37 +1359,19 @@ function peg$parse(input, options) {
     return s0;
   }
 
-  function peg$parseexpr() {
-    var s0;
-
-    s0 = peg$parsepipeline();
-
-    return s0;
-  }
-
   function peg$parseexpression() {
-    var s0, s1, s2, s3, s4;
+    var s0, s1, s2, s3;
 
-    peg$silentFails++;
     s0 = peg$currPos;
-    s1 = peg$parseshebang();
-    if (s1 === peg$FAILED) {
-      s1 = null;
-    }
-    s2 = peg$parse__();
-    s3 = peg$parsepipeline();
-    if (s3 !== peg$FAILED) {
-      s4 = peg$parse__();
-      s0 = s3;
+    s1 = peg$parse__();
+    s2 = peg$parsepipeline();
+    if (s2 !== peg$FAILED) {
+      s3 = peg$parse__();
+      s0 = s2;
     } else {
       peg$currPos = s0;
       s0 = peg$FAILED;
     }
-    peg$silentFails--;
-    if (s0 === peg$FAILED) {
-      s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e27); }
-    }
 
     return s0;
   }
@@ -1375,13 +1394,13 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s3 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e29); }
+      if (peg$silentFails === 0) { peg$fail(peg$e28); }
     }
     if (s3 !== peg$FAILED) {
       s4 = peg$parsedigits();
       if (s4 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f16();
+        s0 = peg$f17();
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -1393,7 +1412,7 @@ function peg$parse(input, options) {
     peg$silentFails--;
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e28); }
+      if (peg$silentFails === 0) { peg$fail(peg$e27); }
     }
 
     return s0;
@@ -1422,7 +1441,7 @@ function peg$parse(input, options) {
           s3 = null;
         }
         peg$savedPos = s0;
-        s0 = peg$f17(s1, s2, s3);
+        s0 = peg$f18(s1, s2, s3);
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -1444,7 +1463,7 @@ function peg$parse(input, options) {
         s3 = peg$parseimplicitParensArgs();
         if (s3 !== peg$FAILED) {
           peg$savedPos = s0;
-          s0 = peg$f18(s1, s2, s3);
+          s0 = peg$f19(s1, s2, s3);
         } else {
           peg$currPos = s0;
           s0 = peg$FAILED;
@@ -1457,8 +1476,22 @@ function peg$parse(input, options) {
     peg$silentFails--;
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e30); }
+      if (peg$silentFails === 0) { peg$fail(peg$e29); }
+    }
+
+    return s0;
+  }
+
+  function peg$parsefunctionReference() {
+    var s0, s1;
+
+    s0 = peg$currPos;
+    s1 = peg$parsescopeReference();
+    if (s1 !== peg$FAILED) {
+      peg$savedPos = s0;
+      s1 = peg$f20(s1);
     }
+    s0 = s1;
 
     return s0;
   }
@@ -1473,7 +1506,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e32); }
+      if (peg$silentFails === 0) { peg$fail(peg$e31); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$parse__();
@@ -1483,7 +1516,7 @@ function peg$parse(input, options) {
         s5 = peg$parseclosingParen();
         if (s5 !== peg$FAILED) {
           peg$savedPos = s0;
-          s0 = peg$f19(s3);
+          s0 = peg$f21(s3);
         } else {
           peg$currPos = s0;
           s0 = peg$FAILED;
@@ -1499,7 +1532,7 @@ function peg$parse(input, options) {
     peg$silentFails--;
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e31); }
+      if (peg$silentFails === 0) { peg$fail(peg$e30); }
     }
 
     return s0;
@@ -1515,7 +1548,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e34); }
+      if (peg$silentFails === 0) { peg$fail(peg$e33); }
     }
     if (s1 !== peg$FAILED) {
       s2 = [];
@@ -1529,11 +1562,11 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s3 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e35); }
+        if (peg$silentFails === 0) { peg$fail(peg$e34); }
       }
       if (s3 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f20(s2);
+        s0 = peg$f22(s2);
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -1545,7 +1578,7 @@ function peg$parse(input, options) {
     peg$silentFails--;
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e33); }
+      if (peg$silentFails === 0) { peg$fail(peg$e32); }
     }
 
     return s0;
@@ -1562,7 +1595,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s2 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e35); }
+      if (peg$silentFails === 0) { peg$fail(peg$e34); }
     }
     if (s2 === peg$FAILED) {
       s2 = peg$parsenewLine();
@@ -1590,6 +1623,26 @@ function peg$parse(input, options) {
     return s0;
   }
 
+  function peg$parsehomeTree() {
+    var s0, s1;
+
+    s0 = peg$currPos;
+    if (input.charCodeAt(peg$currPos) === 126) {
+      s1 = peg$c22;
+      peg$currPos++;
+    } else {
+      s1 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$e35); }
+    }
+    if (s1 !== peg$FAILED) {
+      peg$savedPos = s0;
+      s1 = peg$f23();
+    }
+    s0 = s1;
+
+    return s0;
+  }
+
   function peg$parsehost() {
     var s0, s1, s2, s3, s4;
 
@@ -1599,7 +1652,7 @@ function peg$parse(input, options) {
     if (s1 !== peg$FAILED) {
       s2 = peg$currPos;
       if (input.charCodeAt(peg$currPos) === 58) {
-        s3 = peg$c22;
+        s3 = peg$c23;
         peg$currPos++;
       } else {
         s3 = peg$FAILED;
@@ -1620,8 +1673,18 @@ function peg$parse(input, options) {
       if (s2 === peg$FAILED) {
         s2 = null;
       }
+      if (input.charCodeAt(peg$currPos) === 47) {
+        s3 = peg$c24;
+        peg$currPos++;
+      } else {
+        s3 = peg$FAILED;
+        if (peg$silentFails === 0) { peg$fail(peg$e38); }
+      }
+      if (s3 === peg$FAILED) {
+        s3 = null;
+      }
       peg$savedPos = s0;
-      s0 = peg$f21(s1, s2);
+      s0 = peg$f24(s1, s2, s3);
     } else {
       peg$currPos = s0;
       s0 = peg$FAILED;
@@ -1652,13 +1715,13 @@ function peg$parse(input, options) {
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f22(s1);
+      s1 = peg$f25(s1);
     }
     s0 = s1;
     peg$silentFails--;
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e38); }
+      if (peg$silentFails === 0) { peg$fail(peg$e39); }
     }
 
     return s0;
@@ -1672,26 +1735,26 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e39); }
+      if (peg$silentFails === 0) { peg$fail(peg$e40); }
     }
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
       if (input.charCodeAt(peg$currPos) === 45) {
-        s1 = peg$c23;
+        s1 = peg$c25;
         peg$currPos++;
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e40); }
+        if (peg$silentFails === 0) { peg$fail(peg$e41); }
       }
       if (s1 !== peg$FAILED) {
         s2 = peg$currPos;
         peg$silentFails++;
         if (input.charCodeAt(peg$currPos) === 62) {
-          s3 = peg$c24;
+          s3 = peg$c26;
           peg$currPos++;
         } else {
           s3 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e41); }
+          if (peg$silentFails === 0) { peg$fail(peg$e42); }
         }
         peg$silentFails--;
         if (s3 === peg$FAILED) {
@@ -1753,7 +1816,7 @@ function peg$parse(input, options) {
         s2 = null;
       }
       peg$savedPos = s0;
-      s0 = peg$f23(s1);
+      s0 = peg$f26(s1);
     } else {
       peg$currPos = s0;
       s0 = peg$FAILED;
@@ -1763,7 +1826,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parseimplicitParensArgs() {
-    var s0, s1, s2, s3, s4, s5;
+    var s0, s1, s2;
 
     peg$silentFails++;
     s0 = peg$currPos;
@@ -1778,38 +1841,9 @@ function peg$parse(input, options) {
       s1 = peg$FAILED;
     }
     if (s1 !== peg$FAILED) {
-      s2 = peg$currPos;
-      s3 = [];
-      s4 = peg$parsestep();
-      while (s4 !== peg$FAILED) {
-        s3.push(s4);
-        s4 = peg$currPos;
-        s5 = peg$parseseparator();
-        if (s5 !== peg$FAILED) {
-          s5 = peg$parsestep();
-          if (s5 === peg$FAILED) {
-            peg$currPos = s4;
-            s4 = peg$FAILED;
-          } else {
-            s4 = s5;
-          }
-        } else {
-          s4 = s5;
-        }
-      }
-      if (s3.length < 1) {
-        peg$currPos = s2;
-        s2 = peg$FAILED;
-      } else {
-        s2 = s3;
-      }
+      s2 = peg$parselist();
       if (s2 !== peg$FAILED) {
-        s3 = peg$parseseparator();
-        if (s3 === peg$FAILED) {
-          s3 = null;
-        }
-        peg$savedPos = s0;
-        s0 = peg$f24(s2);
+        s0 = s2;
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -1821,7 +1855,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$e43); }
     }
 
     return s0;
@@ -1835,7 +1869,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e43); }
+      if (peg$silentFails === 0) { peg$fail(peg$e44); }
     }
 
     return s0;
@@ -1853,7 +1887,7 @@ function peg$parse(input, options) {
     s2 = peg$parsedigits();
     if (s2 !== peg$FAILED) {
       peg$savedPos = s0;
-      s0 = peg$f25();
+      s0 = peg$f27();
     } else {
       peg$currPos = s0;
       s0 = peg$FAILED;
@@ -1861,7 +1895,7 @@ function peg$parse(input, options) {
     peg$silentFails--;
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e44); }
+      if (peg$silentFails === 0) { peg$fail(peg$e45); }
     }
 
     return s0;
@@ -1873,18 +1907,18 @@ function peg$parse(input, options) {
     peg$silentFails++;
     s0 = peg$currPos;
     if (input.charCodeAt(peg$currPos) === 61) {
-      s1 = peg$c25;
+      s1 = peg$c27;
       peg$currPos++;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e46); }
+      if (peg$silentFails === 0) { peg$fail(peg$e47); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$parse__();
       s3 = peg$parsepipeline();
       if (s3 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f26(s3);
+        s0 = peg$f28(s3);
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -1896,7 +1930,7 @@ function peg$parse(input, options) {
     peg$silentFails--;
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e45); }
+      if (peg$silentFails === 0) { peg$fail(peg$e46); }
     }
 
     return s0;
@@ -1908,16 +1942,19 @@ function peg$parse(input, options) {
     peg$silentFails++;
     s0 = peg$currPos;
     if (input.charCodeAt(peg$currPos) === 47) {
-      s1 = peg$c26;
+      s1 = peg$c24;
       peg$currPos++;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e48); }
+      if (peg$silentFails === 0) { peg$fail(peg$e38); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$parsepath();
+      if (s2 === peg$FAILED) {
+        s2 = null;
+      }
       peg$savedPos = s0;
-      s0 = peg$f27(s2);
+      s0 = peg$f29(s2);
     } else {
       peg$currPos = s0;
       s0 = peg$FAILED;
@@ -1925,7 +1962,7 @@ function peg$parse(input, options) {
     peg$silentFails--;
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e47); }
+      if (peg$silentFails === 0) { peg$fail(peg$e48); }
     }
 
     return s0;
@@ -1938,13 +1975,13 @@ function peg$parse(input, options) {
     s0 = peg$currPos;
     s1 = peg$currPos;
     s2 = [];
-    s3 = peg$parsepipeline();
+    s3 = peg$parsevalue();
     while (s3 !== peg$FAILED) {
       s2.push(s3);
       s3 = peg$currPos;
       s4 = peg$parseseparator();
       if (s4 !== peg$FAILED) {
-        s4 = peg$parsepipeline();
+        s4 = peg$parsevalue();
         if (s4 === peg$FAILED) {
           peg$currPos = s3;
           s3 = peg$FAILED;
@@ -1967,7 +2004,7 @@ function peg$parse(input, options) {
         s2 = null;
       }
       peg$savedPos = s0;
-      s0 = peg$f28(s1);
+      s0 = peg$f30(s1);
     } else {
       peg$currPos = s0;
       s0 = peg$FAILED;
@@ -1985,8 +2022,8 @@ function peg$parse(input, options) {
     var s0, s1, s2, s3, s4, s5;
 
     s0 = peg$currPos;
-    if (input.substr(peg$currPos, 2) === peg$c27) {
-      s1 = peg$c27;
+    if (input.substr(peg$currPos, 2) === peg$c28) {
+      s1 = peg$c28;
       peg$currPos += 2;
     } else {
       s1 = peg$FAILED;
@@ -1997,8 +2034,8 @@ function peg$parse(input, options) {
       s3 = peg$currPos;
       s4 = peg$currPos;
       peg$silentFails++;
-      if (input.substr(peg$currPos, 2) === peg$c28) {
-        s5 = peg$c28;
+      if (input.substr(peg$currPos, 2) === peg$c29) {
+        s5 = peg$c29;
         peg$currPos += 2;
       } else {
         s5 = peg$FAILED;
@@ -2035,8 +2072,8 @@ function peg$parse(input, options) {
         s3 = peg$currPos;
         s4 = peg$currPos;
         peg$silentFails++;
-        if (input.substr(peg$currPos, 2) === peg$c28) {
-          s5 = peg$c28;
+        if (input.substr(peg$currPos, 2) === peg$c29) {
+          s5 = peg$c29;
           peg$currPos += 2;
         } else {
           s5 = peg$FAILED;
@@ -2069,8 +2106,8 @@ function peg$parse(input, options) {
           s3 = peg$FAILED;
         }
       }
-      if (input.substr(peg$currPos, 2) === peg$c28) {
-        s3 = peg$c28;
+      if (input.substr(peg$currPos, 2) === peg$c29) {
+        s3 = peg$c29;
         peg$currPos += 2;
       } else {
         s3 = peg$FAILED;
@@ -2078,7 +2115,88 @@ function peg$parse(input, options) {
       }
       if (s3 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f29();
+        s0 = peg$f31();
+      } else {
+        peg$currPos = s0;
+        s0 = peg$FAILED;
+      }
+    } else {
+      peg$currPos = s0;
+      s0 = peg$FAILED;
+    }
+
+    return s0;
+  }
+
+  function peg$parsenamespace() {
+    var s0, s1, s2, s3;
+
+    s0 = peg$currPos;
+    if (input.charCodeAt(peg$currPos) === 64) {
+      s1 = peg$c30;
+      peg$currPos++;
+    } else {
+      s1 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$e52); }
+    }
+    if (s1 === peg$FAILED) {
+      s1 = null;
+    }
+    s2 = [];
+    s3 = input.charAt(peg$currPos);
+    if (peg$r3.test(s3)) {
+      peg$currPos++;
+    } else {
+      s3 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$e53); }
+    }
+    if (s3 !== peg$FAILED) {
+      while (s3 !== peg$FAILED) {
+        s2.push(s3);
+        s3 = input.charAt(peg$currPos);
+        if (peg$r3.test(s3)) {
+          peg$currPos++;
+        } else {
+          s3 = peg$FAILED;
+          if (peg$silentFails === 0) { peg$fail(peg$e53); }
+        }
+      }
+    } else {
+      s2 = peg$FAILED;
+    }
+    if (s2 !== peg$FAILED) {
+      if (input.charCodeAt(peg$currPos) === 58) {
+        s3 = peg$c23;
+        peg$currPos++;
+      } else {
+        s3 = peg$FAILED;
+        if (peg$silentFails === 0) { peg$fail(peg$e37); }
+      }
+      if (s3 !== peg$FAILED) {
+        peg$savedPos = s0;
+        s0 = peg$f32(s1, s2);
+      } else {
+        peg$currPos = s0;
+        s0 = peg$FAILED;
+      }
+    } else {
+      peg$currPos = s0;
+      s0 = peg$FAILED;
+    }
+
+    return s0;
+  }
+
+  function peg$parsenamespacePath() {
+    var s0, s1, s2;
+
+    s0 = peg$currPos;
+    s1 = peg$parsenamespace();
+    if (s1 !== peg$FAILED) {
+      s2 = peg$parsedoubleSlashPath();
+      if (s2 !== peg$FAILED) {
+        peg$savedPos = s0;
+        s0 = peg$f33(s1, s2);
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -2087,6 +2205,23 @@ function peg$parse(input, options) {
       peg$currPos = s0;
       s0 = peg$FAILED;
     }
+    if (s0 === peg$FAILED) {
+      s0 = peg$currPos;
+      s1 = peg$parsenamespace();
+      if (s1 !== peg$FAILED) {
+        s2 = peg$parsepath();
+        if (s2 !== peg$FAILED) {
+          peg$savedPos = s0;
+          s0 = peg$f34(s1, s2);
+        } else {
+          peg$currPos = s0;
+          s0 = peg$FAILED;
+        }
+      } else {
+        peg$currPos = s0;
+        s0 = peg$FAILED;
+      }
+    }
 
     return s0;
   }
@@ -2095,27 +2230,27 @@ function peg$parse(input, options) {
     var s0;
 
     if (input.charCodeAt(peg$currPos) === 10) {
-      s0 = peg$c29;
+      s0 = peg$c31;
       peg$currPos++;
     } else {
       s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e52); }
+      if (peg$silentFails === 0) { peg$fail(peg$e54); }
     }
     if (s0 === peg$FAILED) {
-      if (input.substr(peg$currPos, 2) === peg$c30) {
-        s0 = peg$c30;
+      if (input.substr(peg$currPos, 2) === peg$c32) {
+        s0 = peg$c32;
         peg$currPos += 2;
       } else {
         s0 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e53); }
+        if (peg$silentFails === 0) { peg$fail(peg$e55); }
       }
       if (s0 === peg$FAILED) {
         if (input.charCodeAt(peg$currPos) === 13) {
-          s0 = peg$c31;
+          s0 = peg$c33;
           peg$currPos++;
         } else {
           s0 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e54); }
+          if (peg$silentFails === 0) { peg$fail(peg$e56); }
         }
       }
     }
@@ -2134,7 +2269,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$e57); }
     }
 
     return s0;
@@ -2146,11 +2281,11 @@ function peg$parse(input, options) {
     peg$silentFails++;
     s0 = peg$currPos;
     if (input.charCodeAt(peg$currPos) === 123) {
-      s1 = peg$c32;
+      s1 = peg$c34;
       peg$currPos++;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e57); }
+      if (peg$silentFails === 0) { peg$fail(peg$e59); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$parse__();
@@ -2162,7 +2297,7 @@ function peg$parse(input, options) {
       s5 = peg$parseclosingBrace();
       if (s5 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f30(s3);
+        s0 = peg$f35(s3);
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -2174,7 +2309,7 @@ function peg$parse(input, options) {
     peg$silentFails--;
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e56); }
+      if (peg$silentFails === 0) { peg$fail(peg$e58); }
     }
 
     return s0;
@@ -2215,7 +2350,7 @@ function peg$parse(input, options) {
         s2 = null;
       }
       peg$savedPos = s0;
-      s0 = peg$f31(s1);
+      s0 = peg$f36(s1);
     } else {
       peg$currPos = s0;
       s0 = peg$FAILED;
@@ -2250,18 +2385,18 @@ function peg$parse(input, options) {
     if (s1 !== peg$FAILED) {
       s2 = peg$parse__();
       if (input.charCodeAt(peg$currPos) === 61) {
-        s3 = peg$c25;
+        s3 = peg$c27;
         peg$currPos++;
       } else {
         s3 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e46); }
+        if (peg$silentFails === 0) { peg$fail(peg$e47); }
       }
       if (s3 !== peg$FAILED) {
         s4 = peg$parse__();
         s5 = peg$parsepipeline();
         if (s5 !== peg$FAILED) {
           peg$savedPos = s0;
-          s0 = peg$f32(s1, s5);
+          s0 = peg$f37(s1, s5);
         } else {
           peg$currPos = s0;
           s0 = peg$FAILED;
@@ -2277,7 +2412,7 @@ function peg$parse(input, options) {
     peg$silentFails--;
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e58); }
+      if (peg$silentFails === 0) { peg$fail(peg$e60); }
     }
 
     return s0;
@@ -2293,7 +2428,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s2 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e32); }
+      if (peg$silentFails === 0) { peg$fail(peg$e31); }
     }
     if (s2 !== peg$FAILED) {
       s3 = peg$parseobjectPublicKey();
@@ -2322,7 +2457,7 @@ function peg$parse(input, options) {
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f33(s1);
+      s1 = peg$f38(s1);
     }
     s0 = s1;
 
@@ -2340,7 +2475,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$e61); }
     }
 
     return s0;
@@ -2355,7 +2490,7 @@ function peg$parse(input, options) {
     if (s1 !== peg$FAILED) {
       s2 = peg$parse__();
       if (input.charCodeAt(peg$currPos) === 58) {
-        s3 = peg$c22;
+        s3 = peg$c23;
         peg$currPos++;
       } else {
         s3 = peg$FAILED;
@@ -2366,7 +2501,7 @@ function peg$parse(input, options) {
         s5 = peg$parsepipeline();
         if (s5 !== peg$FAILED) {
           peg$savedPos = s0;
-          s0 = peg$f34(s1, s5);
+          s0 = peg$f39(s1, s5);
         } else {
           peg$currPos = s0;
           s0 = peg$FAILED;
@@ -2382,7 +2517,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$e62); }
     }
 
     return s0;
@@ -2396,13 +2531,13 @@ function peg$parse(input, options) {
     s1 = peg$parseobjectPublicKey();
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f35(s1);
+      s1 = peg$f40(s1);
     }
     s0 = s1;
     peg$silentFails--;
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e61); }
+      if (peg$silentFails === 0) { peg$fail(peg$e63); }
     }
 
     return s0;
@@ -2415,17 +2550,17 @@ function peg$parse(input, options) {
     s1 = peg$parseidentifier();
     if (s1 !== peg$FAILED) {
       if (input.charCodeAt(peg$currPos) === 47) {
-        s2 = peg$c26;
+        s2 = peg$c24;
         peg$currPos++;
       } else {
         s2 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e48); }
+        if (peg$silentFails === 0) { peg$fail(peg$e38); }
       }
       if (s2 === peg$FAILED) {
         s2 = null;
       }
       peg$savedPos = s0;
-      s0 = peg$f36(s1, s2);
+      s0 = peg$f41(s1, s2);
     } else {
       peg$currPos = s0;
       s0 = peg$FAILED;
@@ -2435,7 +2570,7 @@ function peg$parse(input, options) {
       s1 = peg$parsestring();
       if (s1 !== peg$FAILED) {
         peg$savedPos = s0;
-        s1 = peg$f37(s1);
+        s1 = peg$f42(s1);
       }
       s0 = s1;
     }
@@ -2452,7 +2587,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e32); }
+      if (peg$silentFails === 0) { peg$fail(peg$e31); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$parse__();
@@ -2476,7 +2611,7 @@ function peg$parse(input, options) {
           s9 = peg$parsepipeline();
           if (s9 !== peg$FAILED) {
             peg$savedPos = s0;
-            s0 = peg$f38(s3, s9);
+            s0 = peg$f43(s3, s9);
           } else {
             peg$currPos = s0;
             s0 = peg$FAILED;
@@ -2507,7 +2642,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e32); }
+      if (peg$silentFails === 0) { peg$fail(peg$e31); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$parse__();
@@ -2525,7 +2660,7 @@ function peg$parse(input, options) {
       }
       if (s5 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f39(s3);
+        s0 = peg$f44(s3);
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -2537,69 +2672,14 @@ function peg$parse(input, options) {
     peg$silentFails--;
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e62); }
-    }
-
-    return s0;
-  }
-
-  function peg$parsepipeline() {
-    var s0, s1, s2, s3, s4, s5, s6, s7, s8;
-
-    s0 = peg$currPos;
-    s1 = peg$currPos;
-    s2 = peg$currPos;
-    s3 = [];
-    s4 = peg$parsestep();
-    while (s4 !== peg$FAILED) {
-      s3.push(s4);
-      s4 = peg$currPos;
-      s5 = peg$currPos;
-      s6 = peg$parse__();
-      s7 = peg$parsesingleArrow();
-      if (s7 !== peg$FAILED) {
-        s8 = peg$parse__();
-        s6 = [s6, s7, s8];
-        s5 = s6;
-      } else {
-        peg$currPos = s5;
-        s5 = peg$FAILED;
-      }
-      if (s5 !== peg$FAILED) {
-        s5 = peg$parsestep();
-        if (s5 === peg$FAILED) {
-          peg$currPos = s4;
-          s4 = peg$FAILED;
-        } else {
-          s4 = s5;
-        }
-      } else {
-        s4 = s5;
-      }
-    }
-    if (s3.length < 1) {
-      peg$currPos = s2;
-      s2 = peg$FAILED;
-    } else {
-      s2 = s3;
-    }
-    if (s2 !== peg$FAILED) {
-      s1 = s2;
-    } else {
-      peg$currPos = s1;
-      s1 = peg$FAILED;
-    }
-    if (s1 !== peg$FAILED) {
-      peg$savedPos = s0;
-      s1 = peg$f40(s1);
+      if (peg$silentFails === 0) { peg$fail(peg$e64); }
     }
-    s0 = s1;
 
     return s0;
   }
 
   function peg$parsepath() {
-    var s0, s1, s2;
+    var s0, s1, s2, s3;
 
     peg$silentFails++;
     s0 = peg$currPos;
@@ -2610,14 +2690,45 @@ function peg$parse(input, options) {
       s2 = peg$parsepathElement();
     }
     s2 = peg$parsepathTail();
-    if (s2 === peg$FAILED) {
-      s2 = null;
+    if (s2 !== peg$FAILED) {
+      peg$savedPos = s0;
+      s0 = peg$f45(s1, s2);
+    } else {
+      peg$currPos = s0;
+      s0 = peg$FAILED;
+    }
+    if (s0 === peg$FAILED) {
+      s0 = peg$currPos;
+      s1 = peg$currPos;
+      s2 = [];
+      s3 = peg$parsepathElement();
+      while (s3 !== peg$FAILED) {
+        s2.push(s3);
+        s3 = peg$parsepathElement();
+      }
+      if (s2.length < 1) {
+        peg$currPos = s1;
+        s1 = peg$FAILED;
+      } else {
+        s1 = s2;
+      }
+      if (s1 !== peg$FAILED) {
+        s2 = peg$parsepathTail();
+        if (s2 === peg$FAILED) {
+          s2 = null;
+        }
+        peg$savedPos = s0;
+        s0 = peg$f46(s1, s2);
+      } else {
+        peg$currPos = s0;
+        s0 = peg$FAILED;
+      }
     }
-    peg$savedPos = s0;
-    s0 = peg$f41(s1, s2);
     peg$silentFails--;
-    s1 = peg$FAILED;
-    if (peg$silentFails === 0) { peg$fail(peg$e63); }
+    if (s0 === peg$FAILED) {
+      s1 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$e65); }
+    }
 
     return s0;
   }
@@ -2633,15 +2744,15 @@ function peg$parse(input, options) {
       s2 = peg$parsepathKeyChar();
     }
     if (input.charCodeAt(peg$currPos) === 47) {
-      s2 = peg$c26;
+      s2 = peg$c24;
       peg$currPos++;
     } else {
       s2 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e48); }
+      if (peg$silentFails === 0) { peg$fail(peg$e38); }
     }
     if (s2 !== peg$FAILED) {
       peg$savedPos = s0;
-      s0 = peg$f42(s1);
+      s0 = peg$f47(s1);
     } else {
       peg$currPos = s0;
       s0 = peg$FAILED;
@@ -2654,11 +2765,11 @@ function peg$parse(input, options) {
     var s0;
 
     s0 = input.charAt(peg$currPos);
-    if (peg$r3.test(s0)) {
+    if (peg$r4.test(s0)) {
       peg$currPos++;
     } else {
       s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e64); }
+      if (peg$silentFails === 0) { peg$fail(peg$e66); }
     }
     if (s0 === peg$FAILED) {
       s0 = peg$parseescapedChar();
@@ -2683,217 +2794,94 @@ function peg$parse(input, options) {
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f43(s1);
+      s1 = peg$f48(s1);
     }
     s0 = s1;
 
     return s0;
   }
 
-  function peg$parseprotocolCall() {
-    var s0, s1, s2, s3, s4, s5;
+  function peg$parsepipeline() {
+    var s0, s1, s2, s3, s4, s5, s6, s7;
 
-    peg$silentFails++;
     s0 = peg$currPos;
-    s1 = peg$parseprotocol();
+    s1 = peg$parsevalue();
     if (s1 !== peg$FAILED) {
-      if (input.charCodeAt(peg$currPos) === 58) {
-        s2 = peg$c22;
-        peg$currPos++;
-      } else {
-        s2 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e37); }
-      }
-      if (s2 !== peg$FAILED) {
-        s3 = [];
-        if (input.charCodeAt(peg$currPos) === 47) {
-          s4 = peg$c26;
-          peg$currPos++;
+      s2 = [];
+      s3 = peg$currPos;
+      s4 = peg$parse__();
+      s5 = peg$parsesingleArrow();
+      if (s5 !== peg$FAILED) {
+        s6 = peg$parse__();
+        s7 = peg$parsepipelineStep();
+        if (s7 !== peg$FAILED) {
+          s3 = s7;
         } else {
-          s4 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e48); }
+          peg$currPos = s3;
+          s3 = peg$FAILED;
         }
-        while (s4 !== peg$FAILED) {
-          s3.push(s4);
-          if (s3.length >= 2) {
-            s4 = peg$FAILED;
+      } else {
+        peg$currPos = s3;
+        s3 = peg$FAILED;
+      }
+      while (s3 !== peg$FAILED) {
+        s2.push(s3);
+        s3 = peg$currPos;
+        s4 = peg$parse__();
+        s5 = peg$parsesingleArrow();
+        if (s5 !== peg$FAILED) {
+          s6 = peg$parse__();
+          s7 = peg$parsepipelineStep();
+          if (s7 !== peg$FAILED) {
+            s3 = s7;
           } else {
-            if (input.charCodeAt(peg$currPos) === 47) {
-              s4 = peg$c26;
-              peg$currPos++;
-            } else {
-              s4 = peg$FAILED;
-              if (peg$silentFails === 0) { peg$fail(peg$e48); }
-            }
-          }
-        }
-        s4 = peg$parsehost();
-        if (s4 !== peg$FAILED) {
-          s5 = peg$parseleadingSlashPath();
-          if (s5 === peg$FAILED) {
-            s5 = null;
+            peg$currPos = s3;
+            s3 = peg$FAILED;
           }
-          peg$savedPos = s0;
-          s0 = peg$f44(s1, s4, s5);
         } else {
-          peg$currPos = s0;
-          s0 = peg$FAILED;
+          peg$currPos = s3;
+          s3 = peg$FAILED;
         }
-      } else {
-        peg$currPos = s0;
-        s0 = peg$FAILED;
       }
+      peg$savedPos = s0;
+      s0 = peg$f49(s1, s2);
     } else {
       peg$currPos = s0;
       s0 = peg$FAILED;
     }
-    peg$silentFails--;
-    if (s0 === peg$FAILED) {
-      s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e65); }
-    }
 
     return s0;
   }
 
-  function peg$parseprotocol() {
-    var s0, s1;
+  function peg$parsepipelineStep() {
+    var s0;
 
-    peg$silentFails++;
-    s0 = peg$parsereservedProtocol();
-    if (s0 === peg$FAILED) {
-      s0 = peg$parsescopeReference();
-    }
-    peg$silentFails--;
+    s0 = peg$parselambda();
     if (s0 === peg$FAILED) {
-      s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e66); }
+      s0 = peg$parseparameterizedLambda();
+      if (s0 === peg$FAILED) {
+        s0 = peg$parsecallTarget();
+      }
     }
 
     return s0;
   }
 
-  function peg$parsereservedProtocol() {
-    var s0, s1;
+  function peg$parseprogram() {
+    var s0, s1, s2;
 
     peg$silentFails++;
     s0 = peg$currPos;
-    if (input.substr(peg$currPos, 7) === peg$c33) {
-      s1 = peg$c33;
-      peg$currPos += 7;
-    } else {
-      s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e68); }
-    }
-    if (s1 !== peg$FAILED) {
-      peg$savedPos = s0;
-      s1 = peg$f45();
+    s1 = peg$parseshebang();
+    if (s1 === peg$FAILED) {
+      s1 = null;
     }
-    s0 = s1;
-    if (s0 === peg$FAILED) {
-      s0 = peg$currPos;
-      if (input.substr(peg$currPos, 5) === peg$c34) {
-        s1 = peg$c34;
-        peg$currPos += 5;
-      } else {
-        s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e69); }
-      }
-      if (s1 !== peg$FAILED) {
-        peg$savedPos = s0;
-        s1 = peg$f46();
-      }
-      s0 = s1;
-      if (s0 === peg$FAILED) {
-        s0 = peg$currPos;
-        if (input.substr(peg$currPos, 4) === peg$c35) {
-          s1 = peg$c35;
-          peg$currPos += 4;
-        } else {
-          s1 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e70); }
-        }
-        if (s1 !== peg$FAILED) {
-          peg$savedPos = s0;
-          s1 = peg$f47();
-        }
-        s0 = s1;
-        if (s0 === peg$FAILED) {
-          s0 = peg$currPos;
-          if (input.substr(peg$currPos, 3) === peg$c36) {
-            s1 = peg$c36;
-            peg$currPos += 3;
-          } else {
-            s1 = peg$FAILED;
-            if (peg$silentFails === 0) { peg$fail(peg$e71); }
-          }
-          if (s1 !== peg$FAILED) {
-            peg$savedPos = s0;
-            s1 = peg$f48();
-          }
-          s0 = s1;
-          if (s0 === peg$FAILED) {
-            s0 = peg$currPos;
-            if (input.substr(peg$currPos, 7) === peg$c37) {
-              s1 = peg$c37;
-              peg$currPos += 7;
-            } else {
-              s1 = peg$FAILED;
-              if (peg$silentFails === 0) { peg$fail(peg$e72); }
-            }
-            if (s1 !== peg$FAILED) {
-              peg$savedPos = s0;
-              s1 = peg$f49();
-            }
-            s0 = s1;
-            if (s0 === peg$FAILED) {
-              s0 = peg$currPos;
-              if (input.substr(peg$currPos, 9) === peg$c38) {
-                s1 = peg$c38;
-                peg$currPos += 9;
-              } else {
-                s1 = peg$FAILED;
-                if (peg$silentFails === 0) { peg$fail(peg$e73); }
-              }
-              if (s1 !== peg$FAILED) {
-                peg$savedPos = s0;
-                s1 = peg$f50();
-              }
-              s0 = s1;
-              if (s0 === peg$FAILED) {
-                s0 = peg$currPos;
-                if (input.substr(peg$currPos, 8) === peg$c39) {
-                  s1 = peg$c39;
-                  peg$currPos += 8;
-                } else {
-                  s1 = peg$FAILED;
-                  if (peg$silentFails === 0) { peg$fail(peg$e74); }
-                }
-                if (s1 !== peg$FAILED) {
-                  peg$savedPos = s0;
-                  s1 = peg$f51();
-                }
-                s0 = s1;
-                if (s0 === peg$FAILED) {
-                  s0 = peg$currPos;
-                  if (input.substr(peg$currPos, 4) === peg$c40) {
-                    s1 = peg$c40;
-                    peg$currPos += 4;
-                  } else {
-                    s1 = peg$FAILED;
-                    if (peg$silentFails === 0) { peg$fail(peg$e75); }
-                  }
-                  if (s1 !== peg$FAILED) {
-                    peg$savedPos = s0;
-                    s1 = peg$f52();
-                  }
-                  s0 = s1;
-                }
-              }
-            }
-          }
-        }
-      }
+    s2 = peg$parseexpression();
+    if (s2 !== peg$FAILED) {
+      s0 = s2;
+    } else {
+      peg$currPos = s0;
+      s0 = peg$FAILED;
     }
     peg$silentFails--;
     if (s0 === peg$FAILED) {
@@ -2912,13 +2900,13 @@ function peg$parse(input, options) {
     s1 = peg$parseidentifier();
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f53(s1);
+      s1 = peg$f50(s1);
     }
     s0 = s1;
     peg$silentFails--;
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e76); }
+      if (peg$silentFails === 0) { peg$fail(peg$e68); }
     }
 
     return s0;
@@ -2931,16 +2919,19 @@ function peg$parse(input, options) {
     s1 = peg$parsescopeReference();
     if (s1 !== peg$FAILED) {
       if (input.charCodeAt(peg$currPos) === 47) {
-        s2 = peg$c26;
+        s2 = peg$c24;
         peg$currPos++;
       } else {
         s2 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e48); }
+        if (peg$silentFails === 0) { peg$fail(peg$e38); }
       }
       if (s2 !== peg$FAILED) {
         s3 = peg$parsepath();
+        if (s3 === peg$FAILED) {
+          s3 = null;
+        }
         peg$savedPos = s0;
-        s0 = peg$f54(s1, s3);
+        s0 = peg$f51(s1, s3);
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -2959,11 +2950,11 @@ function peg$parse(input, options) {
     s0 = peg$currPos;
     s1 = peg$parse__();
     if (input.charCodeAt(peg$currPos) === 44) {
-      s2 = peg$c41;
+      s2 = peg$c35;
       peg$currPos++;
     } else {
       s2 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e77); }
+      if (peg$silentFails === 0) { peg$fail(peg$e69); }
     }
     if (s2 !== peg$FAILED) {
       s3 = peg$parse__();
@@ -2984,34 +2975,34 @@ function peg$parse(input, options) {
     var s0, s1, s2, s3;
 
     s0 = peg$currPos;
-    if (input.substr(peg$currPos, 2) === peg$c42) {
-      s1 = peg$c42;
+    if (input.substr(peg$currPos, 2) === peg$c36) {
+      s1 = peg$c36;
       peg$currPos += 2;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e78); }
+      if (peg$silentFails === 0) { peg$fail(peg$e70); }
     }
     if (s1 !== peg$FAILED) {
       s2 = [];
       s3 = input.charAt(peg$currPos);
-      if (peg$r4.test(s3)) {
+      if (peg$r5.test(s3)) {
         peg$currPos++;
       } else {
         s3 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e79); }
+        if (peg$silentFails === 0) { peg$fail(peg$e71); }
       }
       while (s3 !== peg$FAILED) {
         s2.push(s3);
         s3 = input.charAt(peg$currPos);
-        if (peg$r4.test(s3)) {
+        if (peg$r5.test(s3)) {
           peg$currPos++;
         } else {
           s3 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e79); }
+          if (peg$silentFails === 0) { peg$fail(peg$e71); }
         }
       }
       peg$savedPos = s0;
-      s0 = peg$f55();
+      s0 = peg$f52();
     } else {
       peg$currPos = s0;
       s0 = peg$FAILED;
@@ -3024,11 +3015,11 @@ function peg$parse(input, options) {
     var s0;
 
     s0 = input.charAt(peg$currPos);
-    if (peg$r5.test(s0)) {
+    if (peg$r6.test(s0)) {
       peg$currPos++;
     } else {
       s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e80); }
+      if (peg$silentFails === 0) { peg$fail(peg$e72); }
     }
 
     return s0;
@@ -3038,19 +3029,19 @@ function peg$parse(input, options) {
     var s0;
 
     if (input.charCodeAt(peg$currPos) === 8594) {
-      s0 = peg$c43;
+      s0 = peg$c37;
       peg$currPos++;
     } else {
       s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e81); }
+      if (peg$silentFails === 0) { peg$fail(peg$e73); }
     }
     if (s0 === peg$FAILED) {
-      if (input.substr(peg$currPos, 2) === peg$c44) {
-        s0 = peg$c44;
+      if (input.substr(peg$currPos, 2) === peg$c38) {
+        s0 = peg$c38;
         peg$currPos += 2;
       } else {
         s0 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e82); }
+        if (peg$silentFails === 0) { peg$fail(peg$e74); }
       }
     }
 
@@ -3071,24 +3062,24 @@ function peg$parse(input, options) {
     if (s1 !== peg$FAILED) {
       s2 = [];
       s3 = input.charAt(peg$currPos);
-      if (peg$r4.test(s3)) {
+      if (peg$r5.test(s3)) {
         peg$currPos++;
       } else {
         s3 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e79); }
+        if (peg$silentFails === 0) { peg$fail(peg$e71); }
       }
       while (s3 !== peg$FAILED) {
         s2.push(s3);
         s3 = input.charAt(peg$currPos);
-        if (peg$r4.test(s3)) {
+        if (peg$r5.test(s3)) {
           peg$currPos++;
         } else {
           s3 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e79); }
+          if (peg$silentFails === 0) { peg$fail(peg$e71); }
         }
       }
       peg$savedPos = s0;
-      s0 = peg$f56();
+      s0 = peg$f53();
     } else {
       peg$currPos = s0;
       s0 = peg$FAILED;
@@ -3103,11 +3094,11 @@ function peg$parse(input, options) {
     peg$silentFails++;
     s0 = peg$currPos;
     if (input.charCodeAt(peg$currPos) === 39) {
-      s1 = peg$c45;
+      s1 = peg$c39;
       peg$currPos++;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e84); }
+      if (peg$silentFails === 0) { peg$fail(peg$e76); }
     }
     if (s1 !== peg$FAILED) {
       s2 = [];
@@ -3117,15 +3108,15 @@ function peg$parse(input, options) {
         s3 = peg$parsesingleQuoteStringChar();
       }
       if (input.charCodeAt(peg$currPos) === 39) {
-        s3 = peg$c45;
+        s3 = peg$c39;
         peg$currPos++;
       } else {
         s3 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e84); }
+        if (peg$silentFails === 0) { peg$fail(peg$e76); }
       }
       if (s3 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f57(s2);
+        s0 = peg$f54(s2);
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -3137,7 +3128,7 @@ function peg$parse(input, options) {
     peg$silentFails--;
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e83); }
+      if (peg$silentFails === 0) { peg$fail(peg$e75); }
     }
 
     return s0;
@@ -3150,11 +3141,11 @@ function peg$parse(input, options) {
     s1 = peg$currPos;
     peg$silentFails++;
     if (input.charCodeAt(peg$currPos) === 39) {
-      s2 = peg$c45;
+      s2 = peg$c39;
       peg$currPos++;
     } else {
       s2 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e84); }
+      if (peg$silentFails === 0) { peg$fail(peg$e76); }
     }
     if (s2 === peg$FAILED) {
       s2 = peg$parsenewLine();
@@ -3188,10 +3179,10 @@ function peg$parse(input, options) {
     s0 = peg$currPos;
     s1 = peg$parseellipsis();
     if (s1 !== peg$FAILED) {
-      s2 = peg$parsepipeline();
+      s2 = peg$parsevalue();
       if (s2 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f58(s2);
+        s0 = peg$f55(s2);
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -3204,53 +3195,6 @@ function peg$parse(input, options) {
     return s0;
   }
 
-  function peg$parsestep() {
-    var s0;
-
-    s0 = peg$parsenumber();
-    if (s0 === peg$FAILED) {
-      s0 = peg$parsefunctionComposition();
-      if (s0 === peg$FAILED) {
-        s0 = peg$parseabsoluteFilePath();
-        if (s0 === peg$FAILED) {
-          s0 = peg$parsearray();
-          if (s0 === peg$FAILED) {
-            s0 = peg$parseobject();
-            if (s0 === peg$FAILED) {
-              s0 = peg$parselambda();
-              if (s0 === peg$FAILED) {
-                s0 = peg$parseparameterizedLambda();
-                if (s0 === peg$FAILED) {
-                  s0 = peg$parsetemplateLiteral();
-                  if (s0 === peg$FAILED) {
-                    s0 = peg$parsestring();
-                    if (s0 === peg$FAILED) {
-                      s0 = peg$parsegroup();
-                      if (s0 === peg$FAILED) {
-                        s0 = peg$parseprotocolCall();
-                        if (s0 === peg$FAILED) {
-                          s0 = peg$parsetaggedTemplate();
-                          if (s0 === peg$FAILED) {
-                            s0 = peg$parsescopeTraverse();
-                            if (s0 === peg$FAILED) {
-                              s0 = peg$parsescopeReference();
-                            }
-                          }
-                        }
-                      }
-                    }
-                  }
-                }
-              }
-            }
-          }
-        }
-      }
-    }
-
-    return s0;
-  }
-
   function peg$parsestart() {
     var s0;
 
@@ -3273,7 +3217,7 @@ function peg$parse(input, options) {
     peg$silentFails--;
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e85); }
+      if (peg$silentFails === 0) { peg$fail(peg$e77); }
     }
 
     return s0;
@@ -3286,24 +3230,24 @@ function peg$parse(input, options) {
     s1 = peg$parsecallTarget();
     if (s1 !== peg$FAILED) {
       if (input.charCodeAt(peg$currPos) === 96) {
-        s2 = peg$c46;
+        s2 = peg$c40;
         peg$currPos++;
       } else {
         s2 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e86); }
+        if (peg$silentFails === 0) { peg$fail(peg$e78); }
       }
       if (s2 !== peg$FAILED) {
         s3 = peg$parsetemplateLiteralContents();
         if (input.charCodeAt(peg$currPos) === 96) {
-          s4 = peg$c46;
+          s4 = peg$c40;
           peg$currPos++;
         } else {
           s4 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e86); }
+          if (peg$silentFails === 0) { peg$fail(peg$e78); }
         }
         if (s4 !== peg$FAILED) {
           peg$savedPos = s0;
-          s0 = peg$f59(s1, s3);
+          s0 = peg$f56(s1, s3);
         } else {
           peg$currPos = s0;
           s0 = peg$FAILED;
@@ -3327,11 +3271,11 @@ function peg$parse(input, options) {
     s0 = peg$currPos;
     s1 = peg$parsetemplateDocumentContents();
     peg$savedPos = s0;
-    s1 = peg$f60(s1);
+    s1 = peg$f57(s1);
     s0 = s1;
     peg$silentFails--;
     s1 = peg$FAILED;
-    if (peg$silentFails === 0) { peg$fail(peg$e87); }
+    if (peg$silentFails === 0) { peg$fail(peg$e79); }
 
     return s0;
   }
@@ -3342,12 +3286,12 @@ function peg$parse(input, options) {
     s0 = peg$currPos;
     s1 = peg$currPos;
     peg$silentFails++;
-    if (input.substr(peg$currPos, 2) === peg$c47) {
-      s2 = peg$c47;
+    if (input.substr(peg$currPos, 2) === peg$c41) {
+      s2 = peg$c41;
       peg$currPos += 2;
     } else {
       s2 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e88); }
+      if (peg$silentFails === 0) { peg$fail(peg$e80); }
     }
     peg$silentFails--;
     if (s2 === peg$FAILED) {
@@ -3402,7 +3346,7 @@ function peg$parse(input, options) {
       }
     }
     peg$savedPos = s0;
-    s0 = peg$f61(s1, s2);
+    s0 = peg$f58(s1, s2);
 
     return s0;
   }
@@ -3419,11 +3363,11 @@ function peg$parse(input, options) {
       s2 = peg$parsetemplateDocumentChar();
     }
     peg$savedPos = s0;
-    s1 = peg$f62(s1);
+    s1 = peg$f59(s1);
     s0 = s1;
     peg$silentFails--;
     s1 = peg$FAILED;
-    if (peg$silentFails === 0) { peg$fail(peg$e89); }
+    if (peg$silentFails === 0) { peg$fail(peg$e81); }
 
     return s0;
   }
@@ -3434,24 +3378,24 @@ function peg$parse(input, options) {
     peg$silentFails++;
     s0 = peg$currPos;
     if (input.charCodeAt(peg$currPos) === 96) {
-      s1 = peg$c46;
+      s1 = peg$c40;
       peg$currPos++;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e86); }
+      if (peg$silentFails === 0) { peg$fail(peg$e78); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$parsetemplateLiteralContents();
       if (input.charCodeAt(peg$currPos) === 96) {
-        s3 = peg$c46;
+        s3 = peg$c40;
         peg$currPos++;
       } else {
         s3 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e86); }
+        if (peg$silentFails === 0) { peg$fail(peg$e78); }
       }
       if (s3 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f63(s2);
+        s0 = peg$f60(s2);
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -3463,7 +3407,7 @@ function peg$parse(input, options) {
     peg$silentFails--;
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e90); }
+      if (peg$silentFails === 0) { peg$fail(peg$e82); }
     }
 
     return s0;
@@ -3476,19 +3420,19 @@ function peg$parse(input, options) {
     s1 = peg$currPos;
     peg$silentFails++;
     if (input.charCodeAt(peg$currPos) === 96) {
-      s2 = peg$c46;
+      s2 = peg$c40;
       peg$currPos++;
     } else {
       s2 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e86); }
+      if (peg$silentFails === 0) { peg$fail(peg$e78); }
     }
     if (s2 === peg$FAILED) {
-      if (input.substr(peg$currPos, 2) === peg$c47) {
-        s2 = peg$c47;
+      if (input.substr(peg$currPos, 2) === peg$c41) {
+        s2 = peg$c41;
         peg$currPos += 2;
       } else {
         s2 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e88); }
+        if (peg$silentFails === 0) { peg$fail(peg$e80); }
       }
     }
     peg$silentFails--;
@@ -3560,38 +3504,36 @@ function peg$parse(input, options) {
       s2 = peg$parsetemplateLiteralChar();
     }
     peg$savedPos = s0;
-    s1 = peg$f64(s1);
+    s1 = peg$f61(s1);
     s0 = s1;
 
     return s0;
   }
 
   function peg$parsetemplateSubstitution() {
-    var s0, s1, s2, s3, s4, s5;
+    var s0, s1, s2, s3;
 
     peg$silentFails++;
     s0 = peg$currPos;
-    if (input.substr(peg$currPos, 2) === peg$c47) {
-      s1 = peg$c47;
+    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$e88); }
+      if (peg$silentFails === 0) { peg$fail(peg$e80); }
     }
     if (s1 !== peg$FAILED) {
-      s2 = peg$parse__();
-      s3 = peg$parsepipeline();
-      if (s3 !== peg$FAILED) {
-        s4 = peg$parse__();
+      s2 = peg$parseexpression();
+      if (s2 !== peg$FAILED) {
         if (input.charCodeAt(peg$currPos) === 125) {
-          s5 = peg$c2;
+          s3 = peg$c2;
           peg$currPos++;
         } else {
-          s5 = peg$FAILED;
+          s3 = peg$FAILED;
           if (peg$silentFails === 0) { peg$fail(peg$e6); }
         }
-        if (s5 !== peg$FAILED) {
-          s0 = s3;
+        if (s3 !== peg$FAILED) {
+          s0 = s2;
         } else {
           peg$currPos = s0;
           s0 = peg$FAILED;
@@ -3607,7 +3549,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$e83); }
     }
 
     return s0;
@@ -3630,6 +3572,59 @@ function peg$parse(input, options) {
     return s0;
   }
 
+  function peg$parsevalue() {
+    var s0;
+
+    s0 = peg$parsenumber();
+    if (s0 === peg$FAILED) {
+      s0 = peg$parseparameterizedLambda();
+      if (s0 === peg$FAILED) {
+        s0 = peg$parsefunctionComposition();
+        if (s0 === peg$FAILED) {
+          s0 = peg$parsetaggedTemplate();
+          if (s0 === peg$FAILED) {
+            s0 = peg$parsenamespacePath();
+            if (s0 === peg$FAILED) {
+              s0 = peg$parseabsoluteFilePath();
+              if (s0 === peg$FAILED) {
+                s0 = peg$parsearray();
+                if (s0 === peg$FAILED) {
+                  s0 = peg$parseobject();
+                  if (s0 === peg$FAILED) {
+                    s0 = peg$parselambda();
+                    if (s0 === peg$FAILED) {
+                      s0 = peg$parsetemplateLiteral();
+                      if (s0 === peg$FAILED) {
+                        s0 = peg$parsestring();
+                        if (s0 === peg$FAILED) {
+                          s0 = peg$parsegroup();
+                          if (s0 === peg$FAILED) {
+                            s0 = peg$parsehomeTree();
+                            if (s0 === peg$FAILED) {
+                              s0 = peg$parsescopeTraverse();
+                              if (s0 === peg$FAILED) {
+                                s0 = peg$parsenamespace();
+                                if (s0 === peg$FAILED) {
+                                  s0 = peg$parsescopeReference();
+                                }
+                              }
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+
+    return s0;
+  }
+
   function peg$parsewhitespaceWithNewLine() {
     var s0, s1, s2, s3, s4;
 
@@ -3701,15 +3696,17 @@ const peg$allowedStartRules = [
   "doubleArrow",
   "doubleQuoteString",
   "doubleQuoteStringChar",
+  "doubleSlashPath",
   "ellipsis",
   "escapedChar",
-  "expr",
   "expression",
   "float",
   "functionComposition",
+  "functionReference",
   "group",
   "guillemetString",
   "guillemetStringChar",
+  "homeTree",
   "host",
   "identifier",
   "identifierChar",
@@ -3721,6 +3718,8 @@ const peg$allowedStartRules = [
   "leadingSlashPath",
   "list",
   "multiLineComment",
+  "namespace",
+  "namespacePath",
   "newLine",
   "number",
   "object",
@@ -3734,14 +3733,13 @@ const peg$allowedStartRules = [
   "objectPublicKey",
   "parameterizedLambda",
   "parensArgs",
-  "pipeline",
   "path",
   "pathElement",
   "pathKeyChar",
   "pathTail",
-  "protocolCall",
-  "protocol",
-  "reservedProtocol",
+  "pipeline",
+  "pipelineStep",
+  "program",
   "scopeReference",
   "scopeTraverse",
   "separator",
@@ -3752,7 +3750,6 @@ const peg$allowedStartRules = [
   "singleQuoteString",
   "singleQuoteStringChar",
   "spread",
-  "step",
   "start",
   "string",
   "taggedTemplate",
@@ -3766,6 +3763,7 @@ const peg$allowedStartRules = [
   "templateLiteralText",
   "templateSubstitution",
   "textChar",
+  "value",
   "whitespaceWithNewLine"
 ];