Prefix Fix (#43)

* WIP * Revert unused change
voyd-lang · Sep 13, 2024 · 0a59dae · 0a59dae
1 parent b494c47
commit 0a59dae
Show file tree

Hide file tree

Showing 6 changed files with 54 additions and 181 deletions.
diff --git a/src/parser/__tests__/__snapshots__/parser.test.ts.snap b/src/parser/__tests__/__snapshots__/parser.test.ts.snap
@@ -186,6 +186,42 @@ exports[`parser can parse a file into a syntax expanded ast 1`] = `
     10,
     3,
   ],
+  [
+    "mul",
+    [
+      "&",
+      "self",
+    ],
+    [
+      ":",
+      "other",
+      [
+        "Vec",
+        [
+          "generics",
+          "T",
+        ],
+      ],
+    ],
+  ],
+  [
+    "mul",
+    [
+      "&",
+      "self",
+    ],
+    [
+      ":",
+      "other",
+      [
+        "Vec",
+        [
+          "generics",
+          "T",
+        ],
+      ],
+    ],
+  ],
   [
     "let",
     [

diff --git a/src/parser/__tests__/fixtures/desugarred-ast.ts b/src/parser/__tests__/fixtures/desugarred-ast.ts
diff --git a/src/parser/__tests__/fixtures/void-file.ts b/src/parser/__tests__/fixtures/void-file.ts
@@ -24,6 +24,12 @@ with: () => 0
 10
 + 3
 
+mul(&self, other: Vec<T>)
+mul(
+  &self,
+  other: Vec<T>
+)
+
 let a = array
   .reduce(0) (acc, val) =>
     acc + val

diff --git a/src/parser/grammar.ts b/src/parser/grammar.ts
@@ -96,6 +96,7 @@ export const prefixOps: OpMap = new Map([
   ["~", 7],
   ["%", 7],
   ["$", 7],
+  ["@", 7],
   ["$@", 7],
   ["...", 5],
 ]);

diff --git a/src/parser/syntax-macros/interpret-whitespace.ts b/src/parser/syntax-macros/interpret-whitespace.ts
@@ -4,10 +4,12 @@ import { Expr, List } from "../../syntax-objects/index.js";
 export const interpretWhitespace = (list: List, indentLevel?: number): List => {
   const transformed = new List({ ...list.metadata });
 
+  let hadComma = false;
   while (list.hasChildren) {
     const child = elideParens(list, indentLevel);
     if (child?.isList() && child.length === 0) continue;
-    addSibling(child, transformed);
+    addSibling(child, transformed, hadComma);
+    hadComma = nextIsComma(list);
   }
 
   if (transformed.length === 1 && transformed.first()?.isList()) {
@@ -166,6 +168,10 @@ const consumeLeadingWhitespace = (list: List) => {
 
 const isNewline = (v?: Expr) => v?.isWhitespace() && v.isNewline;
 const isIndent = (v: Expr) => v.isWhitespace() && v.isIndent;
+const nextIsComma = (list: List) => {
+  const next = list.first();
+  return !!(next?.isIdentifier() && next.is(","));
+};
 
 const isNamedParameter = (v: List) => {
   const identifier = v.at(0);
@@ -184,10 +190,10 @@ const isNamedParameter = (v: List) => {
   return true;
 };
 
-const addSibling = (child: Expr, siblings: List) => {
+const addSibling = (child: Expr, siblings: List, hadComma?: boolean) => {
   const olderSibling = siblings.at(-1);
 
-  if (!child.isList()) {
+  if (!child.isList() || hadComma) {
     siblings.push(child);
     return;
   }

diff --git a/src/syntax-objects/types.ts b/src/syntax-objects/types.ts
@@ -3,6 +3,7 @@ import { Parameter } from "./parameter.js";
 import { NamedEntity, NamedEntityOpts } from "./named-entity.js";
 import { Id, Identifier } from "./identifier.js";
 import { getIdStr } from "./get-id-str.js";
+import { LexicalContext } from "./lexical-context.js";
 
 export type Type =
   | PrimitiveType
@@ -162,6 +163,7 @@ export type ObjectField = { name: string; typeExpr: Expr; type?: Type };
 
 export class ObjectType extends BaseType {
   readonly kindOfType = "object";
+  namespace: LexicalContext = new LexicalContext();
   typeParameters?: Identifier[];
   appliedTypeArgs?: Type[];
   genericInstances?: ObjectType[];