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

fix #12130 ; improve naming scheme in fakePackageName (#12149)

Browse source 
* fix #12130 ; improve naming scheme in fakePackageName

* fix tests
This commit is contained in:
Andreas Rumpf 2019-09-08 20:33:18 +02:00 • committed by GitHub
commit f915064e07
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 7 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)

3
testament/testament.nim
View file

@ -332,8 +332,7 @@ proc generatedFile(test: TTest, target: TTarget): string =
else: else:
let (_, name, _) = test.name.splitFile let (_, name, _) = test.name.splitFile
let ext = targetToExt[target] let ext = targetToExt[target]
result = nimcacheDir(test.name, test.options, target) / result = nimcacheDir(test.name, test.options, target) / name.changeFileExt(ext)
name.replace("_", "__").changeFileExt(ext)
proc needsCodegenCheck(spec: TSpec): bool = proc needsCodegenCheck(spec: TSpec): bool =
result = spec.maxCodeSize > 0 or spec.ccodeCheck.len > 0 result = spec.maxCodeSize > 0 or spec.ccodeCheck.len > 0