diff options
| -rw-r--r-- | compiler/extccomp.nim | 2 | ||||
| -rw-r--r-- | compiler/packagehandling.nim | 2 | ||||
| -rw-r--r-- | compiler/semtypinst.nim | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/compiler/extccomp.nim b/compiler/extccomp.nim index 499cca6d8..530fba7b0 100644 --- a/compiler/extccomp.nim +++ b/compiler/extccomp.nim @@ -663,7 +663,7 @@ proc compileCFiles(conf: ConfigRef; list: CFileList, script: var Rope, cmds: var if optCompileOnly notin conf.globalOptions: add(cmds, compileCmd) let (_, name, _) = splitFile(it.cname) - add(prettyCmds, if hintCC in conf.notes: "CC: " & demaglePackageName(name) else: "") + add(prettyCmds, if hintCC in conf.notes: "CC: " & demanglePackageName(name) else: "") if optGenScript in conf.globalOptions: add(script, compileCmd) add(script, "\n") diff --git a/compiler/packagehandling.nim b/compiler/packagehandling.nim index 548668824..b9db61b4d 100644 --- a/compiler/packagehandling.nim +++ b/compiler/packagehandling.nim @@ -43,7 +43,7 @@ proc fakePackageName*(conf: ConfigRef; path: AbsoluteFile): string = result = relativeTo(path, conf.projectPath, '/').string.multiReplace( {"/": "7", "..": "_", "7": "77", "_": "__", ":": "8", "8": "88"}) -proc demaglePackageName*(path: string): string = +proc demanglePackageName*(path: string): string = result = path.multiReplace( {"88": "8", "8": ":", "77": "7", "__": "_", "_7": "../", "7": "/"}) diff --git a/compiler/semtypinst.nim b/compiler/semtypinst.nim index e5a51b50d..85d0b1c5a 100644 --- a/compiler/semtypinst.nim +++ b/compiler/semtypinst.nim @@ -254,7 +254,7 @@ proc replaceTypeVarsS(cl: var TReplTypeVars, s: PSym): PSym = # (e.g. skGenericParam and skType). # Note: `s.magic` may be `mType` in an example such as: # proc foo[T](a: T, b = myDefault(type(a))) - if s.kind in routineKinds or s.magic != mNone: + if s.kind in routineKinds+{skLet, skConst, skVar} or s.magic != mNone: return s #result = PSym(idTableGet(cl.symMap, s)) |