rename loadConfigsAndRunMainCommand => loadConfigsAndProcessCmdLine, reflect reality (#16057)

This commit is contained in:
Timothee Cour 2020-11-20 01:51:14 -08:00 • committed by GitHub
commit 7815ed69d4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 6 additions and 6 deletions

View file

@ -57,7 +57,7 @@ proc processCmdLineAndProjectPath*(self: NimProg, conf: ConfigRef) =
else: else:
conf.projectPath = AbsoluteDir canonicalizePath(conf, AbsoluteFile getCurrentDir()) conf.projectPath = AbsoluteDir canonicalizePath(conf, AbsoluteFile getCurrentDir())
proc loadConfigsAndRunMainCommand*(self: NimProg, cache: IdentCache; conf: ConfigRef; proc loadConfigsAndProcessCmdLine*(self: NimProg, cache: IdentCache; conf: ConfigRef;
graph: ModuleGraph): bool = graph: ModuleGraph): bool =
if self.suggestMode: if self.suggestMode:
conf.command = "nimsuggest" conf.command = "nimsuggest"

View file

@ -79,7 +79,7 @@ proc handleCmdLine(cache: IdentCache; conf: ConfigRef) =
self.processCmdLineAndProjectPath(conf) self.processCmdLineAndProjectPath(conf)
var graph = newModuleGraph(cache, conf) var graph = newModuleGraph(cache, conf)
if not self.loadConfigsAndRunMainCommand(cache, conf, graph): if not self.loadConfigsAndProcessCmdLine(cache, conf, graph):
return return
mainCommand(graph) mainCommand(graph)
if conf.hasHint(hintGCStats): echo(GC_getStatistics()) if conf.hasHint(hintGCStats): echo(GC_getStatistics())

View file

@ -1269,7 +1269,7 @@ proc handleCmdLine(cache: IdentCache; conf: ConfigRef) =
self.processCmdLineAndProjectPath(conf) self.processCmdLineAndProjectPath(conf)
var graph = newModuleGraph(cache, conf) var graph = newModuleGraph(cache, conf)
if not self.loadConfigsAndRunMainCommand(cache, conf, graph): return if not self.loadConfigsAndProcessCmdLine(cache, conf, graph): return
mainCommand(graph) mainCommand(graph)
if conf.hasHint(hintGCStats): echo(GC_getStatistics()) if conf.hasHint(hintGCStats): echo(GC_getStatistics())

View file

@ -644,7 +644,7 @@ proc handleCmdLine(cache: IdentCache; conf: ConfigRef) =
myLog("START " & conf.projectFull.string) myLog("START " & conf.projectFull.string)
var graph = newModuleGraph(cache, conf) var graph = newModuleGraph(cache, conf)
if self.loadConfigsAndRunMainCommand(cache, conf, graph): if self.loadConfigsAndProcessCmdLine(cache, conf, graph):
mainCommand(graph) mainCommand(graph)
when isMainModule: when isMainModule:
@ -723,7 +723,7 @@ else:
myLog("START " & conf.projectFull.string) myLog("START " & conf.projectFull.string)
var graph = newModuleGraph(cache, conf) var graph = newModuleGraph(cache, conf)
if self.loadConfigsAndRunMainCommand(cache, conf, graph): if self.loadConfigsAndProcessCmdLine(cache, conf, graph):
mockCommand(graph) mockCommand(graph)
if gLogging: if gLogging:
for it in conf.searchPaths: for it in conf.searchPaths:

View file

@ -228,7 +228,7 @@ proc handleCmdLine(cache: IdentCache; conf: ConfigRef) =
conf.prefixDir = AbsoluteDir"" conf.prefixDir = AbsoluteDir""
var graph = newModuleGraph(cache, conf) var graph = newModuleGraph(cache, conf)
if self.loadConfigsAndRunMainCommand(cache, conf, graph): if self.loadConfigsAndProcessCmdLine(cache, conf, graph):
mainCommand(graph) mainCommand(graph)
handleCmdLine(newIdentCache(), newConfigRef()) handleCmdLine(newIdentCache(), newConfigRef())