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

Fixed c filenames mangling (#12161)

Browse source
This commit is contained in:
Yuriy Glukhov 2019-09-11 21:47:58 +03:00 • committed by Andreas Rumpf
commit 5783cd67a8
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
compiler/packagehandling.nim
View file

@ -39,11 +39,11 @@ proc getPackageName*(conf: ConfigRef; path: string): string =
if parents <= 0: break
proc fakePackageName*(conf: ConfigRef; path: AbsoluteFile): string =
# foo/../bar becomes foo@..@bar
result = relativeTo(path, conf.projectPath, '/').string.multiReplace({"/": "@", "@": "@@"})
# foo-#head/../bar becomes @foo-@hhead@s..@sbar
result = "@" & relativeTo(path, conf.projectPath, '/').string.multiReplace({"/": "@s", "#": "@h", "@": "@@"})
proc demanglePackageName*(path: string): string =
result = path.multiReplace({"@@": "@", "@": "/"})
result = path[1 .. ^1].multiReplace({"@@": "@", "@h": "#", "@s": "/"})
proc withPackageName*(conf: ConfigRef; path: AbsoluteFile): AbsoluteFile =
let x = getPackageName(conf, path.string)