diff options
Diffstat (limited to 'compiler/modules.nim')
| -rw-r--r-- | compiler/modules.nim | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/compiler/modules.nim b/compiler/modules.nim index 04b1506f4..b3a1e90d6 100644 --- a/compiler/modules.nim +++ b/compiler/modules.nim @@ -95,8 +95,13 @@ proc includeModule*(graph: ModuleGraph; s: PSym, fileIdx: FileIndex): PNode {.pr graph.addDep(s, fileIdx) graph.addIncludeDep(s.position.FileIndex, fileIdx) +proc connectCallbacks*(graph: ModuleGraph) = + graph.includeFileCallback = includeModule + graph.importModuleCallback = importModule + proc compileSystemModule*(graph: ModuleGraph) = if graph.systemModule == nil: + connectCallbacks(graph) graph.config.m.systemFileIdx = fileInfoIdx(graph.config, graph.config.libpath / "system.nim") discard graph.compileModule(graph.config.m.systemFileIdx, {sfSystemModule}) @@ -105,10 +110,6 @@ proc wantMainModule*(conf: ConfigRef) = fatal(conf, newLineInfo(conf, "command line", 1, 1), errGenerated, "command expects a filename") conf.projectMainIdx = fileInfoIdx(conf, addFileExt(conf.projectFull, NimExt)) -proc connectCallbacks*(graph: ModuleGraph) = - graph.includeFileCallback = includeModule - graph.importModuleCallback = importModule - proc compileProject*(graph: ModuleGraph; projectFileIdx = InvalidFileIDX) = connectCallbacks(graph) let conf = graph.config |