@weborigami/language 0.1.0 → 0.2.0

package/src/compiler/parse.js

@@ -7,19 +7,29 @@
 //
 // Origami language parser
 //
+// This generally follows the pattern of the JavaScript expression grammar at
+// https://github.com/pegjs/pegjs/blob/master/examples/javascript.pegjs. Like
+// that parser, this one uses the ECMAScript grammar terms where relevant.
+//
 // Generate the parser via `npm build`.
+//
 // @ts-nocheck
 //
 
 import * as ops from "../runtime/ops.js";
 import {
   annotate,
+  downgradeReference,
   makeArray,
-  makeFunctionCall,
+  makeBinaryOperatorChain,
+  makeCall,
+  makeDeferredArguments,
   makeObject,
   makePipeline,
   makeProperty,
-  makeTemplate
+  makeReference,
+  makeTemplate,
+  makeUnaryOperatorCall
 } from "./parserHelpers.js";
 
 
@@ -192,110 +202,119 @@ 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, 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$startRuleFunctions = { __: peg$parse__, arguments: peg$parsearguments, arrayLiteral: peg$parsearrayLiteral, arrayEntries: peg$parsearrayEntries, arrayEntry: peg$parsearrayEntry, arrowFunction: peg$parsearrowFunction, callExpression: peg$parsecallExpression, closingBrace: peg$parseclosingBrace, closingBracket: peg$parseclosingBracket, closingParenthesis: peg$parseclosingParenthesis, 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, 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, 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, rootDirectory: peg$parserootDirectory, scopeReference: peg$parsescopeReference, separator: peg$parseseparator, slashFollows: peg$parseslashFollows, shebang: peg$parseshebang, shorthandFunction: peg$parseshorthandFunction, sign: peg$parsesign, singleArrow: peg$parsesingleArrow, singleLineComment: peg$parsesingleLineComment, singleQuoteString: peg$parsesingleQuoteString, singleQuoteStringChar: peg$parsesingleQuoteStringChar, spread: peg$parsespread, stringLiteral: peg$parsestringLiteral, 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, unaryExpression: peg$parseunaryExpression, unaryOperator: peg$parseunaryOperator, whitespaceWithNewLine: peg$parsewhitespaceWithNewLine };
   var peg$startRuleFunction = peg$parse__;
 
-  var peg$c0 = "//";
-  var peg$c1 = "[";
-  var peg$c2 = "}";
-  var peg$c3 = "]";
-  var peg$c4 = ")";
-  var peg$c5 = "\u21D2";
-  var peg$c6 = "=>";
-  var peg$c7 = "\"";
-  var peg$c8 = "...";
-  var peg$c9 = "\u2026";
-  var peg$c10 = "\\0";
-  var peg$c11 = "\\b";
-  var peg$c12 = "\\f";
-  var peg$c13 = "\\n";
-  var peg$c14 = "\\r";
-  var peg$c15 = "\\t";
-  var peg$c16 = "\\v";
-  var peg$c17 = "\\";
-  var peg$c18 = ".";
-  var peg$c19 = "(";
-  var peg$c20 = "\xAB";
-  var peg$c21 = "\xBB";
-  var peg$c22 = "~";
-  var peg$c23 = ":";
-  var peg$c24 = "/";
-  var peg$c25 = "-";
-  var peg$c26 = ">";
-  var peg$c27 = "=";
-  var peg$c28 = "/*";
-  var peg$c29 = "*/";
-  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$c0 = "[";
+  var peg$c1 = "(";
+  var peg$c2 = ")";
+  var peg$c3 = "}";
+  var peg$c4 = "]";
+  var peg$c5 = "?";
+  var peg$c6 = ":";
+  var peg$c7 = "\u21D2";
+  var peg$c8 = "=>";
+  var peg$c9 = "\"";
+  var peg$c10 = "...";
+  var peg$c11 = "\u2026";
+  var peg$c12 = "===";
+  var peg$c13 = "!==";
+  var peg$c14 = "==";
+  var peg$c15 = "!=";
+  var peg$c16 = "\\0";
+  var peg$c17 = "\\b";
+  var peg$c18 = "\\f";
+  var peg$c19 = "\\n";
+  var peg$c20 = "\\r";
+  var peg$c21 = "\\t";
+  var peg$c22 = "\\v";
+  var peg$c23 = "\\";
+  var peg$c24 = ".";
+  var peg$c25 = "\xAB";
+  var peg$c26 = "\xBB";
+  var peg$c27 = "~";
+  var peg$c28 = "-";
+  var peg$c29 = ">";
+  var peg$c30 = "&&";
+  var peg$c31 = "||";
+  var peg$c32 = "/*";
+  var peg$c33 = "*/";
+  var peg$c34 = "@";
+  var peg$c35 = "\n";
+  var peg$c36 = "\r\n";
+  var peg$c37 = "\r";
+  var peg$c38 = "??";
+  var peg$c39 = "{";
+  var peg$c40 = "=";
+  var peg$c41 = "/";
+  var peg$c42 = "//";
+  var peg$c43 = ",";
+  var peg$c44 = "#!";
+  var peg$c45 = "\u2192";
+  var peg$c46 = "->";
+  var peg$c47 = "'";
+  var peg$c48 = "${";
+  var peg$c49 = "`";
+  var peg$c50 = "!";
 
   var peg$r0 = /^[0-9]/;
-  var peg$r1 = /^[^(){}[\]<>\-=,\/:`"'\xAB\xBB\\ \u2192\u21D2\t\n\r]/;
+  var peg$r1 = /^[^(){}[\]<>?!&|\-=,\/:`"'\xAB\xBB\\ \u2192\u21D2\t\n\r]/;
   var peg$r2 = /^[ \t]/;
   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);
-  var peg$e2 = peg$otherExpectation("function arguments");
-  var peg$e3 = peg$otherExpectation("array");
-  var peg$e4 = peg$literalExpectation("[", false);
+  var peg$e0 = peg$otherExpectation("function arguments");
+  var peg$e1 = peg$otherExpectation("array");
+  var peg$e2 = peg$literalExpectation("[", false);
+  var peg$e3 = peg$literalExpectation("(", false);
+  var peg$e4 = peg$literalExpectation(")", false);
   var peg$e5 = peg$otherExpectation("function call");
   var peg$e6 = peg$literalExpectation("}", false);
   var peg$e7 = peg$anyExpectation();
   var peg$e8 = peg$literalExpectation("]", false);
-  var peg$e9 = peg$literalExpectation(")", false);
-  var peg$e10 = peg$otherExpectation("comment");
-  var peg$e11 = peg$classExpectation([["0", "9"]], false, false);
-  var peg$e12 = peg$literalExpectation("\u21D2", false);
-  var peg$e13 = peg$literalExpectation("=>", false);
-  var peg$e14 = peg$otherExpectation("double quote string");
-  var peg$e15 = peg$literalExpectation("\"", false);
-  var peg$e16 = peg$literalExpectation("...", false);
-  var peg$e17 = peg$literalExpectation("\u2026", false);
-  var peg$e18 = peg$otherExpectation("backslash-escaped character");
-  var peg$e19 = peg$literalExpectation("\\0", false);
-  var peg$e20 = peg$literalExpectation("\\b", false);
-  var peg$e21 = peg$literalExpectation("\\f", false);
-  var peg$e22 = peg$literalExpectation("\\n", false);
-  var peg$e23 = peg$literalExpectation("\\r", false);
-  var peg$e24 = peg$literalExpectation("\\t", false);
-  var peg$e25 = peg$literalExpectation("\\v", false);
-  var peg$e26 = peg$literalExpectation("\\", false);
-  var peg$e27 = peg$otherExpectation("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$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$e9 = peg$otherExpectation("comment");
+  var peg$e10 = peg$literalExpectation("?", false);
+  var peg$e11 = peg$literalExpectation(":", false);
+  var peg$e12 = peg$classExpectation([["0", "9"]], false, false);
+  var peg$e13 = peg$literalExpectation("\u21D2", false);
+  var peg$e14 = peg$literalExpectation("=>", false);
+  var peg$e15 = peg$otherExpectation("double quote string");
+  var peg$e16 = peg$literalExpectation("\"", false);
+  var peg$e17 = peg$literalExpectation("...", false);
+  var peg$e18 = peg$literalExpectation("\u2026", false);
+  var peg$e19 = peg$literalExpectation("===", false);
+  var peg$e20 = peg$literalExpectation("!==", false);
+  var peg$e21 = peg$literalExpectation("==", false);
+  var peg$e22 = peg$literalExpectation("!=", false);
+  var peg$e23 = peg$otherExpectation("backslash-escaped character");
+  var peg$e24 = peg$literalExpectation("\\0", false);
+  var peg$e25 = peg$literalExpectation("\\b", false);
+  var peg$e26 = peg$literalExpectation("\\f", false);
+  var peg$e27 = peg$literalExpectation("\\n", false);
+  var peg$e28 = peg$literalExpectation("\\r", false);
+  var peg$e29 = peg$literalExpectation("\\t", false);
+  var peg$e30 = peg$literalExpectation("\\v", false);
+  var peg$e31 = peg$literalExpectation("\\", false);
+  var peg$e32 = peg$otherExpectation("floating-point number");
+  var peg$e33 = peg$literalExpectation(".", false);
+  var peg$e34 = peg$otherExpectation("parenthetical group");
+  var peg$e35 = peg$otherExpectation("guillemet string");
+  var peg$e36 = peg$literalExpectation("\xAB", false);
+  var peg$e37 = peg$literalExpectation("\xBB", false);
+  var peg$e38 = peg$literalExpectation("~", false);
+  var peg$e39 = peg$otherExpectation("HTTP/HTTPS host");
+  var peg$e40 = peg$otherExpectation("identifier");
+  var peg$e41 = peg$classExpectation(["(", ")", "{", "}", "[", "]", "<", ">", "?", "!", "&", "|", "-", "=", ",", "/", ":", "`", "\"", "'", "\xAB", "\xBB", "\\", " ", "\u2192", "\u21D2", "\t", "\n", "\r"], true, false);
+  var peg$e42 = peg$literalExpectation("-", false);
+  var peg$e43 = peg$literalExpectation(">", false);
+  var peg$e44 = peg$otherExpectation("function call with implicit parentheses");
+  var peg$e45 = peg$classExpectation([" ", "\t"], false, false);
+  var peg$e46 = peg$otherExpectation("integer");
+  var peg$e47 = peg$otherExpectation("list");
+  var peg$e48 = peg$literalExpectation("&&", false);
+  var peg$e49 = peg$literalExpectation("||", false);
   var peg$e50 = peg$literalExpectation("/*", false);
   var peg$e51 = peg$literalExpectation("*/", false);
   var peg$e52 = peg$literalExpectation("@", false);
@@ -304,48 +323,56 @@ function peg$parse(input, options) {
   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$e58 = peg$literalExpectation("??", false);
+  var peg$e59 = peg$otherExpectation("object literal");
+  var peg$e60 = peg$literalExpectation("{", false);
+  var peg$e61 = peg$otherExpectation("object getter");
+  var peg$e62 = peg$literalExpectation("=", false);
+  var peg$e63 = peg$otherExpectation("object key");
+  var peg$e64 = peg$otherExpectation("object property");
+  var peg$e65 = peg$otherExpectation("object identifier");
+  var peg$e66 = peg$literalExpectation("/", false);
+  var peg$e67 = peg$otherExpectation("function arguments in parentheses");
+  var peg$e68 = peg$otherExpectation("slash-separated path");
+  var peg$e69 = peg$classExpectation(["(", ")", "{", "}", "[", "]", ",", ":", "/", "\\", " ", "\t", "\n", "\r"], true, false);
+  var peg$e70 = peg$otherExpectation("Origami program");
+  var peg$e71 = peg$literalExpectation("//", false);
+  var peg$e72 = peg$otherExpectation("scope reference");
+  var peg$e73 = peg$literalExpectation(",", false);
+  var peg$e74 = peg$literalExpectation("#!", false);
+  var peg$e75 = peg$classExpectation(["\n", "\r"], true, false);
+  var peg$e76 = peg$otherExpectation("lambda function");
+  var peg$e77 = peg$classExpectation(["+", "-"], false, false);
+  var peg$e78 = peg$literalExpectation("\u2192", false);
+  var peg$e79 = peg$literalExpectation("->", false);
+  var peg$e80 = peg$otherExpectation("single quote string");
+  var peg$e81 = peg$literalExpectation("'", false);
+  var peg$e82 = peg$otherExpectation("string");
+  var peg$e83 = peg$otherExpectation("template");
+  var peg$e84 = peg$literalExpectation("${", false);
+  var peg$e85 = peg$otherExpectation("template text");
+  var peg$e86 = peg$otherExpectation("template literal");
+  var peg$e87 = peg$literalExpectation("`", false);
+  var peg$e88 = peg$otherExpectation("template substitution");
+  var peg$e89 = peg$literalExpectation("!", false);
 
   var peg$f0 = function() {
     return null;
   };
-  var peg$f1 = function(path) {
-      return annotate([[ops.filesRoot], ...path], location());
-    };
-  var peg$f2 = function(path) {
-      return annotate([ops.traverse, ...path], location());
-    };
-  var peg$f3 = function(entries) {
+  var peg$f1 = function(entries) {
       return annotate(makeArray(entries ?? []), location());
     };
-  var peg$f4 = function(entries) {
+  var peg$f2 = function(entries) {
       return annotate(entries, location());
     };
+  var peg$f3 = function(parameters, pipeline) {
+      return annotate([ops.lambda, parameters ?? [], pipeline], location());
+    };
+  var peg$f4 = function(head, tail) {
+      return tail.length === 0
+        ? head
+        : annotate(tail.reduce(makeCall, head), location());
+    };
   var peg$f5 = function() {
       error("Expected right curly brace");
     };
@@ -355,173 +382,189 @@ function peg$parse(input, options) {
   var peg$f7 = function() {
       error("Expected right parenthesis");
     };
-  var peg$f8 = function(chars) {
+  var peg$f8 = function(condition, truthy, falsy) {
+      return annotate([
+        ops.conditional,
+        downgradeReference(condition),
+        [ops.lambda, [], downgradeReference(truthy)],
+        [ops.lambda, [], downgradeReference(falsy)]
+      ], location());
+    };
+  var peg$f9 = function(chars) {
     return annotate([ops.literal, chars.join("")], location());
   };
-  var peg$f9 = function(host, path) {
-      return annotate([host, ...(path ?? [])], location());
+  var peg$f10 = function(head, tail) {
+      return tail.length === 0
+        ? head
+        : annotate(makeBinaryOperatorChain(head, tail), 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() {
+  var peg$f11 = function() { return "\0"; };
+  var peg$f12 = function() { return "\b"; };
+  var peg$f13 = function() { return "\f"; };
+  var peg$f14 = function() { return "\n"; };
+  var peg$f15 = function() { return "\r"; };
+  var peg$f16 = function() { return "\t"; };
+  var peg$f17 = function() { return "\v"; };
+  var peg$f18 = function() {
       return annotate([ops.literal, parseFloat(text())], location());
     };
-  var peg$f18 = function(target, chain, end) {
-      if (end) {
-        chain.push(end);
-      }
-      return annotate(makeFunctionCall(target, chain, location()), location());
-    };
-  var peg$f19 = function(target, chain, end) {
-      if (end) {
-        chain.push(end);
-      }
-      return annotate(makeFunctionCall(target, chain, location()), 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$f19 = function(expression) {
+      return annotate(downgradeReference(expression), location());
     };
-  var peg$f21 = function(pipeline) {
-    return annotate(pipeline, location());
-  };
-  var peg$f22 = function(chars) {
+  var peg$f20 = function(chars) {
     return annotate([ops.literal, chars.join("")], location());
   };
-  var peg$f23 = function() {
-      return annotate([ops.homeTree], location());
+  var peg$f21 = function() {
+      return annotate([ops.homeDirectory], location());
     };
-  var peg$f24 = function(identifier, port, slash) {
+  var peg$f22 = function(identifier, port, slashFollows) {
     const portText = port ? `:${port[1]}` : "";
-    const slashText = slash ? "/" : "";
+    const slashText = slashFollows ? "/" : "";
     const hostText = identifier + portText + slashText;
     return annotate([ops.literal, hostText], location());
   };
-  var peg$f25 = function(chars) { return chars.join(""); };
-  var peg$f26 = function(list) {
+  var peg$f23 = function(chars) { return chars.join(""); };
+  var peg$f24 = function(list) {
       return annotate(list, location());
     };
+  var peg$f25 = function(head, args) {
+      return args ? makeCall(head, args) : head;
+    };
+  var peg$f26 = function(values) {
+      return annotate(values, location());
+    };
   var peg$f27 = function() {
       return annotate([ops.literal, parseInt(text())], location());
     };
-  var peg$f28 = function(pipeline) {
-      return annotate([ops.lambda, ["_"], pipeline], location());
+  var peg$f28 = function(values) {
+      return annotate(values, location());
     };
-  var peg$f29 = function(path) {
-      return annotate(path ?? [], location());
+  var peg$f29 = function(head, tail) {
+      return tail.length === 0
+        ? head
+        : annotate(
+          [ops.logicalAnd, downgradeReference(head), ...makeDeferredArguments(tail)],
+          location()
+        );
     };
-  var peg$f30 = function(values) {
-      return annotate(values, location());
+  var peg$f30 = function(head, tail) {
+      return tail.length === 0
+        ? head
+        : annotate(
+          [ops.logicalOr, downgradeReference(head), ...makeDeferredArguments(tail)],
+          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$f33 = function(head, tail) {
+      return tail.length === 0
+        ? head
+        : annotate(
+          [ops.nullishCoalescing, downgradeReference(head), ...makeDeferredArguments(tail)],
+          location()
+        );
     };
-  var peg$f35 = function(entries) {
+  var peg$f34 = function(entries) {
       return annotate(makeObject(entries ?? [], ops.object), location());
     };
-  var peg$f36 = function(entries) {
+  var peg$f35 = function(entries) {
       return annotate(entries, location());
     };
-  var peg$f37 = function(key, pipeline) {
+  var peg$f36 = function(key, pipeline) {
       return annotate(
         makeProperty(key, annotate([ops.getter, pipeline], location())),
         location()
       );
     };
-  var peg$f38 = function(hiddenKey) { return hiddenKey.join(""); };
-  var peg$f39 = function(key, pipeline) {
+  var peg$f37 = function(hiddenKey) { return hiddenKey.join(""); };
+  var peg$f38 = function(key, pipeline) {
       return annotate(makeProperty(key, pipeline), location());
     };
-  var peg$f40 = function(key) {
+  var peg$f39 = function(key) {
       return annotate([key, [ops.inherited, key]], location());
     };
-  var peg$f41 = function(identifier, slash) {
+  var peg$f40 = function(identifier, slash) {
     return identifier + (slash ?? "");
   };
-  var peg$f42 = function(string) {
+  var peg$f41 = function(string) {
     // Remove `ops.literal` from the string code
     return string[1];
   };
-  var peg$f43 = function(parameters, pipeline) {
-      return annotate([ops.lambda, parameters ?? [], pipeline], location());
-    };
-  var peg$f44 = function(list) {
+  var peg$f42 = function(list) {
       return annotate(list ?? [undefined], location());
     };
-  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$f43 = function(segments) {
+      // Drop empty segments that represent consecutive or final slashes
+      segments = segments.filter(segment => segment);
+      return annotate(segments, location());
     };
-  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$f48 = function(chars) {
-    return annotate([ops.literal, chars.join("")], location());
+  var peg$f44 = function(path) {
+      return annotate([ops.traverse, ...path], location());
+    };
+  var peg$f45 = function(chars, slashFollows) {
+    // Append a trailing slash if one follows (but don't consume it)
+    const key = chars.join("") + (slashFollows ? "/" : "");
+    return annotate([ops.literal, key], location());
   };
-  var peg$f49 = function(head, tail) {
-      return tail.length === 0
-        ? head
-        : annotate(makePipeline([head, ...tail]), location());
+  var peg$f46 = function(head, tail) {
+      return tail.reduce(makePipeline, downgradeReference(head));
+    };
+  var peg$f47 = function(fn, host, path) {
+      const keys = annotate([host, ...(path ?? [])], location());
+      return annotate(makeCall(fn, keys), location());
     };
-  var peg$f50 = function(key) {
-      return annotate([ops.scope, key], location());
+  var peg$f48 = function(fn, reference) {
+      const literal = annotate([ops.literal, reference[1]], reference.location);
+      return annotate(makeCall(fn, [literal]), location());
     };
-  var peg$f51 = function(ref, path) {
-      const head = [ops.scope, `${ ref[1] }/`];
-      head.location = ref.location;
-      return annotate([ops.traverse, head, ...(path ?? [])], location());
+  var peg$f49 = function(key) {
+      return annotate([ops.rootDirectory, key], location());
+    };
+  var peg$f50 = function() {
+      return annotate([ops.rootDirectory], location());
+    };
+  var peg$f51 = function(identifier, slashFollows) {
+      const id = identifier + (slashFollows ? "/" : "");
+      return annotate(makeReference(id), location());
+    };
+  var peg$f52 = function() {
+      return true;
     };
-  var peg$f52 = function() { return null; };
   var peg$f53 = function() { return null; };
-  var peg$f54 = function(chars) {
+  var peg$f54 = function(definition) {
+      return annotate([ops.lambda, ["_"], definition], location());
+    };
+  var peg$f55 = function() { return null; };
+  var peg$f56 = function(chars) {
     return annotate([ops.literal, chars.join("")], location());
   };
-  var peg$f55 = function(value) {
+  var peg$f57 = function(value) {
       return annotate([ops.spread, value], location());
     };
-  var peg$f56 = function(tag, contents) {
-      return annotate(makeTemplate(tag, contents[0], contents[1]), location());
-    };
-  var peg$f57 = function(contents) {
+  var peg$f58 = function(contents) {
       return annotate([ops.lambda, ["_"], contents], location());
     };
-  var peg$f58 = function(head, tail) {
+  var peg$f59 = function(head, tail) {
       return annotate(makeTemplate(ops.template, head, tail), location());
     };
-  var peg$f59 = function(chars) {
+  var peg$f60 = function(chars) {
       return chars.join("");
     };
-  var peg$f60 = function(contents) {
+  var peg$f61 = function(contents) {
       return annotate(makeTemplate(ops.template, contents[0], contents[1]), location());
     };
-  var peg$f61 = function(chars) {
+  var peg$f62 = function(chars) {
       return chars.join("");
     };
+  var peg$f63 = function(expression) {
+      return annotate(expression, location());
+    };
+  var peg$f64 = function(operator, expression) {
+      return annotate(makeUnaryOperatorCall(operator, expression), location());
+    };
   var peg$currPos = options.peg$currPos | 0;
   var peg$savedPos = peg$currPos;
   var peg$posDetailsCache = [{ line: 1, column: 1 }];
@@ -713,83 +756,37 @@ function peg$parse(input, options) {
     return s0;
   }
 
-  function peg$parseabsoluteFilePath() {
-    var s0, s1, s2;
-
-    peg$silentFails++;
-    s0 = peg$currPos;
-    s1 = peg$currPos;
-    peg$silentFails++;
-    if (input.substr(peg$currPos, 2) === peg$c0) {
-      s2 = peg$c0;
-      peg$currPos += 2;
-    } else {
-      s2 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e1); }
-    }
-    peg$silentFails--;
-    if (s2 === peg$FAILED) {
-      s1 = undefined;
-    } else {
-      peg$currPos = s1;
-      s1 = peg$FAILED;
-    }
-    if (s1 !== peg$FAILED) {
-      s2 = peg$parseleadingSlashPath();
-      if (s2 !== peg$FAILED) {
-        peg$savedPos = s0;
-        s0 = peg$f1(s2);
-      } else {
-        peg$currPos = s0;
-        s0 = peg$FAILED;
-      }
-    } else {
-      peg$currPos = s0;
-      s0 = peg$FAILED;
-    }
-    peg$silentFails--;
-    if (s0 === peg$FAILED) {
-      s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e0); }
-    }
-
-    return s0;
-  }
-
-  function peg$parseargs() {
+  function peg$parsearguments() {
     var s0, s1;
 
     peg$silentFails++;
-    s0 = peg$parseparensArgs();
+    s0 = peg$parseparenthesesArguments();
     if (s0 === peg$FAILED) {
-      s0 = peg$currPos;
-      s1 = peg$parseleadingSlashPath();
-      if (s1 !== peg$FAILED) {
-        peg$savedPos = s0;
-        s1 = peg$f2(s1);
+      s0 = peg$parsepathArguments();
+      if (s0 === peg$FAILED) {
+        s0 = peg$parsetemplateLiteral();
       }
-      s0 = s1;
     }
     peg$silentFails--;
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e2); }
+      if (peg$silentFails === 0) { peg$fail(peg$e0); }
     }
 
     return s0;
   }
 
-  function peg$parsearray() {
+  function peg$parsearrayLiteral() {
     var s0, s1, s2, s3, s4, s5;
 
     peg$silentFails++;
     s0 = peg$currPos;
     if (input.charCodeAt(peg$currPos) === 91) {
-      s1 = peg$c1;
+      s1 = peg$c0;
       peg$currPos++;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e4); }
+      if (peg$silentFails === 0) { peg$fail(peg$e2); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$parse__();
@@ -801,7 +798,7 @@ function peg$parse(input, options) {
       s5 = peg$parseclosingBracket();
       if (s5 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f3(s3);
+        s0 = peg$f1(s3);
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -813,7 +810,7 @@ function peg$parse(input, options) {
     peg$silentFails--;
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e3); }
+      if (peg$silentFails === 0) { peg$fail(peg$e1); }
     }
 
     return s0;
@@ -854,7 +851,7 @@ function peg$parse(input, options) {
         s2 = null;
       }
       peg$savedPos = s0;
-      s0 = peg$f4(s1);
+      s0 = peg$f2(s1);
     } else {
       peg$currPos = s0;
       s0 = peg$FAILED;
@@ -868,37 +865,87 @@ function peg$parse(input, options) {
 
     s0 = peg$parsespread();
     if (s0 === peg$FAILED) {
-      s0 = peg$parsepipeline();
+      s0 = peg$parsepipelineExpression();
     }
 
     return s0;
   }
 
-  function peg$parsecallTarget() {
-    var s0, s1;
+  function peg$parsearrowFunction() {
+    var s0, s1, s2, s3, s4, s5, s6, s7, s8, s9;
 
-    peg$silentFails++;
-    s0 = peg$parseabsoluteFilePath();
-    if (s0 === peg$FAILED) {
-      s0 = peg$parsescopeTraverse();
-      if (s0 === peg$FAILED) {
-        s0 = peg$parsearray();
-        if (s0 === peg$FAILED) {
-          s0 = peg$parseobject();
-          if (s0 === peg$FAILED) {
-            s0 = peg$parsegroup();
-            if (s0 === peg$FAILED) {
-              s0 = peg$parsenamespacePath();
-              if (s0 === peg$FAILED) {
-                s0 = peg$parsenamespace();
-                if (s0 === peg$FAILED) {
-                  s0 = peg$parsefunctionReference();
-                }
-              }
-            }
+    s0 = peg$currPos;
+    if (input.charCodeAt(peg$currPos) === 40) {
+      s1 = peg$c1;
+      peg$currPos++;
+    } else {
+      s1 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$e3); }
+    }
+    if (s1 !== peg$FAILED) {
+      s2 = peg$parse__();
+      s3 = peg$parseidentifierList();
+      if (s3 === peg$FAILED) {
+        s3 = null;
+      }
+      s4 = peg$parse__();
+      if (input.charCodeAt(peg$currPos) === 41) {
+        s5 = peg$c2;
+        peg$currPos++;
+      } else {
+        s5 = peg$FAILED;
+        if (peg$silentFails === 0) { peg$fail(peg$e4); }
+      }
+      if (s5 !== peg$FAILED) {
+        s6 = peg$parse__();
+        s7 = peg$parsedoubleArrow();
+        if (s7 !== peg$FAILED) {
+          s8 = peg$parse__();
+          s9 = peg$parsepipelineExpression();
+          if (s9 !== peg$FAILED) {
+            peg$savedPos = s0;
+            s0 = peg$f3(s3, s9);
+          } else {
+            peg$currPos = s0;
+            s0 = peg$FAILED;
           }
+        } else {
+          peg$currPos = s0;
+          s0 = peg$FAILED;
         }
+      } else {
+        peg$currPos = s0;
+        s0 = peg$FAILED;
+      }
+    } else {
+      peg$currPos = s0;
+      s0 = peg$FAILED;
+    }
+    if (s0 === peg$FAILED) {
+      s0 = peg$parseconditionalExpression();
+    }
+
+    return s0;
+  }
+
+  function peg$parsecallExpression() {
+    var s0, s1, s2, s3;
+
+    peg$silentFails++;
+    s0 = peg$currPos;
+    s1 = peg$parseprotocolExpression();
+    if (s1 !== peg$FAILED) {
+      s2 = [];
+      s3 = peg$parsearguments();
+      while (s3 !== peg$FAILED) {
+        s2.push(s3);
+        s3 = peg$parsearguments();
       }
+      peg$savedPos = s0;
+      s0 = peg$f4(s1, s2);
+    } else {
+      peg$currPos = s0;
+      s0 = peg$FAILED;
     }
     peg$silentFails--;
     if (s0 === peg$FAILED) {
@@ -913,7 +960,7 @@ function peg$parse(input, options) {
     var s0, s1;
 
     if (input.charCodeAt(peg$currPos) === 125) {
-      s0 = peg$c2;
+      s0 = peg$c3;
       peg$currPos++;
     } else {
       s0 = peg$FAILED;
@@ -943,7 +990,7 @@ function peg$parse(input, options) {
     var s0, s1;
 
     if (input.charCodeAt(peg$currPos) === 93) {
-      s0 = peg$c3;
+      s0 = peg$c4;
       peg$currPos++;
     } else {
       s0 = peg$FAILED;
@@ -969,15 +1016,15 @@ function peg$parse(input, options) {
     return s0;
   }
 
-  function peg$parseclosingParen() {
+  function peg$parseclosingParenthesis() {
     var s0, s1;
 
     if (input.charCodeAt(peg$currPos) === 41) {
-      s0 = peg$c4;
+      s0 = peg$c2;
       peg$currPos++;
     } else {
       s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e9); }
+      if (peg$silentFails === 0) { peg$fail(peg$e4); }
     }
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
@@ -1010,7 +1057,66 @@ function peg$parse(input, options) {
     peg$silentFails--;
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e10); }
+      if (peg$silentFails === 0) { peg$fail(peg$e9); }
+    }
+
+    return s0;
+  }
+
+  function peg$parseconditionalExpression() {
+    var s0, s1, s2, s3, s4, s5, s6, s7, s8, s9;
+
+    s0 = peg$currPos;
+    s1 = peg$parselogicalOrExpression();
+    if (s1 !== peg$FAILED) {
+      s2 = peg$parse__();
+      if (input.charCodeAt(peg$currPos) === 63) {
+        s3 = peg$c5;
+        peg$currPos++;
+      } else {
+        s3 = peg$FAILED;
+        if (peg$silentFails === 0) { peg$fail(peg$e10); }
+      }
+      if (s3 !== peg$FAILED) {
+        s4 = peg$parse__();
+        s5 = peg$parsepipelineExpression();
+        if (s5 !== peg$FAILED) {
+          s6 = peg$parse__();
+          if (input.charCodeAt(peg$currPos) === 58) {
+            s7 = peg$c6;
+            peg$currPos++;
+          } else {
+            s7 = peg$FAILED;
+            if (peg$silentFails === 0) { peg$fail(peg$e11); }
+          }
+          if (s7 !== peg$FAILED) {
+            s8 = peg$parse__();
+            s9 = peg$parsepipelineExpression();
+            if (s9 !== peg$FAILED) {
+              peg$savedPos = s0;
+              s0 = peg$f8(s1, s5, s9);
+            } else {
+              peg$currPos = s0;
+              s0 = peg$FAILED;
+            }
+          } else {
+            peg$currPos = s0;
+            s0 = peg$FAILED;
+          }
+        } else {
+          peg$currPos = s0;
+          s0 = peg$FAILED;
+        }
+      } else {
+        peg$currPos = s0;
+        s0 = peg$FAILED;
+      }
+    } else {
+      peg$currPos = s0;
+      s0 = peg$FAILED;
+    }
+    if (s0 === peg$FAILED) {
+      s0 = peg$parselogicalOrExpression();
     }
 
     return s0;
@@ -1026,7 +1132,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s2 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e11); }
+      if (peg$silentFails === 0) { peg$fail(peg$e12); }
     }
     if (s2 !== peg$FAILED) {
       while (s2 !== peg$FAILED) {
@@ -1036,7 +1142,7 @@ function peg$parse(input, options) {
           peg$currPos++;
         } else {
           s2 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e11); }
+          if (peg$silentFails === 0) { peg$fail(peg$e12); }
         }
       }
     } else {
@@ -1056,19 +1162,19 @@ function peg$parse(input, options) {
     var s0;
 
     if (input.charCodeAt(peg$currPos) === 8658) {
-      s0 = peg$c5;
+      s0 = peg$c7;
       peg$currPos++;
     } else {
       s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e12); }
+      if (peg$silentFails === 0) { peg$fail(peg$e13); }
     }
     if (s0 === peg$FAILED) {
-      if (input.substr(peg$currPos, 2) === peg$c6) {
-        s0 = peg$c6;
+      if (input.substr(peg$currPos, 2) === peg$c8) {
+        s0 = peg$c8;
         peg$currPos += 2;
       } else {
         s0 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e13); }
+        if (peg$silentFails === 0) { peg$fail(peg$e14); }
       }
     }
 
@@ -1081,11 +1187,11 @@ function peg$parse(input, options) {
     peg$silentFails++;
     s0 = peg$currPos;
     if (input.charCodeAt(peg$currPos) === 34) {
-      s1 = peg$c7;
+      s1 = peg$c9;
       peg$currPos++;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e15); }
+      if (peg$silentFails === 0) { peg$fail(peg$e16); }
     }
     if (s1 !== peg$FAILED) {
       s2 = [];
@@ -1095,15 +1201,15 @@ function peg$parse(input, options) {
         s3 = peg$parsedoubleQuoteStringChar();
       }
       if (input.charCodeAt(peg$currPos) === 34) {
-        s3 = peg$c7;
+        s3 = peg$c9;
         peg$currPos++;
       } else {
         s3 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e15); }
+        if (peg$silentFails === 0) { peg$fail(peg$e16); }
       }
       if (s3 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f8(s2);
+        s0 = peg$f9(s2);
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -1115,7 +1221,7 @@ function peg$parse(input, options) {
     peg$silentFails--;
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e14); }
+      if (peg$silentFails === 0) { peg$fail(peg$e15); }
     }
 
     return s0;
@@ -1128,11 +1234,11 @@ function peg$parse(input, options) {
     s1 = peg$currPos;
     peg$silentFails++;
     if (input.charCodeAt(peg$currPos) === 34) {
-      s2 = peg$c7;
+      s2 = peg$c9;
       peg$currPos++;
     } else {
       s2 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e15); }
+      if (peg$silentFails === 0) { peg$fail(peg$e16); }
     }
     if (s2 === peg$FAILED) {
       s2 = peg$parsenewLine();
@@ -1160,55 +1266,116 @@ function peg$parse(input, options) {
     return s0;
   }
 
-  function peg$parsedoubleSlashPath() {
-    var s0, s1, s2, s3;
+  function peg$parseellipsis() {
+    var s0;
 
-    s0 = peg$currPos;
-    if (input.substr(peg$currPos, 2) === peg$c0) {
-      s1 = peg$c0;
-      peg$currPos += 2;
+    if (input.substr(peg$currPos, 3) === peg$c10) {
+      s0 = peg$c10;
+      peg$currPos += 3;
     } else {
-      s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e1); }
+      s0 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$e17); }
     }
-    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);
+    if (s0 === peg$FAILED) {
+      if (input.charCodeAt(peg$currPos) === 8230) {
+        s0 = peg$c11;
+        peg$currPos++;
       } else {
-        peg$currPos = s0;
         s0 = peg$FAILED;
+        if (peg$silentFails === 0) { peg$fail(peg$e18); }
       }
-    } else {
-      peg$currPos = s0;
-      s0 = peg$FAILED;
     }
 
     return s0;
   }
 
-  function peg$parseellipsis() {
-    var s0;
+  function peg$parseequalityExpression() {
+    var s0, s1, s2, s3, s4, s5, s6, s7;
+
+    s0 = peg$currPos;
+    s1 = peg$parseunaryExpression();
+    if (s1 !== peg$FAILED) {
+      s2 = [];
+      s3 = peg$currPos;
+      s4 = peg$parse__();
+      s5 = peg$parseequalityOperator();
+      if (s5 !== peg$FAILED) {
+        s6 = peg$parse__();
+        s7 = peg$parseunaryExpression();
+        if (s7 !== peg$FAILED) {
+          s3 = [ s5, s7 ];
+        } else {
+          peg$currPos = s3;
+          s3 = peg$FAILED;
+        }
+      } else {
+        peg$currPos = s3;
+        s3 = peg$FAILED;
+      }
+      while (s3 !== peg$FAILED) {
+        s2.push(s3);
+        s3 = peg$currPos;
+        s4 = peg$parse__();
+        s5 = peg$parseequalityOperator();
+        if (s5 !== peg$FAILED) {
+          s6 = peg$parse__();
+          s7 = peg$parseunaryExpression();
+          if (s7 !== peg$FAILED) {
+            s3 = [ s5, s7 ];
+          } else {
+            peg$currPos = s3;
+            s3 = peg$FAILED;
+          }
+        } else {
+          peg$currPos = s3;
+          s3 = peg$FAILED;
+        }
+      }
+      peg$savedPos = s0;
+      s0 = peg$f10(s1, s2);
+    } else {
+      peg$currPos = s0;
+      s0 = peg$FAILED;
+    }
+
+    return s0;
+  }
+
+  function peg$parseequalityOperator() {
+    var s0;
 
-    if (input.substr(peg$currPos, 3) === peg$c8) {
-      s0 = peg$c8;
+    if (input.substr(peg$currPos, 3) === peg$c12) {
+      s0 = peg$c12;
       peg$currPos += 3;
     } else {
       s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e16); }
+      if (peg$silentFails === 0) { peg$fail(peg$e19); }
     }
     if (s0 === peg$FAILED) {
-      if (input.charCodeAt(peg$currPos) === 8230) {
-        s0 = peg$c9;
-        peg$currPos++;
+      if (input.substr(peg$currPos, 3) === peg$c13) {
+        s0 = peg$c13;
+        peg$currPos += 3;
       } else {
         s0 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e17); }
+        if (peg$silentFails === 0) { peg$fail(peg$e20); }
+      }
+      if (s0 === peg$FAILED) {
+        if (input.substr(peg$currPos, 2) === peg$c14) {
+          s0 = peg$c14;
+          peg$currPos += 2;
+        } else {
+          s0 = peg$FAILED;
+          if (peg$silentFails === 0) { peg$fail(peg$e21); }
+        }
+        if (s0 === peg$FAILED) {
+          if (input.substr(peg$currPos, 2) === peg$c15) {
+            s0 = peg$c15;
+            peg$currPos += 2;
+          } else {
+            s0 = peg$FAILED;
+            if (peg$silentFails === 0) { peg$fail(peg$e22); }
+          }
+        }
       }
     }
 
@@ -1220,110 +1387,110 @@ function peg$parse(input, options) {
 
     peg$silentFails++;
     s0 = peg$currPos;
-    if (input.substr(peg$currPos, 2) === peg$c10) {
-      s1 = peg$c10;
+    if (input.substr(peg$currPos, 2) === peg$c16) {
+      s1 = peg$c16;
       peg$currPos += 2;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e19); }
+      if (peg$silentFails === 0) { peg$fail(peg$e24); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f10();
+      s1 = peg$f11();
     }
     s0 = s1;
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
-      if (input.substr(peg$currPos, 2) === peg$c11) {
-        s1 = peg$c11;
+      if (input.substr(peg$currPos, 2) === peg$c17) {
+        s1 = peg$c17;
         peg$currPos += 2;
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e20); }
+        if (peg$silentFails === 0) { peg$fail(peg$e25); }
       }
       if (s1 !== peg$FAILED) {
         peg$savedPos = s0;
-        s1 = peg$f11();
+        s1 = peg$f12();
       }
       s0 = s1;
       if (s0 === peg$FAILED) {
         s0 = peg$currPos;
-        if (input.substr(peg$currPos, 2) === peg$c12) {
-          s1 = peg$c12;
+        if (input.substr(peg$currPos, 2) === peg$c18) {
+          s1 = peg$c18;
           peg$currPos += 2;
         } else {
           s1 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e21); }
+          if (peg$silentFails === 0) { peg$fail(peg$e26); }
         }
         if (s1 !== peg$FAILED) {
           peg$savedPos = s0;
-          s1 = peg$f12();
+          s1 = peg$f13();
         }
         s0 = s1;
         if (s0 === peg$FAILED) {
           s0 = peg$currPos;
-          if (input.substr(peg$currPos, 2) === peg$c13) {
-            s1 = peg$c13;
+          if (input.substr(peg$currPos, 2) === peg$c19) {
+            s1 = peg$c19;
             peg$currPos += 2;
           } else {
             s1 = peg$FAILED;
-            if (peg$silentFails === 0) { peg$fail(peg$e22); }
+            if (peg$silentFails === 0) { peg$fail(peg$e27); }
           }
           if (s1 !== peg$FAILED) {
             peg$savedPos = s0;
-            s1 = peg$f13();
+            s1 = peg$f14();
           }
           s0 = s1;
           if (s0 === peg$FAILED) {
             s0 = peg$currPos;
-            if (input.substr(peg$currPos, 2) === peg$c14) {
-              s1 = peg$c14;
+            if (input.substr(peg$currPos, 2) === peg$c20) {
+              s1 = peg$c20;
               peg$currPos += 2;
             } else {
               s1 = peg$FAILED;
-              if (peg$silentFails === 0) { peg$fail(peg$e23); }
+              if (peg$silentFails === 0) { peg$fail(peg$e28); }
             }
             if (s1 !== peg$FAILED) {
               peg$savedPos = s0;
-              s1 = peg$f14();
+              s1 = peg$f15();
             }
             s0 = s1;
             if (s0 === peg$FAILED) {
               s0 = peg$currPos;
-              if (input.substr(peg$currPos, 2) === peg$c15) {
-                s1 = peg$c15;
+              if (input.substr(peg$currPos, 2) === peg$c21) {
+                s1 = peg$c21;
                 peg$currPos += 2;
               } else {
                 s1 = peg$FAILED;
-                if (peg$silentFails === 0) { peg$fail(peg$e24); }
+                if (peg$silentFails === 0) { peg$fail(peg$e29); }
               }
               if (s1 !== peg$FAILED) {
                 peg$savedPos = s0;
-                s1 = peg$f15();
+                s1 = peg$f16();
               }
               s0 = s1;
               if (s0 === peg$FAILED) {
                 s0 = peg$currPos;
-                if (input.substr(peg$currPos, 2) === peg$c16) {
-                  s1 = peg$c16;
+                if (input.substr(peg$currPos, 2) === peg$c22) {
+                  s1 = peg$c22;
                   peg$currPos += 2;
                 } else {
                   s1 = peg$FAILED;
-                  if (peg$silentFails === 0) { peg$fail(peg$e25); }
+                  if (peg$silentFails === 0) { peg$fail(peg$e30); }
                 }
                 if (s1 !== peg$FAILED) {
                   peg$savedPos = s0;
-                  s1 = peg$f16();
+                  s1 = peg$f17();
                 }
                 s0 = s1;
                 if (s0 === peg$FAILED) {
                   s0 = peg$currPos;
                   if (input.charCodeAt(peg$currPos) === 92) {
-                    s1 = peg$c17;
+                    s1 = peg$c23;
                     peg$currPos++;
                   } else {
                     s1 = peg$FAILED;
-                    if (peg$silentFails === 0) { peg$fail(peg$e26); }
+                    if (peg$silentFails === 0) { peg$fail(peg$e31); }
                   }
                   if (s1 !== peg$FAILED) {
                     if (input.length > peg$currPos) {
@@ -1353,7 +1520,7 @@ function peg$parse(input, options) {
     peg$silentFails--;
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e18); }
+      if (peg$silentFails === 0) { peg$fail(peg$e23); }
     }
 
     return s0;
@@ -1364,7 +1531,7 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = peg$parse__();
-    s2 = peg$parsepipeline();
+    s2 = peg$parsepipelineExpression();
     if (s2 !== peg$FAILED) {
       s3 = peg$parse__();
       s0 = s2;
@@ -1376,7 +1543,7 @@ function peg$parse(input, options) {
     return s0;
   }
 
-  function peg$parsefloat() {
+  function peg$parsefloatLiteral() {
     var s0, s1, s2, s3, s4;
 
     peg$silentFails++;
@@ -1390,58 +1557,17 @@ function peg$parse(input, options) {
       s2 = null;
     }
     if (input.charCodeAt(peg$currPos) === 46) {
-      s3 = peg$c18;
+      s3 = peg$c24;
       peg$currPos++;
     } else {
       s3 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e28); }
+      if (peg$silentFails === 0) { peg$fail(peg$e33); }
     }
     if (s3 !== peg$FAILED) {
       s4 = peg$parsedigits();
       if (s4 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f17();
-      } else {
-        peg$currPos = s0;
-        s0 = peg$FAILED;
-      }
-    } 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;
-  }
-
-  function peg$parsefunctionComposition() {
-    var s0, s1, s2, s3;
-
-    peg$silentFails++;
-    s0 = peg$currPos;
-    s1 = peg$parsecallTarget();
-    if (s1 !== peg$FAILED) {
-      s2 = [];
-      s3 = peg$parseargs();
-      if (s3 !== peg$FAILED) {
-        while (s3 !== peg$FAILED) {
-          s2.push(s3);
-          s3 = peg$parseargs();
-        }
-      } else {
-        s2 = peg$FAILED;
-      }
-      if (s2 !== peg$FAILED) {
-        s3 = peg$parseimplicitParensArgs();
-        if (s3 === peg$FAILED) {
-          s3 = null;
-        }
-        peg$savedPos = s0;
-        s0 = peg$f18(s1, s2, s3);
+        s0 = peg$f18();
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -1450,73 +1576,34 @@ function peg$parse(input, options) {
       peg$currPos = s0;
       s0 = peg$FAILED;
     }
-    if (s0 === peg$FAILED) {
-      s0 = peg$currPos;
-      s1 = peg$parsecallTarget();
-      if (s1 !== peg$FAILED) {
-        s2 = [];
-        s3 = peg$parseargs();
-        while (s3 !== peg$FAILED) {
-          s2.push(s3);
-          s3 = peg$parseargs();
-        }
-        s3 = peg$parseimplicitParensArgs();
-        if (s3 !== peg$FAILED) {
-          peg$savedPos = s0;
-          s0 = peg$f19(s1, s2, s3);
-        } else {
-          peg$currPos = s0;
-          s0 = peg$FAILED;
-        }
-      } else {
-        peg$currPos = s0;
-        s0 = peg$FAILED;
-      }
-    }
     peg$silentFails--;
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
-      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);
+      if (peg$silentFails === 0) { peg$fail(peg$e32); }
     }
-    s0 = s1;
 
     return s0;
   }
 
   function peg$parsegroup() {
-    var s0, s1, s2, s3, s4, s5;
+    var s0, s1, s2, s3;
 
     peg$silentFails++;
     s0 = peg$currPos;
     if (input.charCodeAt(peg$currPos) === 40) {
-      s1 = peg$c19;
+      s1 = peg$c1;
       peg$currPos++;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e31); }
+      if (peg$silentFails === 0) { peg$fail(peg$e3); }
     }
     if (s1 !== peg$FAILED) {
-      s2 = peg$parse__();
-      s3 = peg$parsepipeline();
-      if (s3 !== peg$FAILED) {
-        s4 = peg$parse__();
-        s5 = peg$parseclosingParen();
-        if (s5 !== peg$FAILED) {
+      s2 = peg$parseexpression();
+      if (s2 !== peg$FAILED) {
+        s3 = peg$parseclosingParenthesis();
+        if (s3 !== peg$FAILED) {
           peg$savedPos = s0;
-          s0 = peg$f21(s3);
+          s0 = peg$f19(s2);
         } else {
           peg$currPos = s0;
           s0 = peg$FAILED;
@@ -1532,7 +1619,7 @@ 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$e34); }
     }
 
     return s0;
@@ -1544,11 +1631,11 @@ function peg$parse(input, options) {
     peg$silentFails++;
     s0 = peg$currPos;
     if (input.charCodeAt(peg$currPos) === 171) {
-      s1 = peg$c20;
+      s1 = peg$c25;
       peg$currPos++;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e33); }
+      if (peg$silentFails === 0) { peg$fail(peg$e36); }
     }
     if (s1 !== peg$FAILED) {
       s2 = [];
@@ -1558,15 +1645,15 @@ function peg$parse(input, options) {
         s3 = peg$parseguillemetStringChar();
       }
       if (input.charCodeAt(peg$currPos) === 187) {
-        s3 = peg$c21;
+        s3 = peg$c26;
         peg$currPos++;
       } else {
         s3 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e34); }
+        if (peg$silentFails === 0) { peg$fail(peg$e37); }
       }
       if (s3 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f22(s2);
+        s0 = peg$f20(s2);
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -1578,7 +1665,7 @@ function peg$parse(input, options) {
     peg$silentFails--;
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e32); }
+      if (peg$silentFails === 0) { peg$fail(peg$e35); }
     }
 
     return s0;
@@ -1591,11 +1678,11 @@ function peg$parse(input, options) {
     s1 = peg$currPos;
     peg$silentFails++;
     if (input.charCodeAt(peg$currPos) === 187) {
-      s2 = peg$c21;
+      s2 = peg$c26;
       peg$currPos++;
     } else {
       s2 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e34); }
+      if (peg$silentFails === 0) { peg$fail(peg$e37); }
     }
     if (s2 === peg$FAILED) {
       s2 = peg$parsenewLine();
@@ -1623,20 +1710,20 @@ function peg$parse(input, options) {
     return s0;
   }
 
-  function peg$parsehomeTree() {
+  function peg$parsehomeDirectory() {
     var s0, s1;
 
     s0 = peg$currPos;
     if (input.charCodeAt(peg$currPos) === 126) {
-      s1 = peg$c22;
+      s1 = peg$c27;
       peg$currPos++;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e35); }
+      if (peg$silentFails === 0) { peg$fail(peg$e38); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f23();
+      s1 = peg$f21();
     }
     s0 = s1;
 
@@ -1652,14 +1739,14 @@ function peg$parse(input, options) {
     if (s1 !== peg$FAILED) {
       s2 = peg$currPos;
       if (input.charCodeAt(peg$currPos) === 58) {
-        s3 = peg$c23;
+        s3 = peg$c6;
         peg$currPos++;
       } else {
         s3 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e37); }
+        if (peg$silentFails === 0) { peg$fail(peg$e11); }
       }
       if (s3 !== peg$FAILED) {
-        s4 = peg$parsenumber();
+        s4 = peg$parseintegerLiteral();
         if (s4 !== peg$FAILED) {
           s2 = s4;
         } else {
@@ -1673,18 +1760,12 @@ 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); }
-      }
+      s3 = peg$parseslashFollows();
       if (s3 === peg$FAILED) {
         s3 = null;
       }
       peg$savedPos = s0;
-      s0 = peg$f24(s1, s2, s3);
+      s0 = peg$f22(s1, s2, s3);
     } else {
       peg$currPos = s0;
       s0 = peg$FAILED;
@@ -1692,7 +1773,7 @@ function peg$parse(input, options) {
     peg$silentFails--;
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e36); }
+      if (peg$silentFails === 0) { peg$fail(peg$e39); }
     }
 
     return s0;
@@ -1715,13 +1796,13 @@ function peg$parse(input, options) {
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f25(s1);
+      s1 = peg$f23(s1);
     }
     s0 = s1;
     peg$silentFails--;
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e39); }
+      if (peg$silentFails === 0) { peg$fail(peg$e40); }
     }
 
     return s0;
@@ -1735,26 +1816,26 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e40); }
+      if (peg$silentFails === 0) { peg$fail(peg$e41); }
     }
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
       if (input.charCodeAt(peg$currPos) === 45) {
-        s1 = peg$c25;
+        s1 = peg$c28;
         peg$currPos++;
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e41); }
+        if (peg$silentFails === 0) { peg$fail(peg$e42); }
       }
       if (s1 !== peg$FAILED) {
         s2 = peg$currPos;
         peg$silentFails++;
         if (input.charCodeAt(peg$currPos) === 62) {
-          s3 = peg$c26;
+          s3 = peg$c29;
           peg$currPos++;
         } else {
           s3 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e42); }
+          if (peg$silentFails === 0) { peg$fail(peg$e43); }
         }
         peg$silentFails--;
         if (s3 === peg$FAILED) {
@@ -1816,7 +1897,7 @@ function peg$parse(input, options) {
         s2 = null;
       }
       peg$savedPos = s0;
-      s0 = peg$f26(s1);
+      s0 = peg$f24(s1);
     } else {
       peg$currPos = s0;
       s0 = peg$FAILED;
@@ -1825,29 +1906,41 @@ function peg$parse(input, options) {
     return s0;
   }
 
-  function peg$parseimplicitParensArgs() {
-    var s0, s1, s2;
+  function peg$parseimplicitParenthesesCallExpression() {
+    var s0, s1, s2, s3, s4;
 
     peg$silentFails++;
     s0 = peg$currPos;
-    s1 = [];
-    s2 = peg$parseinlineSpace();
-    if (s2 !== peg$FAILED) {
-      while (s2 !== peg$FAILED) {
-        s1.push(s2);
-        s2 = peg$parseinlineSpace();
-      }
-    } else {
-      s1 = peg$FAILED;
-    }
+    s1 = peg$parsearrowFunction();
     if (s1 !== peg$FAILED) {
-      s2 = peg$parselist();
-      if (s2 !== peg$FAILED) {
-        s0 = s2;
+      s2 = peg$currPos;
+      s3 = [];
+      s4 = peg$parseinlineSpace();
+      if (s4 !== peg$FAILED) {
+        while (s4 !== peg$FAILED) {
+          s3.push(s4);
+          s4 = peg$parseinlineSpace();
+        }
       } else {
-        peg$currPos = s0;
-        s0 = peg$FAILED;
+        s3 = peg$FAILED;
+      }
+      if (s3 !== peg$FAILED) {
+        s4 = peg$parseimplicitParensthesesArguments();
+        if (s4 !== peg$FAILED) {
+          s2 = s4;
+        } else {
+          peg$currPos = s2;
+          s2 = peg$FAILED;
+        }
+      } else {
+        peg$currPos = s2;
+        s2 = peg$FAILED;
+      }
+      if (s2 === peg$FAILED) {
+        s2 = null;
       }
+      peg$savedPos = s0;
+      s0 = peg$f25(s1, s2);
     } else {
       peg$currPos = s0;
       s0 = peg$FAILED;
@@ -1855,7 +1948,51 @@ function peg$parse(input, options) {
     peg$silentFails--;
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e43); }
+      if (peg$silentFails === 0) { peg$fail(peg$e44); }
+    }
+
+    return s0;
+  }
+
+  function peg$parseimplicitParensthesesArguments() {
+    var s0, s1, s2, s3, s4;
+
+    s0 = peg$currPos;
+    s1 = peg$currPos;
+    s2 = [];
+    s3 = peg$parseshorthandFunction();
+    while (s3 !== peg$FAILED) {
+      s2.push(s3);
+      s3 = peg$currPos;
+      s4 = peg$parseseparator();
+      if (s4 !== peg$FAILED) {
+        s4 = peg$parseshorthandFunction();
+        if (s4 === peg$FAILED) {
+          peg$currPos = s3;
+          s3 = peg$FAILED;
+        } else {
+          s3 = s4;
+        }
+      } else {
+        s3 = s4;
+      }
+    }
+    if (s2.length < 1) {
+      peg$currPos = s1;
+      s1 = peg$FAILED;
+    } else {
+      s1 = s2;
+    }
+    if (s1 !== peg$FAILED) {
+      s2 = peg$parseseparator();
+      if (s2 === peg$FAILED) {
+        s2 = null;
+      }
+      peg$savedPos = s0;
+      s0 = peg$f26(s1);
+    } else {
+      peg$currPos = s0;
+      s0 = peg$FAILED;
     }
 
     return s0;
@@ -1869,13 +2006,13 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e44); }
+      if (peg$silentFails === 0) { peg$fail(peg$e45); }
     }
 
     return s0;
   }
 
-  function peg$parseinteger() {
+  function peg$parseintegerLiteral() {
     var s0, s1, s2;
 
     peg$silentFails++;
@@ -1895,34 +2032,49 @@ 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;
   }
 
-  function peg$parselambda() {
-    var s0, s1, s2, s3;
+  function peg$parselist() {
+    var s0, s1, s2, s3, s4;
 
     peg$silentFails++;
     s0 = peg$currPos;
-    if (input.charCodeAt(peg$currPos) === 61) {
-      s1 = peg$c27;
-      peg$currPos++;
-    } else {
-      s1 = peg$FAILED;
-      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$f28(s3);
-      } else {
-        peg$currPos = s0;
-        s0 = peg$FAILED;
+    s1 = peg$currPos;
+    s2 = [];
+    s3 = peg$parsepipelineExpression();
+    while (s3 !== peg$FAILED) {
+      s2.push(s3);
+      s3 = peg$currPos;
+      s4 = peg$parseseparator();
+      if (s4 !== peg$FAILED) {
+        s4 = peg$parsepipelineExpression();
+        if (s4 === peg$FAILED) {
+          peg$currPos = s3;
+          s3 = peg$FAILED;
+        } else {
+          s3 = s4;
+        }
+      } else {
+        s3 = s4;
       }
+    }
+    if (s2.length < 1) {
+      peg$currPos = s1;
+      s1 = peg$FAILED;
+    } else {
+      s1 = s2;
+    }
+    if (s1 !== peg$FAILED) {
+      s2 = peg$parseseparator();
+      if (s2 === peg$FAILED) {
+        s2 = null;
+      }
+      peg$savedPos = s0;
+      s0 = peg$f28(s1);
     } else {
       peg$currPos = s0;
       s0 = peg$FAILED;
@@ -1930,90 +2082,147 @@ function peg$parse(input, options) {
     peg$silentFails--;
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e46); }
+      if (peg$silentFails === 0) { peg$fail(peg$e47); }
     }
 
     return s0;
   }
 
-  function peg$parseleadingSlashPath() {
-    var s0, s1, s2;
+  function peg$parseliteral() {
+    var s0;
 
-    peg$silentFails++;
-    s0 = peg$currPos;
-    if (input.charCodeAt(peg$currPos) === 47) {
-      s1 = peg$c24;
-      peg$currPos++;
-    } else {
-      s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e38); }
+    s0 = peg$parsenumericLiteral();
+    if (s0 === peg$FAILED) {
+      s0 = peg$parsestringLiteral();
     }
+
+    return s0;
+  }
+
+  function peg$parselogicalAndExpression() {
+    var s0, s1, s2, s3, s4, s5, s6, s7;
+
+    s0 = peg$currPos;
+    s1 = peg$parseequalityExpression();
     if (s1 !== peg$FAILED) {
-      s2 = peg$parsepath();
-      if (s2 === peg$FAILED) {
-        s2 = null;
+      s2 = [];
+      s3 = peg$currPos;
+      s4 = peg$parse__();
+      if (input.substr(peg$currPos, 2) === peg$c30) {
+        s5 = peg$c30;
+        peg$currPos += 2;
+      } else {
+        s5 = peg$FAILED;
+        if (peg$silentFails === 0) { peg$fail(peg$e48); }
+      }
+      if (s5 !== peg$FAILED) {
+        s6 = peg$parse__();
+        s7 = peg$parseequalityExpression();
+        if (s7 !== peg$FAILED) {
+          s3 = s7;
+        } else {
+          peg$currPos = s3;
+          s3 = peg$FAILED;
+        }
+      } else {
+        peg$currPos = s3;
+        s3 = peg$FAILED;
+      }
+      while (s3 !== peg$FAILED) {
+        s2.push(s3);
+        s3 = peg$currPos;
+        s4 = peg$parse__();
+        if (input.substr(peg$currPos, 2) === peg$c30) {
+          s5 = peg$c30;
+          peg$currPos += 2;
+        } else {
+          s5 = peg$FAILED;
+          if (peg$silentFails === 0) { peg$fail(peg$e48); }
+        }
+        if (s5 !== peg$FAILED) {
+          s6 = peg$parse__();
+          s7 = peg$parseequalityExpression();
+          if (s7 !== peg$FAILED) {
+            s3 = s7;
+          } else {
+            peg$currPos = s3;
+            s3 = peg$FAILED;
+          }
+        } else {
+          peg$currPos = s3;
+          s3 = peg$FAILED;
+        }
       }
       peg$savedPos = s0;
-      s0 = peg$f29(s2);
+      s0 = peg$f29(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$e48); }
-    }
 
     return s0;
   }
 
-  function peg$parselist() {
-    var s0, s1, s2, s3, s4;
+  function peg$parselogicalOrExpression() {
+    var s0, s1, s2, s3, s4, s5, s6, s7;
 
-    peg$silentFails++;
     s0 = peg$currPos;
-    s1 = peg$currPos;
-    s2 = [];
-    s3 = peg$parsevalue();
-    while (s3 !== peg$FAILED) {
-      s2.push(s3);
+    s1 = peg$parsenullishCoalescingExpression();
+    if (s1 !== peg$FAILED) {
+      s2 = [];
       s3 = peg$currPos;
-      s4 = peg$parseseparator();
-      if (s4 !== peg$FAILED) {
-        s4 = peg$parsevalue();
-        if (s4 === peg$FAILED) {
+      s4 = peg$parse__();
+      if (input.substr(peg$currPos, 2) === peg$c31) {
+        s5 = peg$c31;
+        peg$currPos += 2;
+      } else {
+        s5 = peg$FAILED;
+        if (peg$silentFails === 0) { peg$fail(peg$e49); }
+      }
+      if (s5 !== peg$FAILED) {
+        s6 = peg$parse__();
+        s7 = peg$parsenullishCoalescingExpression();
+        if (s7 !== peg$FAILED) {
+          s3 = s7;
+        } else {
           peg$currPos = s3;
           s3 = peg$FAILED;
-        } else {
-          s3 = s4;
         }
       } else {
-        s3 = s4;
+        peg$currPos = s3;
+        s3 = peg$FAILED;
       }
-    }
-    if (s2.length < 1) {
-      peg$currPos = s1;
-      s1 = peg$FAILED;
-    } else {
-      s1 = s2;
-    }
-    if (s1 !== peg$FAILED) {
-      s2 = peg$parseseparator();
-      if (s2 === peg$FAILED) {
-        s2 = null;
+      while (s3 !== peg$FAILED) {
+        s2.push(s3);
+        s3 = peg$currPos;
+        s4 = peg$parse__();
+        if (input.substr(peg$currPos, 2) === peg$c31) {
+          s5 = peg$c31;
+          peg$currPos += 2;
+        } else {
+          s5 = peg$FAILED;
+          if (peg$silentFails === 0) { peg$fail(peg$e49); }
+        }
+        if (s5 !== peg$FAILED) {
+          s6 = peg$parse__();
+          s7 = peg$parsenullishCoalescingExpression();
+          if (s7 !== peg$FAILED) {
+            s3 = s7;
+          } else {
+            peg$currPos = s3;
+            s3 = peg$FAILED;
+          }
+        } else {
+          peg$currPos = s3;
+          s3 = peg$FAILED;
+        }
       }
       peg$savedPos = s0;
-      s0 = peg$f30(s1);
+      s0 = peg$f30(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$e49); }
-    }
 
     return s0;
   }
@@ -2022,8 +2231,8 @@ function peg$parse(input, options) {
     var s0, s1, s2, s3, s4, s5;
 
     s0 = peg$currPos;
-    if (input.substr(peg$currPos, 2) === peg$c28) {
-      s1 = peg$c28;
+    if (input.substr(peg$currPos, 2) === peg$c32) {
+      s1 = peg$c32;
       peg$currPos += 2;
     } else {
       s1 = peg$FAILED;
@@ -2034,8 +2243,8 @@ function peg$parse(input, options) {
       s3 = peg$currPos;
       s4 = peg$currPos;
       peg$silentFails++;
-      if (input.substr(peg$currPos, 2) === peg$c29) {
-        s5 = peg$c29;
+      if (input.substr(peg$currPos, 2) === peg$c33) {
+        s5 = peg$c33;
         peg$currPos += 2;
       } else {
         s5 = peg$FAILED;
@@ -2072,8 +2281,8 @@ function peg$parse(input, options) {
         s3 = peg$currPos;
         s4 = peg$currPos;
         peg$silentFails++;
-        if (input.substr(peg$currPos, 2) === peg$c29) {
-          s5 = peg$c29;
+        if (input.substr(peg$currPos, 2) === peg$c33) {
+          s5 = peg$c33;
           peg$currPos += 2;
         } else {
           s5 = peg$FAILED;
@@ -2106,8 +2315,8 @@ function peg$parse(input, options) {
           s3 = peg$FAILED;
         }
       }
-      if (input.substr(peg$currPos, 2) === peg$c29) {
-        s3 = peg$c29;
+      if (input.substr(peg$currPos, 2) === peg$c33) {
+        s3 = peg$c33;
         peg$currPos += 2;
       } else {
         s3 = peg$FAILED;
@@ -2133,7 +2342,7 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     if (input.charCodeAt(peg$currPos) === 64) {
-      s1 = peg$c30;
+      s1 = peg$c34;
       peg$currPos++;
     } else {
       s1 = peg$FAILED;
@@ -2166,11 +2375,11 @@ function peg$parse(input, options) {
     }
     if (s2 !== peg$FAILED) {
       if (input.charCodeAt(peg$currPos) === 58) {
-        s3 = peg$c23;
+        s3 = peg$c6;
         peg$currPos++;
       } else {
         s3 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e37); }
+        if (peg$silentFails === 0) { peg$fail(peg$e11); }
       }
       if (s3 !== peg$FAILED) {
         peg$savedPos = s0;
@@ -2187,58 +2396,19 @@ function peg$parse(input, options) {
     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;
-      }
-    } else {
-      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;
-  }
-
   function peg$parsenewLine() {
     var s0;
 
     if (input.charCodeAt(peg$currPos) === 10) {
-      s0 = peg$c31;
+      s0 = peg$c35;
       peg$currPos++;
     } else {
       s0 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e54); }
     }
     if (s0 === peg$FAILED) {
-      if (input.substr(peg$currPos, 2) === peg$c32) {
-        s0 = peg$c32;
+      if (input.substr(peg$currPos, 2) === peg$c36) {
+        s0 = peg$c36;
         peg$currPos += 2;
       } else {
         s0 = peg$FAILED;
@@ -2246,7 +2416,7 @@ function peg$parse(input, options) {
       }
       if (s0 === peg$FAILED) {
         if (input.charCodeAt(peg$currPos) === 13) {
-          s0 = peg$c33;
+          s0 = peg$c37;
           peg$currPos++;
         } else {
           s0 = peg$FAILED;
@@ -2258,13 +2428,13 @@ function peg$parse(input, options) {
     return s0;
   }
 
-  function peg$parsenumber() {
+  function peg$parsenumericLiteral() {
     var s0, s1;
 
     peg$silentFails++;
-    s0 = peg$parsefloat();
+    s0 = peg$parsefloatLiteral();
     if (s0 === peg$FAILED) {
-      s0 = peg$parseinteger();
+      s0 = peg$parseintegerLiteral();
     }
     peg$silentFails--;
     if (s0 === peg$FAILED) {
@@ -2275,17 +2445,81 @@ function peg$parse(input, options) {
     return s0;
   }
 
-  function peg$parseobject() {
+  function peg$parsenullishCoalescingExpression() {
+    var s0, s1, s2, s3, s4, s5, s6, s7;
+
+    s0 = peg$currPos;
+    s1 = peg$parselogicalAndExpression();
+    if (s1 !== peg$FAILED) {
+      s2 = [];
+      s3 = peg$currPos;
+      s4 = peg$parse__();
+      if (input.substr(peg$currPos, 2) === peg$c38) {
+        s5 = peg$c38;
+        peg$currPos += 2;
+      } else {
+        s5 = peg$FAILED;
+        if (peg$silentFails === 0) { peg$fail(peg$e58); }
+      }
+      if (s5 !== peg$FAILED) {
+        s6 = peg$parse__();
+        s7 = peg$parselogicalAndExpression();
+        if (s7 !== peg$FAILED) {
+          s3 = s7;
+        } else {
+          peg$currPos = s3;
+          s3 = peg$FAILED;
+        }
+      } else {
+        peg$currPos = s3;
+        s3 = peg$FAILED;
+      }
+      while (s3 !== peg$FAILED) {
+        s2.push(s3);
+        s3 = peg$currPos;
+        s4 = peg$parse__();
+        if (input.substr(peg$currPos, 2) === peg$c38) {
+          s5 = peg$c38;
+          peg$currPos += 2;
+        } else {
+          s5 = peg$FAILED;
+          if (peg$silentFails === 0) { peg$fail(peg$e58); }
+        }
+        if (s5 !== peg$FAILED) {
+          s6 = peg$parse__();
+          s7 = peg$parselogicalAndExpression();
+          if (s7 !== peg$FAILED) {
+            s3 = s7;
+          } else {
+            peg$currPos = s3;
+            s3 = peg$FAILED;
+          }
+        } else {
+          peg$currPos = s3;
+          s3 = peg$FAILED;
+        }
+      }
+      peg$savedPos = s0;
+      s0 = peg$f33(s1, s2);
+    } else {
+      peg$currPos = s0;
+      s0 = peg$FAILED;
+    }
+
+    return s0;
+  }
+
+  function peg$parseobjectLiteral() {
     var s0, s1, s2, s3, s4, s5;
 
     peg$silentFails++;
     s0 = peg$currPos;
     if (input.charCodeAt(peg$currPos) === 123) {
-      s1 = peg$c34;
+      s1 = peg$c39;
       peg$currPos++;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e59); }
+      if (peg$silentFails === 0) { peg$fail(peg$e60); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$parse__();
@@ -2297,7 +2531,7 @@ function peg$parse(input, options) {
       s5 = peg$parseclosingBrace();
       if (s5 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f35(s3);
+        s0 = peg$f34(s3);
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -2309,7 +2543,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$e59); }
     }
 
     return s0;
@@ -2350,7 +2584,7 @@ function peg$parse(input, options) {
         s2 = null;
       }
       peg$savedPos = s0;
-      s0 = peg$f36(s1);
+      s0 = peg$f35(s1);
     } else {
       peg$currPos = s0;
       s0 = peg$FAILED;
@@ -2385,18 +2619,18 @@ function peg$parse(input, options) {
     if (s1 !== peg$FAILED) {
       s2 = peg$parse__();
       if (input.charCodeAt(peg$currPos) === 61) {
-        s3 = peg$c27;
+        s3 = peg$c40;
         peg$currPos++;
       } else {
         s3 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e47); }
+        if (peg$silentFails === 0) { peg$fail(peg$e62); }
       }
       if (s3 !== peg$FAILED) {
         s4 = peg$parse__();
-        s5 = peg$parsepipeline();
+        s5 = peg$parsepipelineExpression();
         if (s5 !== peg$FAILED) {
           peg$savedPos = s0;
-          s0 = peg$f37(s1, s5);
+          s0 = peg$f36(s1, s5);
         } else {
           peg$currPos = s0;
           s0 = peg$FAILED;
@@ -2412,7 +2646,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$e61); }
     }
 
     return s0;
@@ -2424,21 +2658,21 @@ function peg$parse(input, options) {
     s0 = peg$currPos;
     s1 = peg$currPos;
     if (input.charCodeAt(peg$currPos) === 40) {
-      s2 = peg$c19;
+      s2 = peg$c1;
       peg$currPos++;
     } else {
       s2 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e31); }
+      if (peg$silentFails === 0) { peg$fail(peg$e3); }
     }
     if (s2 !== peg$FAILED) {
       s3 = peg$parseobjectPublicKey();
       if (s3 !== peg$FAILED) {
         if (input.charCodeAt(peg$currPos) === 41) {
-          s4 = peg$c4;
+          s4 = peg$c2;
           peg$currPos++;
         } else {
           s4 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e9); }
+          if (peg$silentFails === 0) { peg$fail(peg$e4); }
         }
         if (s4 !== peg$FAILED) {
           s2 = [s2, s3, s4];
@@ -2457,7 +2691,7 @@ function peg$parse(input, options) {
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f38(s1);
+      s1 = peg$f37(s1);
     }
     s0 = s1;
 
@@ -2475,7 +2709,7 @@ function peg$parse(input, options) {
     peg$silentFails--;
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e61); }
+      if (peg$silentFails === 0) { peg$fail(peg$e63); }
     }
 
     return s0;
@@ -2490,18 +2724,18 @@ function peg$parse(input, options) {
     if (s1 !== peg$FAILED) {
       s2 = peg$parse__();
       if (input.charCodeAt(peg$currPos) === 58) {
-        s3 = peg$c23;
+        s3 = peg$c6;
         peg$currPos++;
       } else {
         s3 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e37); }
+        if (peg$silentFails === 0) { peg$fail(peg$e11); }
       }
       if (s3 !== peg$FAILED) {
         s4 = peg$parse__();
-        s5 = peg$parsepipeline();
+        s5 = peg$parsepipelineExpression();
         if (s5 !== peg$FAILED) {
           peg$savedPos = s0;
-          s0 = peg$f39(s1, s5);
+          s0 = peg$f38(s1, s5);
         } else {
           peg$currPos = s0;
           s0 = peg$FAILED;
@@ -2517,7 +2751,7 @@ function peg$parse(input, options) {
     peg$silentFails--;
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e62); }
+      if (peg$silentFails === 0) { peg$fail(peg$e64); }
     }
 
     return s0;
@@ -2531,13 +2765,13 @@ function peg$parse(input, options) {
     s1 = peg$parseobjectPublicKey();
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f40(s1);
+      s1 = peg$f39(s1);
     }
     s0 = s1;
     peg$silentFails--;
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e63); }
+      if (peg$silentFails === 0) { peg$fail(peg$e65); }
     }
 
     return s0;
@@ -2550,27 +2784,27 @@ function peg$parse(input, options) {
     s1 = peg$parseidentifier();
     if (s1 !== peg$FAILED) {
       if (input.charCodeAt(peg$currPos) === 47) {
-        s2 = peg$c24;
+        s2 = peg$c41;
         peg$currPos++;
       } else {
         s2 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e38); }
+        if (peg$silentFails === 0) { peg$fail(peg$e66); }
       }
       if (s2 === peg$FAILED) {
         s2 = null;
       }
       peg$savedPos = s0;
-      s0 = peg$f41(s1, s2);
+      s0 = peg$f40(s1, s2);
     } else {
       peg$currPos = s0;
       s0 = peg$FAILED;
     }
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
-      s1 = peg$parsestring();
+      s1 = peg$parsestringLiteral();
       if (s1 !== peg$FAILED) {
         peg$savedPos = s0;
-        s1 = peg$f42(s1);
+        s1 = peg$f41(s1);
       }
       s0 = s1;
     }
@@ -2578,48 +2812,35 @@ function peg$parse(input, options) {
     return s0;
   }
 
-  function peg$parseparameterizedLambda() {
-    var s0, s1, s2, s3, s4, s5, s6, s7, s8, s9;
+  function peg$parseparenthesesArguments() {
+    var s0, s1, s2, s3, s4, s5;
 
+    peg$silentFails++;
     s0 = peg$currPos;
     if (input.charCodeAt(peg$currPos) === 40) {
-      s1 = peg$c19;
+      s1 = peg$c1;
       peg$currPos++;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e31); }
+      if (peg$silentFails === 0) { peg$fail(peg$e3); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$parse__();
-      s3 = peg$parseidentifierList();
+      s3 = peg$parselist();
       if (s3 === peg$FAILED) {
         s3 = null;
       }
       s4 = peg$parse__();
       if (input.charCodeAt(peg$currPos) === 41) {
-        s5 = peg$c4;
+        s5 = peg$c2;
         peg$currPos++;
       } else {
         s5 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e9); }
+        if (peg$silentFails === 0) { peg$fail(peg$e4); }
       }
       if (s5 !== peg$FAILED) {
-        s6 = peg$parse__();
-        s7 = peg$parsedoubleArrow();
-        if (s7 !== peg$FAILED) {
-          s8 = peg$parse__();
-          s9 = peg$parsepipeline();
-          if (s9 !== peg$FAILED) {
-            peg$savedPos = s0;
-            s0 = peg$f43(s3, s9);
-          } else {
-            peg$currPos = s0;
-            s0 = peg$FAILED;
-          }
-        } else {
-          peg$currPos = s0;
-          s0 = peg$FAILED;
-        }
+        peg$savedPos = s0;
+        s0 = peg$f42(s3);
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -2628,131 +2849,107 @@ function peg$parse(input, options) {
       peg$currPos = s0;
       s0 = peg$FAILED;
     }
+    peg$silentFails--;
+    if (s0 === peg$FAILED) {
+      s1 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$e67); }
+    }
 
     return s0;
   }
 
-  function peg$parseparensArgs() {
-    var s0, s1, s2, s3, s4, s5;
+  function peg$parsepath() {
+    var s0, s1, s2, s3;
 
     peg$silentFails++;
     s0 = peg$currPos;
-    if (input.charCodeAt(peg$currPos) === 40) {
-      s1 = peg$c19;
-      peg$currPos++;
-    } else {
+    s1 = peg$currPos;
+    s2 = [];
+    s3 = peg$parsepathSegment();
+    while (s3 !== peg$FAILED) {
+      s2.push(s3);
+      s3 = peg$parsepathSegment();
+    }
+    if (s2.length < 1) {
+      peg$currPos = s1;
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e31); }
+    } else {
+      s1 = s2;
     }
     if (s1 !== peg$FAILED) {
-      s2 = peg$parse__();
-      s3 = peg$parselist();
-      if (s3 === peg$FAILED) {
-        s3 = null;
-      }
-      s4 = peg$parse__();
-      if (input.charCodeAt(peg$currPos) === 41) {
-        s5 = peg$c4;
-        peg$currPos++;
-      } else {
-        s5 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e9); }
-      }
-      if (s5 !== peg$FAILED) {
-        peg$savedPos = s0;
-        s0 = peg$f44(s3);
-      } else {
-        peg$currPos = s0;
-        s0 = peg$FAILED;
-      }
-    } else {
-      peg$currPos = s0;
-      s0 = peg$FAILED;
+      peg$savedPos = s0;
+      s1 = peg$f43(s1);
     }
+    s0 = s1;
     peg$silentFails--;
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e64); }
+      if (peg$silentFails === 0) { peg$fail(peg$e68); }
     }
 
     return s0;
   }
 
-  function peg$parsepath() {
-    var s0, s1, s2, s3;
+  function peg$parsepathArguments() {
+    var s0, s1;
 
-    peg$silentFails++;
     s0 = peg$currPos;
-    s1 = [];
-    s2 = peg$parsepathElement();
-    while (s2 !== peg$FAILED) {
-      s1.push(s2);
-      s2 = peg$parsepathElement();
+    s1 = peg$parsepath();
+    if (s1 !== peg$FAILED) {
+      peg$savedPos = s0;
+      s1 = peg$f44(s1);
     }
-    s2 = peg$parsepathTail();
+    s0 = s1;
+
+    return s0;
+  }
+
+  function peg$parsepathKey() {
+    var s0, s1, s2;
+
+    s0 = peg$currPos;
+    s1 = [];
+    s2 = peg$parsepathSegmentChar();
     if (s2 !== peg$FAILED) {
+      while (s2 !== peg$FAILED) {
+        s1.push(s2);
+        s2 = peg$parsepathSegmentChar();
+      }
+    } else {
+      s1 = peg$FAILED;
+    }
+    if (s1 !== peg$FAILED) {
+      s2 = peg$parseslashFollows();
+      if (s2 === peg$FAILED) {
+        s2 = null;
+      }
       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$silentFails--;
-    if (s0 === peg$FAILED) {
-      s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e65); }
-    }
 
     return s0;
   }
 
-  function peg$parsepathElement() {
+  function peg$parsepathSegment() {
     var s0, s1, s2;
 
     s0 = peg$currPos;
-    s1 = [];
-    s2 = peg$parsepathKeyChar();
-    while (s2 !== peg$FAILED) {
-      s1.push(s2);
-      s2 = peg$parsepathKeyChar();
-    }
     if (input.charCodeAt(peg$currPos) === 47) {
-      s2 = peg$c24;
+      s1 = peg$c41;
       peg$currPos++;
     } else {
-      s2 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e38); }
+      s1 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$e66); }
     }
-    if (s2 !== peg$FAILED) {
-      peg$savedPos = s0;
-      s0 = peg$f47(s1);
+    if (s1 !== peg$FAILED) {
+      s2 = peg$parsepathKey();
+      if (s2 === peg$FAILED) {
+        s2 = null;
+      }
+      s0 = s2;
     } else {
       peg$currPos = s0;
       s0 = peg$FAILED;
@@ -2761,7 +2958,7 @@ function peg$parse(input, options) {
     return s0;
   }
 
-  function peg$parsepathKeyChar() {
+  function peg$parsepathSegmentChar() {
     var s0;
 
     s0 = input.charAt(peg$currPos);
@@ -2769,7 +2966,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e66); }
+      if (peg$silentFails === 0) { peg$fail(peg$e69); }
     }
     if (s0 === peg$FAILED) {
       s0 = peg$parseescapedChar();
@@ -2778,34 +2975,11 @@ function peg$parse(input, options) {
     return s0;
   }
 
-  function peg$parsepathTail() {
-    var s0, s1, s2;
-
-    s0 = peg$currPos;
-    s1 = [];
-    s2 = peg$parsepathKeyChar();
-    if (s2 !== peg$FAILED) {
-      while (s2 !== peg$FAILED) {
-        s1.push(s2);
-        s2 = peg$parsepathKeyChar();
-      }
-    } else {
-      s1 = peg$FAILED;
-    }
-    if (s1 !== peg$FAILED) {
-      peg$savedPos = s0;
-      s1 = peg$f48(s1);
-    }
-    s0 = s1;
-
-    return s0;
-  }
-
-  function peg$parsepipeline() {
+  function peg$parsepipelineExpression() {
     var s0, s1, s2, s3, s4, s5, s6, s7;
 
     s0 = peg$currPos;
-    s1 = peg$parsevalue();
+    s1 = peg$parseshorthandFunction();
     if (s1 !== peg$FAILED) {
       s2 = [];
       s3 = peg$currPos;
@@ -2813,7 +2987,7 @@ function peg$parse(input, options) {
       s5 = peg$parsesingleArrow();
       if (s5 !== peg$FAILED) {
         s6 = peg$parse__();
-        s7 = peg$parsepipelineStep();
+        s7 = peg$parseshorthandFunction();
         if (s7 !== peg$FAILED) {
           s3 = s7;
         } else {
@@ -2831,7 +3005,7 @@ function peg$parse(input, options) {
         s5 = peg$parsesingleArrow();
         if (s5 !== peg$FAILED) {
           s6 = peg$parse__();
-          s7 = peg$parsepipelineStep();
+          s7 = peg$parseshorthandFunction();
           if (s7 !== peg$FAILED) {
             s3 = s7;
           } else {
@@ -2844,7 +3018,7 @@ function peg$parse(input, options) {
         }
       }
       peg$savedPos = s0;
-      s0 = peg$f49(s1, s2);
+      s0 = peg$f46(s1, s2);
     } else {
       peg$currPos = s0;
       s0 = peg$FAILED;
@@ -2853,14 +3027,23 @@ function peg$parse(input, options) {
     return s0;
   }
 
-  function peg$parsepipelineStep() {
+  function peg$parseprimary() {
     var s0;
 
-    s0 = peg$parselambda();
+    s0 = peg$parseliteral();
     if (s0 === peg$FAILED) {
-      s0 = peg$parseparameterizedLambda();
+      s0 = peg$parsearrayLiteral();
       if (s0 === peg$FAILED) {
-        s0 = peg$parsecallTarget();
+        s0 = peg$parseobjectLiteral();
+        if (s0 === peg$FAILED) {
+          s0 = peg$parsegroup();
+          if (s0 === peg$FAILED) {
+            s0 = peg$parsetemplateLiteral();
+            if (s0 === peg$FAILED) {
+              s0 = peg$parsereference();
+            }
+          }
+        }
       }
     }
 
@@ -2886,60 +3069,183 @@ function peg$parse(input, options) {
     peg$silentFails--;
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e67); }
+      if (peg$silentFails === 0) { peg$fail(peg$e70); }
     }
 
     return s0;
   }
 
-  function peg$parsescopeReference() {
-    var s0, s1;
+  function peg$parseprotocolExpression() {
+    var s0, s1, s2, s3, s4;
 
-    peg$silentFails++;
     s0 = peg$currPos;
-    s1 = peg$parseidentifier();
+    s1 = peg$parsenamespace();
     if (s1 !== peg$FAILED) {
-      peg$savedPos = s0;
-      s1 = peg$f50(s1);
+      if (input.substr(peg$currPos, 2) === peg$c42) {
+        s2 = peg$c42;
+        peg$currPos += 2;
+      } else {
+        s2 = peg$FAILED;
+        if (peg$silentFails === 0) { peg$fail(peg$e71); }
+      }
+      if (s2 !== peg$FAILED) {
+        s3 = peg$parsehost();
+        if (s3 !== peg$FAILED) {
+          s4 = peg$parsepath();
+          if (s4 === peg$FAILED) {
+            s4 = null;
+          }
+          peg$savedPos = s0;
+          s0 = peg$f47(s1, s3, s4);
+        } else {
+          peg$currPos = s0;
+          s0 = peg$FAILED;
+        }
+      } else {
+        peg$currPos = s0;
+        s0 = peg$FAILED;
+      }
+    } else {
+      peg$currPos = s0;
+      s0 = peg$FAILED;
     }
-    s0 = s1;
-    peg$silentFails--;
     if (s0 === peg$FAILED) {
-      s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e68); }
+      s0 = peg$parseprimary();
+    }
+
+    return s0;
+  }
+
+  function peg$parsequalifiedReference() {
+    var s0, s1, s2;
+
+    s0 = peg$currPos;
+    s1 = peg$parsenamespace();
+    if (s1 !== peg$FAILED) {
+      s2 = peg$parsescopeReference();
+      if (s2 !== peg$FAILED) {
+        peg$savedPos = s0;
+        s0 = peg$f48(s1, s2);
+      } else {
+        peg$currPos = s0;
+        s0 = peg$FAILED;
+      }
+    } else {
+      peg$currPos = s0;
+      s0 = peg$FAILED;
+    }
+
+    return s0;
+  }
+
+  function peg$parsereference() {
+    var s0;
+
+    s0 = peg$parserootDirectory();
+    if (s0 === peg$FAILED) {
+      s0 = peg$parsehomeDirectory();
+      if (s0 === peg$FAILED) {
+        s0 = peg$parsequalifiedReference();
+        if (s0 === peg$FAILED) {
+          s0 = peg$parsenamespace();
+          if (s0 === peg$FAILED) {
+            s0 = peg$parsescopeReference();
+          }
+        }
+      }
     }
 
     return s0;
   }
 
-  function peg$parsescopeTraverse() {
+  function peg$parserootDirectory() {
     var s0, s1, s2, s3;
 
     s0 = peg$currPos;
-    s1 = peg$parsescopeReference();
+    if (input.charCodeAt(peg$currPos) === 47) {
+      s1 = peg$c41;
+      peg$currPos++;
+    } else {
+      s1 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$e66); }
+    }
     if (s1 !== peg$FAILED) {
+      s2 = peg$parsepathKey();
+      if (s2 !== peg$FAILED) {
+        peg$savedPos = s0;
+        s0 = peg$f49(s2);
+      } else {
+        peg$currPos = s0;
+        s0 = peg$FAILED;
+      }
+    } else {
+      peg$currPos = s0;
+      s0 = peg$FAILED;
+    }
+    if (s0 === peg$FAILED) {
+      s0 = peg$currPos;
       if (input.charCodeAt(peg$currPos) === 47) {
-        s2 = peg$c24;
+        s1 = peg$c41;
         peg$currPos++;
       } else {
-        s2 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e38); }
+        s1 = peg$FAILED;
+        if (peg$silentFails === 0) { peg$fail(peg$e66); }
       }
-      if (s2 !== peg$FAILED) {
-        s3 = peg$parsepath();
+      if (s1 !== peg$FAILED) {
+        s2 = peg$currPos;
+        peg$silentFails++;
+        if (input.charCodeAt(peg$currPos) === 47) {
+          s3 = peg$c41;
+          peg$currPos++;
+        } else {
+          s3 = peg$FAILED;
+          if (peg$silentFails === 0) { peg$fail(peg$e66); }
+        }
+        peg$silentFails--;
         if (s3 === peg$FAILED) {
-          s3 = null;
+          s2 = undefined;
+        } else {
+          peg$currPos = s2;
+          s2 = peg$FAILED;
+        }
+        if (s2 !== peg$FAILED) {
+          peg$savedPos = s0;
+          s0 = peg$f50();
+        } else {
+          peg$currPos = s0;
+          s0 = peg$FAILED;
         }
-        peg$savedPos = s0;
-        s0 = peg$f51(s1, s3);
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
       }
+    }
+
+    return s0;
+  }
+
+  function peg$parsescopeReference() {
+    var s0, s1, s2;
+
+    peg$silentFails++;
+    s0 = peg$currPos;
+    s1 = peg$parseidentifier();
+    if (s1 !== peg$FAILED) {
+      s2 = peg$parseslashFollows();
+      if (s2 === peg$FAILED) {
+        s2 = null;
+      }
+      peg$savedPos = s0;
+      s0 = peg$f51(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$e72); }
+    }
 
     return s0;
   }
@@ -2950,11 +3256,11 @@ function peg$parse(input, options) {
     s0 = peg$currPos;
     s1 = peg$parse__();
     if (input.charCodeAt(peg$currPos) === 44) {
-      s2 = peg$c35;
+      s2 = peg$c43;
       peg$currPos++;
     } else {
       s2 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e69); }
+      if (peg$silentFails === 0) { peg$fail(peg$e73); }
     }
     if (s2 !== peg$FAILED) {
       s3 = peg$parse__();
@@ -2971,16 +3277,45 @@ 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$c41;
+      peg$currPos++;
+    } else {
+      s2 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$e66); }
+    }
+    peg$silentFails--;
+    if (s2 !== peg$FAILED) {
+      peg$currPos = s1;
+      s1 = undefined;
+    } else {
+      s1 = peg$FAILED;
+    }
+    if (s1 !== peg$FAILED) {
+      peg$savedPos = s0;
+      s1 = peg$f52();
+    }
+    s0 = s1;
+
+    return s0;
+  }
+
   function peg$parseshebang() {
     var s0, s1, s2, s3;
 
     s0 = peg$currPos;
-    if (input.substr(peg$currPos, 2) === peg$c36) {
-      s1 = peg$c36;
+    if (input.substr(peg$currPos, 2) === peg$c44) {
+      s1 = peg$c44;
       peg$currPos += 2;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e70); }
+      if (peg$silentFails === 0) { peg$fail(peg$e74); }
     }
     if (s1 !== peg$FAILED) {
       s2 = [];
@@ -2989,7 +3324,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s3 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e71); }
+        if (peg$silentFails === 0) { peg$fail(peg$e75); }
       }
       while (s3 !== peg$FAILED) {
         s2.push(s3);
@@ -2998,15 +3333,74 @@ function peg$parse(input, options) {
           peg$currPos++;
         } else {
           s3 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e71); }
+          if (peg$silentFails === 0) { peg$fail(peg$e75); }
         }
       }
       peg$savedPos = s0;
-      s0 = peg$f52();
+      s0 = peg$f53();
+    } else {
+      peg$currPos = s0;
+      s0 = peg$FAILED;
+    }
+
+    return s0;
+  }
+
+  function peg$parseshorthandFunction() {
+    var s0, s1, s2, s3, s4;
+
+    peg$silentFails++;
+    s0 = peg$currPos;
+    if (input.charCodeAt(peg$currPos) === 61) {
+      s1 = peg$c40;
+      peg$currPos++;
+    } else {
+      s1 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$e62); }
+    }
+    if (s1 !== peg$FAILED) {
+      s2 = peg$currPos;
+      peg$silentFails++;
+      if (input.charCodeAt(peg$currPos) === 61) {
+        s3 = peg$c40;
+        peg$currPos++;
+      } else {
+        s3 = peg$FAILED;
+        if (peg$silentFails === 0) { peg$fail(peg$e62); }
+      }
+      peg$silentFails--;
+      if (s3 === peg$FAILED) {
+        s2 = undefined;
+      } else {
+        peg$currPos = s2;
+        s2 = peg$FAILED;
+      }
+      if (s2 !== peg$FAILED) {
+        s3 = peg$parse__();
+        s4 = peg$parseimplicitParenthesesCallExpression();
+        if (s4 !== peg$FAILED) {
+          peg$savedPos = s0;
+          s0 = peg$f54(s4);
+        } else {
+          peg$currPos = s0;
+          s0 = peg$FAILED;
+        }
+      } else {
+        peg$currPos = s0;
+        s0 = peg$FAILED;
+      }
     } else {
       peg$currPos = s0;
       s0 = peg$FAILED;
     }
+    if (s0 === peg$FAILED) {
+      s0 = peg$parseimplicitParenthesesCallExpression();
+    }
+    peg$silentFails--;
+    if (s0 === peg$FAILED) {
+      s1 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$e76); }
+    }
 
     return s0;
   }
@@ -3019,7 +3413,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e72); }
+      if (peg$silentFails === 0) { peg$fail(peg$e77); }
     }
 
     return s0;
@@ -3029,19 +3423,19 @@ function peg$parse(input, options) {
     var s0;
 
     if (input.charCodeAt(peg$currPos) === 8594) {
-      s0 = peg$c37;
+      s0 = peg$c45;
       peg$currPos++;
     } else {
       s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e73); }
+      if (peg$silentFails === 0) { peg$fail(peg$e78); }
     }
     if (s0 === peg$FAILED) {
-      if (input.substr(peg$currPos, 2) === peg$c38) {
-        s0 = peg$c38;
+      if (input.substr(peg$currPos, 2) === peg$c46) {
+        s0 = peg$c46;
         peg$currPos += 2;
       } else {
         s0 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e74); }
+        if (peg$silentFails === 0) { peg$fail(peg$e79); }
       }
     }
 
@@ -3052,12 +3446,12 @@ function peg$parse(input, options) {
     var s0, s1, s2, s3;
 
     s0 = peg$currPos;
-    if (input.substr(peg$currPos, 2) === peg$c0) {
-      s1 = peg$c0;
+    if (input.substr(peg$currPos, 2) === peg$c42) {
+      s1 = peg$c42;
       peg$currPos += 2;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e1); }
+      if (peg$silentFails === 0) { peg$fail(peg$e71); }
     }
     if (s1 !== peg$FAILED) {
       s2 = [];
@@ -3066,7 +3460,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s3 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e71); }
+        if (peg$silentFails === 0) { peg$fail(peg$e75); }
       }
       while (s3 !== peg$FAILED) {
         s2.push(s3);
@@ -3075,11 +3469,11 @@ function peg$parse(input, options) {
           peg$currPos++;
         } else {
           s3 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e71); }
+          if (peg$silentFails === 0) { peg$fail(peg$e75); }
         }
       }
       peg$savedPos = s0;
-      s0 = peg$f53();
+      s0 = peg$f55();
     } else {
       peg$currPos = s0;
       s0 = peg$FAILED;
@@ -3094,11 +3488,11 @@ function peg$parse(input, options) {
     peg$silentFails++;
     s0 = peg$currPos;
     if (input.charCodeAt(peg$currPos) === 39) {
-      s1 = peg$c39;
+      s1 = peg$c47;
       peg$currPos++;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e76); }
+      if (peg$silentFails === 0) { peg$fail(peg$e81); }
     }
     if (s1 !== peg$FAILED) {
       s2 = [];
@@ -3108,15 +3502,15 @@ function peg$parse(input, options) {
         s3 = peg$parsesingleQuoteStringChar();
       }
       if (input.charCodeAt(peg$currPos) === 39) {
-        s3 = peg$c39;
+        s3 = peg$c47;
         peg$currPos++;
       } else {
         s3 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e76); }
+        if (peg$silentFails === 0) { peg$fail(peg$e81); }
       }
       if (s3 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f54(s2);
+        s0 = peg$f56(s2);
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -3128,7 +3522,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$e80); }
     }
 
     return s0;
@@ -3141,11 +3535,11 @@ function peg$parse(input, options) {
     s1 = peg$currPos;
     peg$silentFails++;
     if (input.charCodeAt(peg$currPos) === 39) {
-      s2 = peg$c39;
+      s2 = peg$c47;
       peg$currPos++;
     } else {
       s2 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e76); }
+      if (peg$silentFails === 0) { peg$fail(peg$e81); }
     }
     if (s2 === peg$FAILED) {
       s2 = peg$parsenewLine();
@@ -3174,15 +3568,16 @@ function peg$parse(input, options) {
   }
 
   function peg$parsespread() {
-    var s0, s1, s2;
+    var s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = peg$parseellipsis();
     if (s1 !== peg$FAILED) {
-      s2 = peg$parsevalue();
-      if (s2 !== peg$FAILED) {
+      s2 = peg$parse__();
+      s3 = peg$parseconditionalExpression();
+      if (s3 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f55(s2);
+        s0 = peg$f57(s3);
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -3195,15 +3590,7 @@ function peg$parse(input, options) {
     return s0;
   }
 
-  function peg$parsestart() {
-    var s0;
-
-    s0 = peg$parsenumber();
-
-    return s0;
-  }
-
-  function peg$parsestring() {
+  function peg$parsestringLiteral() {
     var s0, s1;
 
     peg$silentFails++;
@@ -3217,48 +3604,7 @@ function peg$parse(input, options) {
     peg$silentFails--;
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e77); }
-    }
-
-    return s0;
-  }
-
-  function peg$parsetaggedTemplate() {
-    var s0, s1, s2, s3, s4;
-
-    s0 = peg$currPos;
-    s1 = peg$parsecallTarget();
-    if (s1 !== peg$FAILED) {
-      if (input.charCodeAt(peg$currPos) === 96) {
-        s2 = peg$c40;
-        peg$currPos++;
-      } else {
-        s2 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e78); }
-      }
-      if (s2 !== peg$FAILED) {
-        s3 = peg$parsetemplateLiteralContents();
-        if (input.charCodeAt(peg$currPos) === 96) {
-          s4 = peg$c40;
-          peg$currPos++;
-        } else {
-          s4 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e78); }
-        }
-        if (s4 !== peg$FAILED) {
-          peg$savedPos = s0;
-          s0 = peg$f56(s1, s3);
-        } else {
-          peg$currPos = s0;
-          s0 = peg$FAILED;
-        }
-      } else {
-        peg$currPos = s0;
-        s0 = peg$FAILED;
-      }
-    } else {
-      peg$currPos = s0;
-      s0 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$e82); }
     }
 
     return s0;
@@ -3271,11 +3617,11 @@ function peg$parse(input, options) {
     s0 = peg$currPos;
     s1 = peg$parsetemplateDocumentContents();
     peg$savedPos = s0;
-    s1 = peg$f57(s1);
+    s1 = peg$f58(s1);
     s0 = s1;
     peg$silentFails--;
     s1 = peg$FAILED;
-    if (peg$silentFails === 0) { peg$fail(peg$e79); }
+    if (peg$silentFails === 0) { peg$fail(peg$e83); }
 
     return s0;
   }
@@ -3286,12 +3632,12 @@ function peg$parse(input, options) {
     s0 = peg$currPos;
     s1 = peg$currPos;
     peg$silentFails++;
-    if (input.substr(peg$currPos, 2) === peg$c41) {
-      s2 = peg$c41;
+    if (input.substr(peg$currPos, 2) === peg$c48) {
+      s2 = peg$c48;
       peg$currPos += 2;
     } else {
       s2 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e80); }
+      if (peg$silentFails === 0) { peg$fail(peg$e84); }
     }
     peg$silentFails--;
     if (s2 === peg$FAILED) {
@@ -3346,7 +3692,7 @@ function peg$parse(input, options) {
       }
     }
     peg$savedPos = s0;
-    s0 = peg$f58(s1, s2);
+    s0 = peg$f59(s1, s2);
 
     return s0;
   }
@@ -3363,11 +3709,11 @@ function peg$parse(input, options) {
       s2 = peg$parsetemplateDocumentChar();
     }
     peg$savedPos = s0;
-    s1 = peg$f59(s1);
+    s1 = peg$f60(s1);
     s0 = s1;
     peg$silentFails--;
     s1 = peg$FAILED;
-    if (peg$silentFails === 0) { peg$fail(peg$e81); }
+    if (peg$silentFails === 0) { peg$fail(peg$e85); }
 
     return s0;
   }
@@ -3378,24 +3724,24 @@ function peg$parse(input, options) {
     peg$silentFails++;
     s0 = peg$currPos;
     if (input.charCodeAt(peg$currPos) === 96) {
-      s1 = peg$c40;
+      s1 = peg$c49;
       peg$currPos++;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e78); }
+      if (peg$silentFails === 0) { peg$fail(peg$e87); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$parsetemplateLiteralContents();
       if (input.charCodeAt(peg$currPos) === 96) {
-        s3 = peg$c40;
+        s3 = peg$c49;
         peg$currPos++;
       } else {
         s3 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e78); }
+        if (peg$silentFails === 0) { peg$fail(peg$e87); }
       }
       if (s3 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f60(s2);
+        s0 = peg$f61(s2);
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -3407,7 +3753,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$e86); }
     }
 
     return s0;
@@ -3420,19 +3766,19 @@ function peg$parse(input, options) {
     s1 = peg$currPos;
     peg$silentFails++;
     if (input.charCodeAt(peg$currPos) === 96) {
-      s2 = peg$c40;
+      s2 = peg$c49;
       peg$currPos++;
     } else {
       s2 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e78); }
+      if (peg$silentFails === 0) { peg$fail(peg$e87); }
     }
     if (s2 === peg$FAILED) {
-      if (input.substr(peg$currPos, 2) === peg$c41) {
-        s2 = peg$c41;
+      if (input.substr(peg$currPos, 2) === peg$c48) {
+        s2 = peg$c48;
         peg$currPos += 2;
       } else {
         s2 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e80); }
+        if (peg$silentFails === 0) { peg$fail(peg$e84); }
       }
     }
     peg$silentFails--;
@@ -3504,7 +3850,7 @@ function peg$parse(input, options) {
       s2 = peg$parsetemplateLiteralChar();
     }
     peg$savedPos = s0;
-    s1 = peg$f61(s1);
+    s1 = peg$f62(s1);
     s0 = s1;
 
     return s0;
@@ -3515,25 +3861,26 @@ function peg$parse(input, options) {
 
     peg$silentFails++;
     s0 = peg$currPos;
-    if (input.substr(peg$currPos, 2) === peg$c41) {
-      s1 = peg$c41;
+    if (input.substr(peg$currPos, 2) === peg$c48) {
+      s1 = peg$c48;
       peg$currPos += 2;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e80); }
+      if (peg$silentFails === 0) { peg$fail(peg$e84); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$parseexpression();
       if (s2 !== peg$FAILED) {
         if (input.charCodeAt(peg$currPos) === 125) {
-          s3 = peg$c2;
+          s3 = peg$c3;
           peg$currPos++;
         } else {
           s3 = peg$FAILED;
           if (peg$silentFails === 0) { peg$fail(peg$e6); }
         }
         if (s3 !== peg$FAILED) {
-          s0 = s2;
+          peg$savedPos = s0;
+          s0 = peg$f63(s2);
         } else {
           peg$currPos = s0;
           s0 = peg$FAILED;
@@ -3549,7 +3896,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$e88); }
     }
 
     return s0;
@@ -3572,54 +3919,41 @@ function peg$parse(input, options) {
     return s0;
   }
 
-  function peg$parsevalue() {
-    var s0;
+  function peg$parseunaryExpression() {
+    var s0, s1, s2, s3;
 
-    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();
-                                }
-                              }
-                            }
-                          }
-                        }
-                      }
-                    }
-                  }
-                }
-              }
-            }
-          }
-        }
+    s0 = peg$currPos;
+    s1 = peg$parseunaryOperator();
+    if (s1 !== peg$FAILED) {
+      s2 = peg$parse__();
+      s3 = peg$parseunaryExpression();
+      if (s3 !== peg$FAILED) {
+        peg$savedPos = s0;
+        s0 = peg$f64(s1, s3);
+      } else {
+        peg$currPos = s0;
+        s0 = peg$FAILED;
       }
+    } else {
+      peg$currPos = s0;
+      s0 = peg$FAILED;
+    }
+    if (s0 === peg$FAILED) {
+      s0 = peg$parsecallExpression();
+    }
+
+    return s0;
+  }
+
+  function peg$parseunaryOperator() {
+    var s0;
+
+    if (input.charCodeAt(peg$currPos) === 33) {
+      s0 = peg$c50;
+      peg$currPos++;
+    } else {
+      s0 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$e89); }
     }
 
     return s0;
@@ -3682,47 +4016,49 @@ function peg$parse(input, options) {
 
 const peg$allowedStartRules = [
   "__",
-  "absoluteFilePath",
-  "args",
-  "array",
+  "arguments",
+  "arrayLiteral",
   "arrayEntries",
   "arrayEntry",
-  "callTarget",
+  "arrowFunction",
+  "callExpression",
   "closingBrace",
   "closingBracket",
-  "closingParen",
+  "closingParenthesis",
   "comment",
+  "conditionalExpression",
   "digits",
   "doubleArrow",
   "doubleQuoteString",
   "doubleQuoteStringChar",
-  "doubleSlashPath",
   "ellipsis",
+  "equalityExpression",
+  "equalityOperator",
   "escapedChar",
   "expression",
-  "float",
-  "functionComposition",
-  "functionReference",
+  "floatLiteral",
   "group",
   "guillemetString",
   "guillemetStringChar",
-  "homeTree",
+  "homeDirectory",
   "host",
   "identifier",
   "identifierChar",
   "identifierList",
-  "implicitParensArgs",
+  "implicitParenthesesCallExpression",
+  "implicitParensthesesArguments",
   "inlineSpace",
-  "integer",
-  "lambda",
-  "leadingSlashPath",
+  "integerLiteral",
   "list",
+  "literal",
+  "logicalAndExpression",
+  "logicalOrExpression",
   "multiLineComment",
   "namespace",
-  "namespacePath",
   "newLine",
-  "number",
-  "object",
+  "numericLiteral",
+  "nullishCoalescingExpression",
+  "objectLiteral",
   "objectEntries",
   "objectEntry",
   "objectGetter",
@@ -3731,28 +4067,31 @@ const peg$allowedStartRules = [
   "objectProperty",
   "objectShorthandProperty",
   "objectPublicKey",
-  "parameterizedLambda",
-  "parensArgs",
+  "parenthesesArguments",
   "path",
-  "pathElement",
-  "pathKeyChar",
-  "pathTail",
-  "pipeline",
-  "pipelineStep",
+  "pathArguments",
+  "pathKey",
+  "pathSegment",
+  "pathSegmentChar",
+  "pipelineExpression",
+  "primary",
   "program",
+  "protocolExpression",
+  "qualifiedReference",
+  "reference",
+  "rootDirectory",
   "scopeReference",
-  "scopeTraverse",
   "separator",
+  "slashFollows",
   "shebang",
+  "shorthandFunction",
   "sign",
   "singleArrow",
   "singleLineComment",
   "singleQuoteString",
   "singleQuoteStringChar",
   "spread",
-  "start",
-  "string",
-  "taggedTemplate",
+  "stringLiteral",
   "templateDocument",
   "templateDocumentChar",
   "templateDocumentContents",
@@ -3763,7 +4102,8 @@ const peg$allowedStartRules = [
   "templateLiteralText",
   "templateSubstitution",
   "textChar",
-  "value",
+  "unaryExpression",
+  "unaryOperator",
   "whitespaceWithNewLine"
 ];