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

fix #12130 ; improve naming scheme in fakePackageName

Browse source
This commit is contained in:
Timothee Cour 2019-09-06 11:26:48 -07:00
commit 4129993689
1 changed files with 3 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
compiler/packagehandling.nim
View file

@ -39,13 +39,11 @@ proc getPackageName*(conf: ConfigRef; path: string): string =
if parents <= 0: break if parents <= 0: break
proc fakePackageName*(conf: ConfigRef; path: AbsoluteFile): string = proc fakePackageName*(conf: ConfigRef; path: AbsoluteFile): string =
# foo/../bar becomes foo7_7bar # foo/../bar becomes foo@..@bar
result = relativeTo(path, conf.projectPath, '/').string.multiReplace( result = relativeTo(path, conf.projectPath, '/').string.multiReplace({"/": "@", "@": "@@"})
{"/": "7", "..": "_", "7": "77", "_": "__", ":": "8", "8": "88"})
proc demanglePackageName*(path: string): string = proc demanglePackageName*(path: string): string =
result = path.multiReplace( result = path.multiReplace({"@@": "@", "@": "/"})
{"88": "8", "8": ":", "77": "7", "__": "_", "_7": "../", "7": "/"})
proc withPackageName*(conf: ConfigRef; path: AbsoluteFile): AbsoluteFile = proc withPackageName*(conf: ConfigRef; path: AbsoluteFile): AbsoluteFile =
let x = getPackageName(conf, path.string) let x = getPackageName(conf, path.string)