From 657e09e79deabe6304ead7759a4fdcfeb5fd022b Mon Sep 17 00:00:00 2001 From: Endeg Date: Thu, 26 Sep 2019 00:32:36 +0600 Subject: [PATCH] Fix #12242, replacing ":" with "@c" in packages [backport] (#12265) --- compiler/packagehandling.nim | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/compiler/packagehandling.nim b/compiler/packagehandling.nim index ef0d554b18..7fb560433b 100644 --- a/compiler/packagehandling.nim +++ b/compiler/packagehandling.nim @@ -40,10 +40,10 @@ proc getPackageName*(conf: ConfigRef; path: string): string = proc fakePackageName*(conf: ConfigRef; path: AbsoluteFile): string = # foo-#head/../bar becomes @foo-@hhead@s..@sbar - result = "@m" & relativeTo(path, conf.projectPath, '/').string.multiReplace({"/": "@s", "#": "@h", "@": "@@"}) + result = "@m" & relativeTo(path, conf.projectPath, '/').string.multiReplace({"/": "@s", "#": "@h", "@": "@@", ":": "@c"}) proc demanglePackageName*(path: string): string = - result = path.multiReplace({"@@": "@", "@h": "#", "@s": "/", "@m": ""}) + result = path.multiReplace({"@@": "@", "@h": "#", "@s": "/", "@m": "", "@c": ":"}) proc withPackageName*(conf: ConfigRef; path: AbsoluteFile): AbsoluteFile = let x = getPackageName(conf, path.string)