Merge pull request #11201 from nim-lang/araq-fixes-11200

fixes 11200

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")

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": "/"})
 

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))