From f7873295ab0520fdc09acf3683ba8ade0529dfa3 Mon Sep 17 00:00:00 2001 From: ringabout <43030857+ringabout@users.noreply.github.com> Date: Thu, 23 Apr 2026 19:42:31 +0800 Subject: [PATCH] progress Co-authored-by: Copilot --- compiler/ast2nif.nim | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/compiler/ast2nif.nim b/compiler/ast2nif.nim index 891a704618..10a46a78b1 100644 --- a/compiler/ast2nif.nim +++ b/compiler/ast2nif.nim @@ -826,14 +826,12 @@ type types: Table[string, (PType, NifIndexEntry)] syms: Table[string, (PSym, NifIndexEntry)] mods: Table[FileIndex, NifModule] - mainModuleIdx: FileIndex cache: IdentCache proc createDecodeContext*(config: ConfigRef; cache: IdentCache): DecodeContext = ## Supposed to be a global variable result = DecodeContext( infos: LineInfoWriter(config: config), - mainModuleIdx: InvalidFileIdx, cache: cache) proc cursorFromIndexEntry(c: var DecodeContext; module: FileIndex; entry: NifIndexEntry; @@ -885,8 +883,8 @@ proc readEmbeddedIndex(s: var Stream): Table[string, NifIndexEntry] = s.r.jumpTo(contentPos) # Restore position proc moduleId(c: var DecodeContext; suffix: string; flags: set[LoadFlag] = {}): FileIndex = - if c.mainModuleIdx != InvalidFileIdx and suffix == moduleSuffix(c.infos.config, c.mainModuleIdx): - result = c.mainModuleIdx + if suffix == moduleSuffix(c.infos.config, c.infos.config.projectMainIdx): + result = c.infos.config.projectMainIdx else: var isKnownFile = false result = c.infos.config.registerNifSuffix(suffix, isKnownFile) @@ -1660,8 +1658,6 @@ proc loadNifModule*(c: var DecodeContext; suffix: ModuleSuffix; interf, interfHi proc loadNifModule*(c: var DecodeContext; f: FileIndex; interf, interfHidden: var TStrTable; flags: set[LoadFlag] = {}): PrecompiledModule = let suffix = ModuleSuffix(moduleSuffix(c.infos.config, f)) - if f == c.infos.config.projectMainIdx: - c.mainModuleIdx = f result = loadNifModule(c, suffix, interf, interfHidden, flags) when isMainModule: