@weborigami/language 0.2.1 → 0.2.3

package/src/compiler/parse.js

@@ -202,7 +202,7 @@ function peg$parse(input, options) {
   var peg$FAILED = {};
   var peg$source = options.grammarSource;
 
-  var peg$startRuleFunctions = { __: peg$parse__, additiveExpression: peg$parseadditiveExpression, additiveOperator: peg$parseadditiveOperator, arguments: peg$parsearguments, arrayLiteral: peg$parsearrayLiteral, arrayEntries: peg$parsearrayEntries, arrayEntry: peg$parsearrayEntry, arrowFunction: peg$parsearrowFunction, bitwiseAndExpression: peg$parsebitwiseAndExpression, bitwiseAndOperator: peg$parsebitwiseAndOperator, bitwiseOrExpression: peg$parsebitwiseOrExpression, bitwiseOrOperator: peg$parsebitwiseOrOperator, bitwiseXorExpression: peg$parsebitwiseXorExpression, bitwiseXorOperator: peg$parsebitwiseXorOperator, callExpression: peg$parsecallExpression, closingBrace: peg$parseclosingBrace, closingBracket: peg$parseclosingBracket, closingParenthesis: peg$parseclosingParenthesis, commaExpression: peg$parsecommaExpression, comment: peg$parsecomment, conditionalExpression: peg$parseconditionalExpression, digits: peg$parsedigits, doubleArrow: peg$parsedoubleArrow, doubleQuoteString: peg$parsedoubleQuoteString, doubleQuoteStringChar: peg$parsedoubleQuoteStringChar, ellipsis: peg$parseellipsis, equalityExpression: peg$parseequalityExpression, equalityOperator: peg$parseequalityOperator, escapedChar: peg$parseescapedChar, exponentiationExpression: peg$parseexponentiationExpression, expression: peg$parseexpression, floatLiteral: peg$parsefloatLiteral, group: peg$parsegroup, guillemetString: peg$parseguillemetString, guillemetStringChar: peg$parseguillemetStringChar, homeDirectory: peg$parsehomeDirectory, host: peg$parsehost, identifier: peg$parseidentifier, identifierChar: peg$parseidentifierChar, identifierList: peg$parseidentifierList, implicitParenthesesCallExpression: peg$parseimplicitParenthesesCallExpression, implicitParensthesesArguments: peg$parseimplicitParensthesesArguments, inlineSpace: peg$parseinlineSpace, integerLiteral: peg$parseintegerLiteral, list: peg$parselist, literal: peg$parseliteral, logicalAndExpression: peg$parselogicalAndExpression, logicalOrExpression: peg$parselogicalOrExpression, multiLineComment: peg$parsemultiLineComment, multiplicativeExpression: peg$parsemultiplicativeExpression, multiplicativeOperator: peg$parsemultiplicativeOperator, namespace: peg$parsenamespace, newLine: peg$parsenewLine, numericLiteral: peg$parsenumericLiteral, nullishCoalescingExpression: peg$parsenullishCoalescingExpression, objectLiteral: peg$parseobjectLiteral, objectEntries: peg$parseobjectEntries, objectEntry: peg$parseobjectEntry, objectGetter: peg$parseobjectGetter, objectHiddenKey: peg$parseobjectHiddenKey, objectKey: peg$parseobjectKey, objectProperty: peg$parseobjectProperty, objectShorthandProperty: peg$parseobjectShorthandProperty, objectPublicKey: peg$parseobjectPublicKey, parenthesesArguments: peg$parseparenthesesArguments, path: peg$parsepath, pathArguments: peg$parsepathArguments, pathKey: peg$parsepathKey, pathSegment: peg$parsepathSegment, pathSegmentChar: peg$parsepathSegmentChar, pipelineExpression: peg$parsepipelineExpression, primary: peg$parseprimary, program: peg$parseprogram, protocolExpression: peg$parseprotocolExpression, qualifiedReference: peg$parsequalifiedReference, reference: peg$parsereference, relationalExpression: peg$parserelationalExpression, relationalOperator: peg$parserelationalOperator, rootDirectory: peg$parserootDirectory, scopeReference: peg$parsescopeReference, separator: peg$parseseparator, slashFollows: peg$parseslashFollows, shebang: peg$parseshebang, shiftExpression: peg$parseshiftExpression, shiftOperator: peg$parseshiftOperator, shorthandFunction: peg$parseshorthandFunction, singleArrow: peg$parsesingleArrow, singleLineComment: peg$parsesingleLineComment, singleQuoteString: peg$parsesingleQuoteString, singleQuoteStringChar: peg$parsesingleQuoteStringChar, 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$startRuleFunctions = { __: peg$parse__, additiveExpression: peg$parseadditiveExpression, additiveOperator: peg$parseadditiveOperator, arguments: peg$parsearguments, arrayLiteral: peg$parsearrayLiteral, arrayEntries: peg$parsearrayEntries, arrayEntry: peg$parsearrayEntry, arrowFunction: peg$parsearrowFunction, bitwiseAndExpression: peg$parsebitwiseAndExpression, bitwiseAndOperator: peg$parsebitwiseAndOperator, bitwiseOrExpression: peg$parsebitwiseOrExpression, bitwiseOrOperator: peg$parsebitwiseOrOperator, bitwiseXorExpression: peg$parsebitwiseXorExpression, bitwiseXorOperator: peg$parsebitwiseXorOperator, callExpression: peg$parsecallExpression, closingBrace: peg$parseclosingBrace, closingBracket: peg$parseclosingBracket, closingParenthesis: peg$parseclosingParenthesis, commaExpression: peg$parsecommaExpression, comment: peg$parsecomment, conditionalExpression: peg$parseconditionalExpression, digits: peg$parsedigits, doubleArrow: peg$parsedoubleArrow, doubleQuoteString: peg$parsedoubleQuoteString, doubleQuoteStringChar: peg$parsedoubleQuoteStringChar, ellipsis: peg$parseellipsis, equalityExpression: peg$parseequalityExpression, equalityOperator: peg$parseequalityOperator, escapedChar: peg$parseescapedChar, exponentiationExpression: peg$parseexponentiationExpression, expression: peg$parseexpression, floatLiteral: peg$parsefloatLiteral, group: peg$parsegroup, guillemetString: peg$parseguillemetString, guillemetStringChar: peg$parseguillemetStringChar, homeDirectory: peg$parsehomeDirectory, host: peg$parsehost, identifier: peg$parseidentifier, identifierChar: peg$parseidentifierChar, identifierList: peg$parseidentifierList, implicitParenthesesCallExpression: peg$parseimplicitParenthesesCallExpression, implicitParensthesesArguments: peg$parseimplicitParensthesesArguments, inlineSpace: peg$parseinlineSpace, integerLiteral: peg$parseintegerLiteral, list: peg$parselist, literal: peg$parseliteral, logicalAndExpression: peg$parselogicalAndExpression, logicalOrExpression: peg$parselogicalOrExpression, multiLineComment: peg$parsemultiLineComment, multiplicativeExpression: peg$parsemultiplicativeExpression, multiplicativeOperator: peg$parsemultiplicativeOperator, namespace: peg$parsenamespace, newLine: peg$parsenewLine, numericLiteral: peg$parsenumericLiteral, nullishCoalescingExpression: peg$parsenullishCoalescingExpression, objectLiteral: peg$parseobjectLiteral, objectEntries: peg$parseobjectEntries, objectEntry: peg$parseobjectEntry, objectGetter: peg$parseobjectGetter, objectHiddenKey: peg$parseobjectHiddenKey, objectKey: peg$parseobjectKey, objectProperty: peg$parseobjectProperty, objectShorthandProperty: peg$parseobjectShorthandProperty, objectPublicKey: peg$parseobjectPublicKey, parenthesesArguments: peg$parseparenthesesArguments, path: peg$parsepath, pathArguments: peg$parsepathArguments, pathKey: peg$parsepathKey, pathSegment: peg$parsepathSegment, pathSegmentChar: peg$parsepathSegmentChar, pipelineExpression: peg$parsepipelineExpression, primary: peg$parseprimary, program: peg$parseprogram, protocolExpression: peg$parseprotocolExpression, qualifiedReference: peg$parsequalifiedReference, reference: peg$parsereference, relationalExpression: peg$parserelationalExpression, relationalOperator: peg$parserelationalOperator, rootDirectory: peg$parserootDirectory, scopeReference: peg$parsescopeReference, separator: peg$parseseparator, slashFollows: peg$parseslashFollows, shebang: peg$parseshebang, shiftExpression: peg$parseshiftExpression, shiftOperator: peg$parseshiftOperator, shorthandFunction: peg$parseshorthandFunction, singleArrow: peg$parsesingleArrow, singleLineComment: peg$parsesingleLineComment, singleQuoteString: peg$parsesingleQuoteString, singleQuoteStringChar: peg$parsesingleQuoteStringChar, spreadElement: peg$parsespreadElement, stringLiteral: peg$parsestringLiteral, templateDocument: peg$parsetemplateDocument, templateDocumentChar: peg$parsetemplateDocumentChar, templateDocumentText: peg$parsetemplateDocumentText, templateLiteral: peg$parsetemplateLiteral, templateLiteralChar: peg$parsetemplateLiteralChar, templateLiteralText: peg$parsetemplateLiteralText, templateSubstitution: peg$parsetemplateSubstitution, textChar: peg$parsetextChar, unaryExpression: peg$parseunaryExpression, unaryOperator: peg$parseunaryOperator, whitespaceWithNewLine: peg$parsewhitespaceWithNewLine };
   var peg$startRuleFunction = peg$parse__;
 
   var peg$c0 = "[";
@@ -412,7 +412,7 @@ function peg$parse(input, options) {
       return annotate(tail.reduce(makeCall, head), location());
     };
   var peg$f11 = function() {
-      error("Expected right curly brace");
+      error(`An object ended without a closing brace, or contained something that wasn't expected.\nThe top level of an object can only contain definitions ("a: b" or "a = b") or spreads ("...a").`);
     };
   var peg$f12 = function() {
       error("Expected right bracket");
@@ -425,12 +425,15 @@ function peg$parse(input, options) {
         ? list[0]
         : annotate([ops.comma, ...list], location());
     };
-  var peg$f15 = function(condition, truthy, falsy) {
+  var peg$f15 = function(condition, tail) {
+      if (!tail) {
+        return condition;
+      }
       return annotate([
         ops.conditional,
         downgradeReference(condition),
-        [ops.lambda, [], downgradeReference(truthy)],
-        [ops.lambda, [], downgradeReference(falsy)]
+        [ops.lambda, [], downgradeReference(tail[0])],
+        [ops.lambda, [], downgradeReference(tail[1])]
       ], location());
     };
   var peg$f16 = function(chars) {
@@ -447,7 +450,7 @@ function peg$parse(input, options) {
   var peg$f23 = function() { return "\t"; };
   var peg$f24 = function() { return "\v"; };
   var peg$f25 = function(left, right) {
-      return annotate([ops.exponentiation, left, right], location());
+      return right ? annotate([ops.exponentiation, left, right], location()) : left;
     };
   var peg$f26 = function() {
       return annotate([ops.literal, parseFloat(text())], location());
@@ -600,25 +603,25 @@ function peg$parse(input, options) {
   var peg$f68 = function(value) {
       return annotate([ops.spread, value], location());
     };
-  var peg$f69 = function(contents) {
-      return annotate([ops.lambda, ["_"], contents], location());
-    };
-  var peg$f70 = function(head, tail) {
-      return annotate(makeTemplate(ops.template, head, tail), location());
+  var peg$f69 = function(head, tail) {
+      return annotate(
+        [ops.lambda, ["_"], makeTemplate(ops.templateIndent, head, tail)],
+        location()
+      );
     };
-  var peg$f71 = function(chars) {
+  var peg$f70 = function(chars) {
       return chars.join("");
     };
-  var peg$f72 = function(contents) {
-      return annotate(makeTemplate(ops.template, contents[0], contents[1]), location());
+  var peg$f71 = function(head, tail) {
+      return annotate(makeTemplate(ops.template, head, tail), location());
     };
-  var peg$f73 = function(chars) {
+  var peg$f72 = function(chars) {
       return chars.join("");
     };
-  var peg$f74 = function(expression) {
+  var peg$f73 = function(expression) {
       return annotate(expression, location());
     };
-  var peg$f75 = function(operator, expression) {
+  var peg$f74 = function(operator, expression) {
       return annotate(makeUnaryOperation(operator, expression), location());
     };
   var peg$currPos = options.peg$currPos | 0;
@@ -985,7 +988,7 @@ function peg$parse(input, options) {
   function peg$parsearrayEntry() {
     var s0, s1, s2, s3;
 
-    s0 = peg$parsespread();
+    s0 = peg$parsespreadElement();
     if (s0 === peg$FAILED) {
       s0 = peg$parsepipelineExpression();
       if (s0 === peg$FAILED) {
@@ -1546,60 +1549,62 @@ function peg$parse(input, options) {
   }
 
   function peg$parseconditionalExpression() {
-    var s0, s1, s2, s3, s4, s5, s6, s7, s8, s9;
+    var s0, s1, s2, s3, s4, s5, s6, s7, s8, s9, s10;
 
     s0 = peg$currPos;
     s1 = peg$parselogicalOrExpression();
     if (s1 !== peg$FAILED) {
-      s2 = peg$parse__();
+      s2 = peg$currPos;
+      s3 = peg$parse__();
       if (input.charCodeAt(peg$currPos) === 63) {
-        s3 = peg$c9;
+        s4 = peg$c9;
         peg$currPos++;
       } else {
-        s3 = peg$FAILED;
+        s4 = peg$FAILED;
         if (peg$silentFails === 0) { peg$fail(peg$e15); }
       }
-      if (s3 !== peg$FAILED) {
-        s4 = peg$parse__();
-        s5 = peg$parsepipelineExpression();
-        if (s5 !== peg$FAILED) {
-          s6 = peg$parse__();
+      if (s4 !== peg$FAILED) {
+        s5 = peg$parse__();
+        s6 = peg$parsepipelineExpression();
+        if (s6 !== peg$FAILED) {
+          s7 = peg$parse__();
           if (input.charCodeAt(peg$currPos) === 58) {
-            s7 = peg$c10;
+            s8 = peg$c10;
             peg$currPos++;
           } else {
-            s7 = peg$FAILED;
+            s8 = peg$FAILED;
             if (peg$silentFails === 0) { peg$fail(peg$e16); }
           }
-          if (s7 !== peg$FAILED) {
-            s8 = peg$parse__();
-            s9 = peg$parsepipelineExpression();
-            if (s9 !== peg$FAILED) {
-              peg$savedPos = s0;
-              s0 = peg$f15(s1, s5, s9);
+          if (s8 !== peg$FAILED) {
+            s9 = peg$parse__();
+            s10 = peg$parsepipelineExpression();
+            if (s10 !== peg$FAILED) {
+              s2 = [ s6, s10 ];
             } else {
-              peg$currPos = s0;
-              s0 = peg$FAILED;
+              peg$currPos = s2;
+              s2 = peg$FAILED;
             }
           } else {
-            peg$currPos = s0;
-            s0 = peg$FAILED;
+            peg$currPos = s2;
+            s2 = peg$FAILED;
           }
         } else {
-          peg$currPos = s0;
-          s0 = peg$FAILED;
+          peg$currPos = s2;
+          s2 = peg$FAILED;
         }
       } else {
-        peg$currPos = s0;
-        s0 = peg$FAILED;
+        peg$currPos = s2;
+        s2 = peg$FAILED;
+      }
+      if (s2 === peg$FAILED) {
+        s2 = null;
       }
+      peg$savedPos = s0;
+      s0 = peg$f15(s1, s2);
     } else {
       peg$currPos = s0;
       s0 = peg$FAILED;
     }
-    if (s0 === peg$FAILED) {
-      s0 = peg$parselogicalOrExpression();
-    }
 
     return s0;
   }
@@ -2009,40 +2014,42 @@ function peg$parse(input, options) {
   }
 
   function peg$parseexponentiationExpression() {
-    var s0, s1, s2, s3, s4, s5;
+    var s0, s1, s2, s3, s4, s5, s6;
 
     s0 = peg$currPos;
     s1 = peg$parseunaryExpression();
     if (s1 !== peg$FAILED) {
-      s2 = peg$parse__();
+      s2 = peg$currPos;
+      s3 = peg$parse__();
       if (input.substr(peg$currPos, 2) === peg$c28) {
-        s3 = peg$c28;
+        s4 = peg$c28;
         peg$currPos += 2;
       } else {
-        s3 = peg$FAILED;
+        s4 = peg$FAILED;
         if (peg$silentFails === 0) { peg$fail(peg$e37); }
       }
-      if (s3 !== peg$FAILED) {
-        s4 = peg$parse__();
-        s5 = peg$parseexponentiationExpression();
-        if (s5 !== peg$FAILED) {
-          peg$savedPos = s0;
-          s0 = peg$f25(s1, s5);
+      if (s4 !== peg$FAILED) {
+        s5 = peg$parse__();
+        s6 = peg$parseexponentiationExpression();
+        if (s6 !== peg$FAILED) {
+          s2 = s6;
         } else {
-          peg$currPos = s0;
-          s0 = peg$FAILED;
+          peg$currPos = s2;
+          s2 = peg$FAILED;
         }
       } else {
-        peg$currPos = s0;
-        s0 = peg$FAILED;
+        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;
     }
-    if (s0 === peg$FAILED) {
-      s0 = peg$parseunaryExpression();
-    }
 
     return s0;
   }
@@ -3173,7 +3180,7 @@ function peg$parse(input, options) {
   function peg$parseobjectEntry() {
     var s0;
 
-    s0 = peg$parsespread();
+    s0 = peg$parsespreadElement();
     if (s0 === peg$FAILED) {
       s0 = peg$parseobjectProperty();
       if (s0 === peg$FAILED) {
@@ -4307,14 +4314,14 @@ function peg$parse(input, options) {
     return s0;
   }
 
-  function peg$parsespread() {
+  function peg$parsespreadElement() {
     var s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = peg$parseellipsis();
     if (s1 !== peg$FAILED) {
       s2 = peg$parse__();
-      s3 = peg$parseconditionalExpression();
+      s3 = peg$parsepipelineExpression();
       if (s3 !== peg$FAILED) {
         peg$savedPos = s0;
         s0 = peg$f68(s3);
@@ -4351,14 +4358,37 @@ function peg$parse(input, options) {
   }
 
   function peg$parsetemplateDocument() {
-    var s0, s1;
+    var s0, s1, s2, s3, s4, s5;
 
     peg$silentFails++;
     s0 = peg$currPos;
-    s1 = peg$parsetemplateDocumentContents();
+    s1 = peg$parsetemplateDocumentText();
+    s2 = [];
+    s3 = peg$currPos;
+    s4 = peg$parsetemplateSubstitution();
+    if (s4 !== peg$FAILED) {
+      s5 = peg$parsetemplateDocumentText();
+      s4 = [s4, s5];
+      s3 = s4;
+    } else {
+      peg$currPos = s3;
+      s3 = peg$FAILED;
+    }
+    while (s3 !== peg$FAILED) {
+      s2.push(s3);
+      s3 = peg$currPos;
+      s4 = peg$parsetemplateSubstitution();
+      if (s4 !== peg$FAILED) {
+        s5 = peg$parsetemplateDocumentText();
+        s4 = [s4, s5];
+        s3 = s4;
+      } else {
+        peg$currPos = s3;
+        s3 = peg$FAILED;
+      }
+    }
     peg$savedPos = s0;
-    s1 = peg$f69(s1);
-    s0 = s1;
+    s0 = peg$f69(s1, s2);
     peg$silentFails--;
     s1 = peg$FAILED;
     if (peg$silentFails === 0) { peg$fail(peg$e94); }
@@ -4402,41 +4432,6 @@ function peg$parse(input, options) {
     return s0;
   }
 
-  function peg$parsetemplateDocumentContents() {
-    var s0, s1, s2, s3, s4, s5;
-
-    s0 = peg$currPos;
-    s1 = peg$parsetemplateDocumentText();
-    s2 = [];
-    s3 = peg$currPos;
-    s4 = peg$parsetemplateSubstitution();
-    if (s4 !== peg$FAILED) {
-      s5 = peg$parsetemplateDocumentText();
-      s4 = [s4, s5];
-      s3 = s4;
-    } else {
-      peg$currPos = s3;
-      s3 = peg$FAILED;
-    }
-    while (s3 !== peg$FAILED) {
-      s2.push(s3);
-      s3 = peg$currPos;
-      s4 = peg$parsetemplateSubstitution();
-      if (s4 !== peg$FAILED) {
-        s5 = peg$parsetemplateDocumentText();
-        s4 = [s4, s5];
-        s3 = s4;
-      } else {
-        peg$currPos = s3;
-        s3 = peg$FAILED;
-      }
-    }
-    peg$savedPos = s0;
-    s0 = peg$f70(s1, s2);
-
-    return s0;
-  }
-
   function peg$parsetemplateDocumentText() {
     var s0, s1, s2;
 
@@ -4449,7 +4444,7 @@ function peg$parse(input, options) {
       s2 = peg$parsetemplateDocumentChar();
     }
     peg$savedPos = s0;
-    s1 = peg$f71(s1);
+    s1 = peg$f70(s1);
     s0 = s1;
     peg$silentFails--;
     s1 = peg$FAILED;
@@ -4459,7 +4454,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsetemplateLiteral() {
-    var s0, s1, s2, s3;
+    var s0, s1, s2, s3, s4, s5, s6;
 
     peg$silentFails++;
     s0 = peg$currPos;
@@ -4471,17 +4466,41 @@ function peg$parse(input, options) {
       if (peg$silentFails === 0) { peg$fail(peg$e98); }
     }
     if (s1 !== peg$FAILED) {
-      s2 = peg$parsetemplateLiteralContents();
+      s2 = peg$parsetemplateLiteralText();
+      s3 = [];
+      s4 = peg$currPos;
+      s5 = peg$parsetemplateSubstitution();
+      if (s5 !== peg$FAILED) {
+        s6 = peg$parsetemplateLiteralText();
+        s5 = [s5, s6];
+        s4 = s5;
+      } else {
+        peg$currPos = s4;
+        s4 = peg$FAILED;
+      }
+      while (s4 !== peg$FAILED) {
+        s3.push(s4);
+        s4 = peg$currPos;
+        s5 = peg$parsetemplateSubstitution();
+        if (s5 !== peg$FAILED) {
+          s6 = peg$parsetemplateLiteralText();
+          s5 = [s5, s6];
+          s4 = s5;
+        } else {
+          peg$currPos = s4;
+          s4 = peg$FAILED;
+        }
+      }
       if (input.charCodeAt(peg$currPos) === 96) {
-        s3 = peg$c59;
+        s4 = peg$c59;
         peg$currPos++;
       } else {
-        s3 = peg$FAILED;
+        s4 = peg$FAILED;
         if (peg$silentFails === 0) { peg$fail(peg$e98); }
       }
-      if (s3 !== peg$FAILED) {
+      if (s4 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f72(s2);
+        s0 = peg$f71(s2, s3);
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -4544,41 +4563,6 @@ function peg$parse(input, options) {
     return s0;
   }
 
-  function peg$parsetemplateLiteralContents() {
-    var s0, s1, s2, s3, s4, s5;
-
-    s0 = peg$currPos;
-    s1 = peg$parsetemplateLiteralText();
-    s2 = [];
-    s3 = peg$currPos;
-    s4 = peg$parsetemplateSubstitution();
-    if (s4 !== peg$FAILED) {
-      s5 = peg$parsetemplateLiteralText();
-      s4 = [s4, s5];
-      s3 = s4;
-    } else {
-      peg$currPos = s3;
-      s3 = peg$FAILED;
-    }
-    while (s3 !== peg$FAILED) {
-      s2.push(s3);
-      s3 = peg$currPos;
-      s4 = peg$parsetemplateSubstitution();
-      if (s4 !== peg$FAILED) {
-        s5 = peg$parsetemplateLiteralText();
-        s4 = [s4, s5];
-        s3 = s4;
-      } else {
-        peg$currPos = s3;
-        s3 = peg$FAILED;
-      }
-    }
-    s1 = [s1, s2];
-    s0 = s1;
-
-    return s0;
-  }
-
   function peg$parsetemplateLiteralText() {
     var s0, s1, s2;
 
@@ -4590,7 +4574,7 @@ function peg$parse(input, options) {
       s2 = peg$parsetemplateLiteralChar();
     }
     peg$savedPos = s0;
-    s1 = peg$f73(s1);
+    s1 = peg$f72(s1);
     s0 = s1;
 
     return s0;
@@ -4620,7 +4604,7 @@ function peg$parse(input, options) {
         }
         if (s3 !== peg$FAILED) {
           peg$savedPos = s0;
-          s0 = peg$f74(s2);
+          s0 = peg$f73(s2);
         } else {
           peg$currPos = s0;
           s0 = peg$FAILED;
@@ -4669,7 +4653,7 @@ function peg$parse(input, options) {
       s3 = peg$parseunaryExpression();
       if (s3 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f75(s1, s3);
+        s0 = peg$f74(s1, s3);
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -4845,15 +4829,13 @@ const peg$allowedStartRules = [
   "singleLineComment",
   "singleQuoteString",
   "singleQuoteStringChar",
-  "spread",
+  "spreadElement",
   "stringLiteral",
   "templateDocument",
   "templateDocumentChar",
-  "templateDocumentContents",
   "templateDocumentText",
   "templateLiteral",
   "templateLiteralChar",
-  "templateLiteralContents",
   "templateLiteralText",
   "templateSubstitution",
   "textChar",

package/src/compiler/parserHelpers.js

@@ -76,22 +76,6 @@ export function downgradeReference(code) {
   }
 }
 
-// Return true if the code will generate an async object.
-function isCodeForAsyncObject(code) {
-  if (!(code instanceof Array)) {
-    return false;
-  }
-  if (code[0] !== ops.object) {
-    return false;
-  }
-  // Are any of the properties getters?
-  const entries = code.slice(1);
-  const hasGetter = entries.some(([key, value]) => {
-    return value instanceof Array && value[0] === ops.getter;
-  });
-  return hasGetter;
-}
-
 export function makeArray(entries) {
   let currentEntries = [];
   const spreads = [];
@@ -260,17 +244,24 @@ export function makeObject(entries, op) {
       continue;
     }
 
-    if (
-      value instanceof Array &&
-      value[0] === ops.getter &&
-      value[1] instanceof Array &&
-      value[1][0] === ops.literal
-    ) {
-      // Simplify a getter for a primitive value to a regular property
-      value = value[1];
-    } else if (isCodeForAsyncObject(value)) {
-      // Add a trailing slash to key to indicate value is a subtree
-      key = key + "/";
+    if (value instanceof Array) {
+      if (
+        value[0] === ops.getter &&
+        value[1] instanceof Array &&
+        value[1][0] === ops.literal
+      ) {
+        // Optimize a getter for a primitive value to a regular property
+        value = value[1];
+      }
+      // else if (
+      //   value[0] === ops.object ||
+      //   (value[0] === ops.getter &&
+      //     value[1] instanceof Array &&
+      //     (value[1][0] === ops.object || value[1][0] === ops.merge))
+      // ) {
+      //   // Add a trailing slash to key to indicate value is a subtree
+      //   key = trailingSlash.add(key);
+      // }
     }
 
     currentEntries.push([key, value]);

package/src/runtime/errors.js

@@ -1,6 +1,10 @@
 // Text we look for in an error stack to guess whether a given line represents a
 
-import { scope as scopeFn, trailingSlash } from "@weborigami/async-tree";
+import {
+  scope as scopeFn,
+  trailingSlash,
+  TraverseError,
+} from "@weborigami/async-tree";
 import codeFragment from "./codeFragment.js";
 import { typos } from "./typos.js";
 
@@ -13,19 +17,24 @@ const origamiSourceSignals = [
 ];
 
 export async function builtinReferenceError(tree, builtins, key) {
-  const messages = [
-    `"${key}" is being called as if it were a builtin function, but it's not.`,
-  ];
   // See if the key is in scope (but not as a builtin)
   const scope = scopeFn(tree);
   const value = await scope.get(key);
+  let message;
   if (value === undefined) {
+    const messages = [
+      `"${key}" is being called as if it were a builtin function, but it's not.`,
+    ];
     const typos = await formatScopeTypos(builtins, key);
     messages.push(typos);
+    message = messages.join(" ");
   } else {
-    messages.push(`Use "${key}/" instead.`);
+    const messages = [
+      `To call a function like "${key}" that's not a builtin, include a slash: ${key}/( )`,
+      `Details: https://weborigami.org/language/syntax.html#shorthand-for-builtin-functions`,
+    ];
+    message = messages.join("\n");
   }
-  const message = messages.join(" ");
   return new ReferenceError(message);
 }
 
@@ -36,37 +45,50 @@ export async function builtinReferenceError(tree, builtins, key) {
  */
 export function formatError(error) {
   let message;
+
+  let location = /** @type {any} */ (error).location;
+  const fragment = location ? codeFragment(location) : null;
+  let fragmentInMessage = false;
+
   if (error.stack) {
     // Display the stack only until we reach the Origami source code.
     message = "";
     let lines = error.stack.split("\n");
     for (let i = 0; i < lines.length; i++) {
-      const line = lines[i];
+      let line = lines[i];
       if (maybeOrigamiSourceCode(line)) {
         break;
       }
+      if (
+        error instanceof TraverseError &&
+        error.message === "A null or undefined value can't be traversed"
+      ) {
+        // Provide more meaningful message for TraverseError
+        line = `TraverseError: This part of the path is null or undefined: ${fragment}`;
+        fragmentInMessage = true;
+      }
       if (message) {
         message += "\n";
       }
-      message += lines[i];
+      message += line;
     }
   } else {
     message = error.toString();
   }
 
   // Add location
-  let location = /** @type {any} */ (error).location;
   if (location) {
-    const fragment = codeFragment(location);
     let { source, start } = location;
-
-    message += `\nevaluating: ${fragment}`;
+    if (!fragmentInMessage) {
+      message += `\nevaluating: ${fragment}`;
+    }
     if (typeof source === "object" && source.url) {
       message += `\n    at ${source.url.href}:${start.line}:${start.column}`;
     } else if (source.text.includes("\n")) {
       message += `\n    at line ${start.line}, column ${start.column}`;
     }
   }
+
   return message;
 }