diff options
| author | awr1 <41453959+awr1@users.noreply.github.com> | 2018-09-04 16:33:52 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-04 16:33:52 -0500 |
| commit | eb668003bf35671d7358e5f54e05820c0f4aef3d (patch) | |
| tree | e5c5d6315f8ba4a5dd647bf67a4d0afb609916e7 /compiler/nimconf.nim | |
| parent | 89ad1cc9b18db8320e5b170ee45888cf79d52001 (diff) | |
| parent | 4aba2981dd47672744191bd17b39bb149f494637 (diff) | |
| download | Nim-eb668003bf35671d7358e5f54e05820c0f4aef3d.tar.gz | |
Merge branch 'devel' into experimentalize-reorder
Diffstat (limited to 'compiler/nimconf.nim')
| -rw-r--r-- | compiler/nimconf.nim | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/compiler/nimconf.nim b/compiler/nimconf.nim index 1a8a0acb5..5f6889a6f 100644 --- a/compiler/nimconf.nim +++ b/compiler/nimconf.nim @@ -175,9 +175,9 @@ proc parseAssignment(L: var TLexer, tok: var TToken; confTok(L, tok, config, condStack) if tok.tokType == tkBracketLe: # BUGFIX: val, not s! - # BUGFIX: do not copy '['! confTok(L, tok, config, condStack) checkSymbol(L, tok) + add(val, '[') add(val, tokToStr(tok)) confTok(L, tok, config, condStack) if tok.tokType == tkBracketRi: confTok(L, tok, config, condStack) @@ -219,10 +219,10 @@ proc readConfigFile( closeLexer(L) return true -proc getUserConfigPath(filename: string): string = +proc getUserConfigPath*(filename: string): string = result = joinPath([getConfigDir(), "nim", filename]) -proc getSystemConfigPath(conf: ConfigRef; filename: string): string = +proc getSystemConfigPath*(conf: ConfigRef; filename: string): string = # try standard configuration file (installation did not distribute files # the UNIX way) let p = getPrefixDir(conf) @@ -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) |