Horizontal42/summarum
1
0
Fork 0
mirror of https://github.com/Horizontal42/summarum.git synced 2026-11-10 22:41:58 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

use a Set for the cross-sheet resolving stack

Browse source 
resolving was an array checked with .includes() on every xref lookup
during resolution — an O(n) membership test where only membership
ever mattered, not order. Set makes it O(1).
This commit is contained in:
Horizontal42 2026-07-08 14:12:38 +03:00
parent 80bb94674d
commit 00bd1248e1
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/workspace.ts
View file

@ -25,18 +25,18 @@ function escapeRegExp(s: string): string {
export class Workspace { export class Workspace {
private cache = new Map<string, SheetExports>(); private cache = new Map<string, SheetExports>();
private resolving: string[] = []; private resolving: Set<string> = new Set();
private parsedRefsCache = new Map<string, { text: string; refs: string[] }>(); private parsedRefsCache = new Map<string, { text: string; refs: string[] }>();
constructor(private engine: SumEngine, private sheets: () => SheetSource[]) {} constructor(private engine: SumEngine, private sheets: () => SheetSource[]) {}
/** Evaluate a sheet as the user's active/open document — refs resolve live. */ /** Evaluate a sheet as the user's active/open document — refs resolve live. */
evaluateSheet(sheetId: string, text: string): LineResult[] { evaluateSheet(sheetId: string, text: string): LineResult[] {
this.resolving.push(sheetId); this.resolving.add(sheetId);
try { try {
return this.engine.evaluateDocument(text, (sheet, key) => this.resolveXRef(sheet, key)); return this.engine.evaluateDocument(text, (sheet, key) => this.resolveXRef(sheet, key));
} finally { } finally {
this.resolving.pop(); this.resolving.delete(sheetId);
} }
} }
@ -106,7 +106,7 @@ export class Workspace {
private resolveXRef(sheetTitle: string, key: string): XRefResolution { private resolveXRef(sheetTitle: string, key: string): XRefResolution {
const target = this.findSheetByTitle(sheetTitle); const target = this.findSheetByTitle(sheetTitle);
if (!target) return { ok: false, reason: `sheet "${sheetTitle}" not found` }; if (!target) return { ok: false, reason: `sheet "${sheetTitle}" not found` };
if (this.resolving.includes(target.id)) { if (this.resolving.has(target.id)) {
return { ok: false, reason: "circular reference" }; return { ok: false, reason: "circular reference" };
} }
const exports = this.exportsFor(target); const exports = this.exportsFor(target);
@ -128,12 +128,12 @@ export class Workspace {
private exportsFor(sheet: SheetSource): SheetExports { private exportsFor(sheet: SheetSource): SheetExports {
const cached = this.cache.get(sheet.id); const cached = this.cache.get(sheet.id);
if (cached) return cached; if (cached) return cached;
this.resolving.push(sheet.id); this.resolving.add(sheet.id);
let results: LineResult[]; let results: LineResult[];
try { try {
results = this.engine.evaluateDocument(sheet.text, (s, k) => this.resolveXRef(s, k)); results = this.engine.evaluateDocument(sheet.text, (s, k) => this.resolveXRef(s, k));
} finally { } finally {
this.resolving.pop(); this.resolving.delete(sheet.id);
} }
const vars = new Map<string, Value>(); const vars = new Map<string, Value>();
for (const r of results) { for (const r of results) {