Parser cleanup

src/parser/grammar.ts

@@ -1,6 +1,9 @@
 import { Expr } from "../syntax-objects/expr.js";
 import { Identifier } from "../syntax-objects/identifier.js";
 
+export const idIs = (id: Expr | undefined, value: string) =>
+  id?.isIdentifier() && id.is(value);
+
 export const isTerminator = (char: string) =>
   isWhitespace(char) ||
   isBracket(char) ||

src/parser/parse-chars.ts

@@ -20,13 +20,12 @@ export const parseChars = (
   const list = new List({
     location: file.currentSourceLocation(),
     parent: opts.parent,
-    value: !opts.nested ? ["ast", ","] : [],
   });
 
   while (file.hasCharacters) {
     const token = lexer(file);
 
-    if (processWithReaderMacro(token, list.last(), file, opts, list)) {
+    if (processWithReaderMacro(token, list.last(), file, list)) {
       continue;
     }
 
@@ -61,15 +60,14 @@ export const parseChars = (
   }
 
   list.location!.endIndex = file.position;
-  return list;
+  return opts.nested ? list : new List(["ast", list]);
 };
 
 /** Returns true if token was matched with and processed by a macro  */
 const processWithReaderMacro = (
   token: Token,
   prev: Expr | undefined,
   file: CharStream,
-  opts: ParseCharsOpts,
   list: List
 ) => {
   const readerMacro = getReaderMacroForToken(token, prev, file.next);

src/parser/reader-macros/array-literal.ts

@@ -4,6 +4,6 @@ export const arrayLiteralMacro: ReaderMacro = {
   match: (t) => t.value === "[",
   macro: (file, { reader }) => {
     const items = reader(file, "]");
-    return items.insert("array").insert(",", 1);
+    return items.insert("array");
   },
 };

src/parser/reader-macros/dictionary-literal.ts

@@ -4,6 +4,6 @@ export const dictionaryLiteralMacro: ReaderMacro = {
   match: (t) => t.value === "#{",
   macro: (file, { reader }) => {
     const items = reader(file, "}");
-    return items.insertFnCall("dict");
+    return items.insert("dict");
   },
 };

src/parser/reader-macros/generics.ts

@@ -6,6 +6,6 @@ export const genericsMacro: ReaderMacro = {
   },
   macro: (file, { reader }) => {
     const items = reader(file, ">");
-    return items.insert("generics").insert(",", 1);
+    return items.insert("generics");
   },
 };

src/parser/reader-macros/html/html-parser.ts

@@ -205,6 +205,6 @@ export class HTMLParser {
   }
 }
 
-const dict = () => new List({}).insertFnCall("dict");
+const dict = () => new List({}).insert("dict");
 const dictItem = (key: string, value: Expr) => array().push(key, value);
-const array = () => new List({}).insertFnCall("array");
+const array = () => new List({}).insert("array");

src/parser/reader-macros/object-literal.ts

@@ -4,6 +4,6 @@ export const objectLiteralMacro: ReaderMacro = {
   match: (t) => t.value === "{",
   macro: (dream, { reader }) => {
     const items = reader(dream, "}");
-    return items.insert("object").insert(",", 1);
+    return items.insert("object");
   },
 };

src/parser/syntax-macros/functional-notation.ts

@@ -1,4 +1,4 @@
-import { isOp } from "../grammar.js";
+import { idIs, isOp } from "../grammar.js";
 import { Expr, List } from "../../syntax-objects/index.js";
 
 export const functionalNotation = (list: List): List => {
@@ -9,11 +9,11 @@ export const functionalNotation = (list: List): List => {
     if (expr.isWhitespace()) return expr;
 
     const nextExpr = array[index + 1];
-    if (nextExpr && nextExpr.isList() && !isOp(expr)) {
+    if (nextExpr && nextExpr.isList() && !(isOp(expr) || idIs(expr, ","))) {
       return processFnCall(expr, nextExpr, array, index);
     }
 
-    if (list.mayBeTuple && expr.isIdentifier() && expr.is(",")) {
+    if (list.mayBeTuple && idIs(expr, ",")) {
       isTuple = true;
     }
 

src/parser/syntax-macros/interpret-whitespace.ts

@@ -1,4 +1,4 @@
-import { isContinuationOp, isGreedyOp } from "../grammar.js";
+import { idIs, isContinuationOp, isGreedyOp } from "../grammar.js";
 import { Expr, List } from "../../syntax-objects/index.js";
 
 export const interpretWhitespace = (list: List, indentLevel?: number): List => {
@@ -69,7 +69,7 @@ const elideParens = (list: Expr, startIndentLevel?: number): Expr => {
       continue;
     }
 
-    if (next?.isIdentifier() && next.is(",")) {
+    if (idIs(next, ",")) {
       break;
     }
 
@@ -133,7 +133,7 @@ const nextExprIndentLevel = (list: List, startIndex?: number) => {
       continue;
     }
 
-    if (expr?.isIdentifier() && expr.is(",")) {
+    if (idIs(expr, ",")) {
       return 0;
     }
 
@@ -156,7 +156,7 @@ const nextNonWhitespace = (list: List, startIndex?: number) => {
 const consumeLeadingWhitespace = (list: List) => {
   while (list.hasChildren) {
     const next = list.first();
-    if (next?.isWhitespace() || (next?.isIdentifier() && next.is(","))) {
+    if (next?.isWhitespace() || idIs(next, ",")) {
       list.consume();
       continue;
     }

src/semantics/__tests__/__snapshots__/regular-macros.test.ts.snap

@@ -7,7 +7,7 @@ exports[`regular macro expansion 1`] = `
   [
     "exports",
     [
-      "std#726",
+      "std#730",
     ],
   ],
   [
@@ -47,7 +47,7 @@ exports[`regular macro expansion 1`] = `
         ],
         [
           "regular-macro",
-          "\`#755",
+          "\`#759",
           [
             "parameters",
           ],
@@ -68,7 +68,7 @@ exports[`regular macro expansion 1`] = `
         ],
         [
           "regular-macro",
-          "let#807",
+          "let#811",
           [
             "parameters",
           ],
@@ -121,7 +121,7 @@ exports[`regular macro expansion 1`] = `
         ],
         [
           "regular-macro",
-          "fn#1458",
+          "fn#1462",
           [
             "parameters",
           ],

src/syntax-objects/list.ts

@@ -163,11 +163,6 @@ export class List extends Syntax {
     return this.toArray().findIndex(cb);
   }
 
-  insertFnCall(name: string) {
-    this.insert(name, 0).insert(",", 1);
-    return this;
-  }
-
   insert(expr: Expr | string, at = 0) {
     const result = typeof expr === "string" ? Identifier.from(expr) : expr;
     result.parent = this;