address comments

compiler/cmdlinehelper.nim

@@ -6,21 +6,17 @@ import
   compiler/[options, idents, nimconf, scriptconfig, extccomp, commands, msgs, lineinfos, modulegraphs, condsyms],
   std/os
 
-type ProgBase* = ref object of RootObj
+type NimProg* = ref object
   name*: string
   suggestMode*: bool
+  processCmdLine*: proc(pass: TCmdLinePass, cmd: string; config: ConfigRef)
+  mainCommand*: proc(graph: ModuleGraph)
 
-method processCmdLine(self: ProgBase, pass: TCmdLinePass, cmd: string; config: ConfigRef) {.base.} =
-  doAssert false
-
-method mainCommand(self: ProgBase, graph: ModuleGraph) {.base.} =
-  doAssert false
-
-proc initDefinesProg*(self: ProgBase, conf: ConfigRef) =
+proc initDefinesProg*(self: NimProg, conf: ConfigRef) =
   condsyms.initDefines(conf.symbols)
   defineSymbol conf.symbols, self.name
 
-proc processCmdLineAndProjectPath*(self: ProgBase, conf: ConfigRef) =
+proc processCmdLineAndProjectPath*(self: NimProg, conf: ConfigRef) =
   self.processCmdLine(passCmd1, "", conf)
   if conf.projectName == "-":
     conf.projectName = "stdinfile"
@@ -39,23 +35,28 @@ proc processCmdLineAndProjectPath*(self: ProgBase, conf: ConfigRef) =
   else:
     conf.projectPath = canonicalizePath(conf, getCurrentDir())
 
-proc loadConfigsAndRunMainCommand*(self: ProgBase, cache: IdentCache; conf: ConfigRef): bool =
+proc loadConfigsAndRunMainCommand*(self: NimProg, cache: IdentCache; conf: ConfigRef): bool =
   loadConfigs(DefaultConfig, cache, conf) # load all config files
   if self.suggestMode:
     conf.command = "nimsuggest"
 
-  proc runNimScriptIfExists(scriptFile: string)=
-    if fileExists(scriptFile):
-      runNimScript(cache, scriptFile, freshDefines=false, conf)
+  proc runNimScriptIfExists(path: string)=
+    if fileExists(path):
+      runNimScript(cache, path, freshDefines = false, conf)
+
+  # Caution: make sure this stays in sync with `loadConfigs`
+  if optSkipSystemConfigFile notin conf.globalOptions:
+    runNimScriptIfExists(getSystemConfigPath(conf, DefaultConfigNims))
+
+  if optSkipUserConfigFile notin conf.globalOptions:
+    runNimScriptIfExists(getUserConfigPath(DefaultConfigNims))
+
+  if optSkipParentConfigFiles notin conf.globalOptions:
+    for dir in parentDirs(conf.projectPath, fromRoot = true, inclusive = false):
+      runNimScriptIfExists(dir / DefaultConfigNims)
 
-  # TODO:
-  # merge this complex logic with `loadConfigs`
-  # check whether these should be controlled via
-  # optSkipConfigFile, optSkipUserConfigFile
-  const configNims = "config.nims"
-  runNimScriptIfExists(getSystemConfigPath(conf, configNims))
-  runNimScriptIfExists(getUserConfigPath(configNims))
-  runNimScriptIfExists(conf.projectPath / configNims)
+  if optSkipProjConfigFile notin conf.globalOptions:
+    runNimScriptIfExists(conf.projectPath / DefaultConfigNims)
   block:
     let scriptFile = conf.projectFull.changeFileExt("nims")
     if not self.suggestMode:

compiler/commands.nim

@@ -651,7 +651,7 @@ proc processSwitch*(switch, arg: string, pass: TCmdLinePass, info: TLineInfo;
     else: localError(conf, info, "invalid option for --symbolFiles: " & arg)
   of "skipcfg":
     expectNoArg(conf, switch, arg, pass, info)
-    incl(conf.globalOptions, optSkipConfigFile)
+    incl(conf.globalOptions, optSkipSystemConfigFile)
   of "skipprojcfg":
     expectNoArg(conf, switch, arg, pass, info)
     incl(conf.globalOptions, optSkipProjConfigFile)

compiler/nim.nim

@@ -37,9 +37,7 @@ proc prependCurDir(f: string): string =
   else:
     result = f
 
-type ProgNim=ref object of ProgBase
-
-method processCmdLine(self: ProgNim, pass: TCmdLinePass, cmd: string; config: ConfigRef) =
+proc processCmdLine(pass: TCmdLinePass, cmd: string; config: ConfigRef) =
   var p = parseopt.initOptParser(cmd)
   var argsCount = 0
   while true:
@@ -58,11 +56,11 @@ method processCmdLine(self: ProgNim, pass: TCmdLinePass, cmd: string; config: Co
     if optRun notin config.globalOptions and config.arguments.len > 0 and config.command.normalize != "run":
       rawMessage(config, errGenerated, errArgsNeedRunOption)
 
-method mainCommand(self: ProgNim, graph: ModuleGraph)=
-  mainCommand(graph)
-
 proc handleCmdLine(cache: IdentCache; conf: ConfigRef) =
-  let self = ProgNim(name: "nim_compiler")
+  let self = NimProg(
+    name: "nim_compiler",
+    processCmdLine: processCmdLine,
+    mainCommand: mainCommand)
   self.initDefinesProg(conf)
   if paramCount() == 0:
     writeCommandLineUsage(conf, conf.helpWritten)

compiler/nimconf.nim

@@ -241,7 +241,7 @@ proc loadConfigs*(cfg: string; cache: IdentCache; conf: ConfigRef) =
     if readConfigFile(configPath, cache, conf):
       add(configFiles, configPath)
 
-  if optSkipConfigFile notin conf.globalOptions:
+  if optSkipSystemConfigFile notin conf.globalOptions:
     readConfigFile(getSystemConfigPath(conf, cfg))
 
   if optSkipUserConfigFile notin conf.globalOptions:
@@ -263,4 +263,5 @@ proc loadConfigs*(cfg: string; cache: IdentCache; conf: ConfigRef) =
       readConfigFile(projectConfig)
 
   for filename in configFiles:
+    # delayed to here so that `hintConf` is honored
     rawMessage(conf, hintConf, filename)

compiler/options.nim

@@ -54,10 +54,10 @@ type                          # please make sure we have under 32 options
     optGenMapping,            # generate a mapping file
     optRun,                   # run the compiled project
     optCheckNep1,             # check that the names adhere to NEP-1
-    optSkipConfigFile,        # skip the general config file
-    optSkipProjConfigFile,    # skip the project's config file
-    optSkipUserConfigFile,    # skip the users's config file
-    optSkipParentConfigFiles, # skip parent dir's config files
+    optSkipSystemConfigFile,  # skip the system's cfg/nims config file
+    optSkipProjConfigFile,    # skip the project's cfg/nims config file
+    optSkipUserConfigFile,    # skip the users's cfg/nims config file
+    optSkipParentConfigFiles, # skip parent dir's cfg/nims config files
     optNoMain,                # do not generate a "main" proc
     optUseColors,             # use colors for hints, warnings, and errors
     optThreads,               # support for multi-threading
@@ -391,6 +391,7 @@ const
   TexExt* = "tex"
   IniExt* = "ini"
   DefaultConfig* = "nim.cfg"
+  DefaultConfigNims* = "config.nims"
   DocConfig* = "nimdoc.cfg"
   DocTexConfig* = "nimdoc.tex.cfg"
 

compiler/scriptconfig.nim

@@ -171,7 +171,7 @@ proc runNimScript*(cache: IdentCache; scriptName: string;
   incl(m.flags, sfMainModule)
   graph.vm = setupVM(m, cache, scriptName, graph)
 
-  graph.compileSystemModule()
+  graph.compileSystemModule() # TODO: see why this unsets hintConf in conf.notes
   discard graph.processModule(m, llStreamOpen(scriptName, fmRead))
 
   # ensure we load 'system.nim' again for the real non-config stuff!

nimsuggest/nimsuggest.nim

@@ -487,9 +487,7 @@ proc mainThread(graph: ModuleGraph) =
 var
   inputThread: Thread[ThreadParams]
 
-type ProgNimsuggest=ref object of ProgBase
-
-method mainCommand(self: ProgNimsuggest, graph: ModuleGraph) =
+proc mainCommand(graph: ModuleGraph) =
   let conf = graph.config
   clearPasses(graph)
   registerPass graph, verbosePass
@@ -584,7 +582,11 @@ proc processCmdLine*(pass: TCmdLinePass, cmd: string; conf: ConfigRef) =
       # if processArgument(pass, p, argsCount): break
 
 proc handleCmdLine(cache: IdentCache; conf: ConfigRef) =
-  let self = ProgNimsuggest(suggestMode: true, name: "nimsuggest")
+  let self = NimProg(
+    suggestMode: true,
+    name: "nimsuggest",
+    processCmdLine: processCmdLine,
+    mainCommand: mainCommand)
   self.initDefinesProg(conf)
 
   if paramCount() == 0: