diff options
| author | Timothee Cour <timothee.cour2@gmail.com> | 2020-11-20 01:51:14 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-20 10:51:14 +0100 |
| commit | 7815ed69d4a3fc7b96c397c7820cef290f5b0a4d (patch) | |
| tree | 2dc1fa4abd4b14140ff0f5f44cd9836697dc9191 | |
| parent | 6cf5ca1dc2c1c0388e0998a24d26f4a9c9b7e60e (diff) | |
| download | Nim-7815ed69d4a3fc7b96c397c7820cef290f5b0a4d.tar.gz | |
rename loadConfigsAndRunMainCommand => loadConfigsAndProcessCmdLine, reflect reality (#16057)
| -rw-r--r-- | compiler/cmdlinehelper.nim | 2 | ||||
| -rw-r--r-- | compiler/nim.nim | 2 | ||||
| -rw-r--r-- | drnim/drnim.nim | 2 | ||||
| -rw-r--r-- | nimsuggest/nimsuggest.nim | 4 | ||||
| -rw-r--r-- | tools/nimfind.nim | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/compiler/cmdlinehelper.nim b/compiler/cmdlinehelper.nim index d5a26717d..ffbb0d40b 100644 --- a/compiler/cmdlinehelper.nim +++ b/compiler/cmdlinehelper.nim @@ -57,7 +57,7 @@ proc processCmdLineAndProjectPath*(self: NimProg, conf: ConfigRef) = else: 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 = if self.suggestMode: conf.command = "nimsuggest" diff --git a/compiler/nim.nim b/compiler/nim.nim index 9ff0eedbc..e3725f803 100644 --- a/compiler/nim.nim +++ b/compiler/nim.nim @@ -79,7 +79,7 @@ proc handleCmdLine(cache: IdentCache; conf: ConfigRef) = self.processCmdLineAndProjectPath(conf) var graph = newModuleGraph(cache, conf) - if not self.loadConfigsAndRunMainCommand(cache, conf, graph): + if not self.loadConfigsAndProcessCmdLine(cache, conf, graph): return mainCommand(graph) if conf.hasHint(hintGCStats): echo(GC_getStatistics()) diff --git a/drnim/drnim.nim b/drnim/drnim.nim index b4761a398..d68175c83 100644 --- a/drnim/drnim.nim +++ b/drnim/drnim.nim @@ -1269,7 +1269,7 @@ proc handleCmdLine(cache: IdentCache; conf: ConfigRef) = self.processCmdLineAndProjectPath(conf) var graph = newModuleGraph(cache, conf) - if not self.loadConfigsAndRunMainCommand(cache, conf, graph): return + if not self.loadConfigsAndProcessCmdLine(cache, conf, graph): return mainCommand(graph) if conf.hasHint(hintGCStats): echo(GC_getStatistics()) diff --git a/nimsuggest/nimsuggest.nim b/nimsuggest/nimsuggest.nim index afc692241..d438e663c 100644 --- a/nimsuggest/nimsuggest.nim +++ b/nimsuggest/nimsuggest.nim @@ -644,7 +644,7 @@ proc handleCmdLine(cache: IdentCache; conf: ConfigRef) = myLog("START " & conf.projectFull.string) var graph = newModuleGraph(cache, conf) - if self.loadConfigsAndRunMainCommand(cache, conf, graph): + if self.loadConfigsAndProcessCmdLine(cache, conf, graph): mainCommand(graph) when isMainModule: @@ -723,7 +723,7 @@ else: myLog("START " & conf.projectFull.string) var graph = newModuleGraph(cache, conf) - if self.loadConfigsAndRunMainCommand(cache, conf, graph): + if self.loadConfigsAndProcessCmdLine(cache, conf, graph): mockCommand(graph) if gLogging: for it in conf.searchPaths: diff --git a/tools/nimfind.nim b/tools/nimfind.nim index f13e86aaa..b120ccd1f 100644 --- a/tools/nimfind.nim +++ b/tools/nimfind.nim @@ -228,7 +228,7 @@ proc handleCmdLine(cache: IdentCache; conf: ConfigRef) = conf.prefixDir = AbsoluteDir"" var graph = newModuleGraph(cache, conf) - if self.loadConfigsAndRunMainCommand(cache, conf, graph): + if self.loadConfigsAndProcessCmdLine(cache, conf, graph): mainCommand(graph) handleCmdLine(newIdentCache(), newConfigRef()) |