jyapayne/Nim
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

move more global variables into ConfigRef

Browse source
This commit is contained in:
Andreas Rumpf 2018-05-11 15:28:26 +02:00
commit 3c4ceea427
11 changed files with 109 additions and 101 deletions
Download patch file Download diff file Expand all files Collapse all files

10
compiler/nimconf.nim
View file

@ -239,7 +239,7 @@ proc loadConfigs*(cfg: string; cache: IdentCache; config: ConfigRef = nil) =
if optSkipUserConfigFile notin gGlobalOptions:
readConfigFile(getUserConfigPath(cfg), cache, config)
let pd = if gProjectPath.len > 0: gProjectPath else: getCurrentDir()
let pd = if config.projectPath.len > 0: config.projectPath else: getCurrentDir()
if optSkipParentConfigFiles notin gGlobalOptions:
for dir in parentDirs(pd, fromRoot=true, inclusive=false):
readConfigFile(dir / cfg, cache, config)
@ -247,13 +247,13 @@ proc loadConfigs*(cfg: string; cache: IdentCache; config: ConfigRef = nil) =
if optSkipProjConfigFile notin gGlobalOptions:
readConfigFile(pd / cfg, cache, config)
if gProjectName.len != 0:
if config.projectName.len != 0:
# new project wide config file:
var projectConfig = changeFileExt(gProjectFull, "nimcfg")
var projectConfig = changeFileExt(config.projectFull, "nimcfg")
if not fileExists(projectConfig):
projectConfig = changeFileExt(gProjectFull, "nim.cfg")
projectConfig = changeFileExt(config.projectFull, "nim.cfg")
readConfigFile(projectConfig, cache, config)
proc loadConfigs*(cfg: string; config: ConfigRef = nil) =
proc loadConfigs*(cfg: string; config: ConfigRef) =
# for backwards compatibility only.
loadConfigs(cfg, newIdentCache(), config)