diff options
| -rw-r--r-- | compiler/packagehandling.nim | 6 | ||||
| -rw-r--r-- | testament/testament.nim | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/compiler/packagehandling.nim b/compiler/packagehandling.nim index 54fbe23a4..561d6dfc4 100644 --- a/compiler/packagehandling.nim +++ b/compiler/packagehandling.nim @@ -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) diff --git a/testament/testament.nim b/testament/testament.nim index 41dca39ae..f70a2afef 100644 --- a/testament/testament.nim +++ b/testament/testament.nim @@ -332,7 +332,7 @@ proc generatedFile(test: TTest, target: TTarget): string = else: let (_, name, _) = test.name.splitFile let ext = targetToExt[target] - result = nimcacheDir(test.name, test.options, target) / name.changeFileExt(ext) + result = nimcacheDir(test.name, test.options, target) / "@" & name.changeFileExt(ext) proc needsCodegenCheck(spec: TSpec): bool = result = spec.maxCodeSize > 0 or spec.ccodeCheck.len > 0 |