From 52d2fa9c2aa861bc3d67cc0f5fcc11a0ff56a58f Mon Sep 17 00:00:00 2001 From: Drew Youngwerth Date: Sat, 21 Sep 2024 15:07:01 -0700 Subject: [PATCH] Fix imports etc --- src/lib/fast-shift-array.ts | 2 +- .../{parse-text-void-file.ts => parse-text-voyd-file.ts} | 4 ++-- src/parser/__tests__/fixtures/{void-file.ts => voyd-file.ts} | 0 ...egular-macros-void-file.ts => regular-macros-voyd-file.ts} | 2 +- src/semantics/__tests__/regular-macros.test.ts | 4 ++-- src/syntax-objects/call.ts | 2 +- src/syntax-objects/lib/child-list.ts | 2 +- src/syntax-objects/list.ts | 2 +- src/syntax-objects/module.ts | 2 +- 9 files changed, 10 insertions(+), 10 deletions(-) rename src/parser/__tests__/fixtures/{parse-text-void-file.ts => parse-text-voyd-file.ts} (83%) rename src/parser/__tests__/fixtures/{void-file.ts => voyd-file.ts} (100%) rename src/semantics/__tests__/fixtures/{regular-macros-void-file.ts => regular-macros-voyd-file.ts} (96%) diff --git a/src/lib/fast-shift-array.ts b/src/lib/fast-shift-array.ts index 0089630f..fa3d1379 100644 --- a/src/lib/fast-shift-array.ts +++ b/src/lib/fast-shift-array.ts @@ -84,7 +84,7 @@ export class FastShiftArray { this.headIndex = 0; } - forEach(callbackfn: (value: T, index: number, array: T[]) => voyd): void { + forEach(callbackfn: (value: T, index: number, array: T[]) => void): void { this.items.slice(this.headIndex).forEach(callbackfn); } } diff --git a/src/parser/__tests__/fixtures/parse-text-void-file.ts b/src/parser/__tests__/fixtures/parse-text-voyd-file.ts similarity index 83% rename from src/parser/__tests__/fixtures/parse-text-void-file.ts rename to src/parser/__tests__/fixtures/parse-text-voyd-file.ts index 78a98fbc..f29149e5 100644 --- a/src/parser/__tests__/fixtures/parse-text-void-file.ts +++ b/src/parser/__tests__/fixtures/parse-text-voyd-file.ts @@ -1,6 +1,6 @@ import { CharStream } from "../../char-stream.js"; -export const parseFileVoidText = ` +export const parseFileVoydText = ` fn fib(n: i32) -> i32 if n <= 1 then: n @@ -35,4 +35,4 @@ fn main() let result = fib(n) `; -export const voydFile = new CharStream(parseFileVoidText, "beep/boop"); +export const voydFile = new CharStream(parseFileVoydText, "beep/boop"); diff --git a/src/parser/__tests__/fixtures/void-file.ts b/src/parser/__tests__/fixtures/voyd-file.ts similarity index 100% rename from src/parser/__tests__/fixtures/void-file.ts rename to src/parser/__tests__/fixtures/voyd-file.ts diff --git a/src/semantics/__tests__/fixtures/regular-macros-void-file.ts b/src/semantics/__tests__/fixtures/regular-macros-voyd-file.ts similarity index 96% rename from src/semantics/__tests__/fixtures/regular-macros-void-file.ts rename to src/semantics/__tests__/fixtures/regular-macros-voyd-file.ts index de866e33..85cc1601 100644 --- a/src/semantics/__tests__/fixtures/regular-macros-void-file.ts +++ b/src/semantics/__tests__/fixtures/regular-macros-voyd-file.ts @@ -1,4 +1,4 @@ -export const regularMacrosVoidFile = ` +export const regularMacrosVoydFile = ` macro \`() quote quote $@body diff --git a/src/semantics/__tests__/regular-macros.test.ts b/src/semantics/__tests__/regular-macros.test.ts index f16b5a8b..b3d02e03 100644 --- a/src/semantics/__tests__/regular-macros.test.ts +++ b/src/semantics/__tests__/regular-macros.test.ts @@ -2,12 +2,12 @@ import { parse } from "../../parser/parser.js"; import path from "node:path"; import { registerModules } from "../modules.js"; import { expandRegularMacros } from "../regular-macros.js"; -import { regularMacrosVoidFile } from "./fixtures/regular-macros-voyd-file.js"; +import { regularMacrosVoydFile } from "./fixtures/regular-macros-voyd-file.js"; import { test } from "vitest"; import { List } from "../../syntax-objects/list.js"; test("regular macro expansion", async (t) => { - const parserOutput = parse(regularMacrosVoidFile); + const parserOutput = parse(regularMacrosVoydFile); const files = { std: new List([]), test: parserOutput, diff --git a/src/syntax-objects/call.ts b/src/syntax-objects/call.ts index ee085b81..81a66b08 100644 --- a/src/syntax-objects/call.ts +++ b/src/syntax-objects/call.ts @@ -55,7 +55,7 @@ export class Call extends Syntax { return this.#type; } - eachArg(fn: (expr: Expr) => voyd) { + eachArg(fn: (expr: Expr) => void) { this.args.each(fn); return this; } diff --git a/src/syntax-objects/lib/child-list.ts b/src/syntax-objects/lib/child-list.ts index 1a5996a6..50693882 100644 --- a/src/syntax-objects/lib/child-list.ts +++ b/src/syntax-objects/lib/child-list.ts @@ -85,7 +85,7 @@ export class ChildList { return this; } - each(fn: (expr: T, index: number, array: T[]) => voyd): ChildList { + each(fn: (expr: T, index: number, array: T[]) => void): ChildList { this.toArray().forEach(fn); return this; } diff --git a/src/syntax-objects/list.ts b/src/syntax-objects/list.ts index 78d94176..5ea52fcd 100644 --- a/src/syntax-objects/list.ts +++ b/src/syntax-objects/list.ts @@ -157,7 +157,7 @@ export class List extends Syntax { return this; } - each(fn: (expr: Expr, index: number, array: Expr[]) => voyd): List { + each(fn: (expr: Expr, index: number, array: Expr[]) => void): List { this.toArray().forEach(fn); return this; } diff --git a/src/syntax-objects/module.ts b/src/syntax-objects/module.ts index 5983b306..48ad4340 100644 --- a/src/syntax-objects/module.ts +++ b/src/syntax-objects/module.ts @@ -68,7 +68,7 @@ export class VoidModule extends ScopedNamedEntity { return [...path, this.name.toString()]; } - each(fn: (expr: Expr, index: number, array: Expr[]) => voyd): VoidModule { + each(fn: (expr: Expr, index: number, array: Expr[]) => void): VoidModule { this.value.forEach(fn); return this; }