mirror of
https://github.com/nim-lang/Nim.git
synced 2025-12-29 01:14:41 +00:00
d30c6419a0
* Refactor and doc package handling, module name mangling * Consolidate, de-duplicate and extend package handling * Alter how duplicate module names of a package are handled * Alter how module names are mangled * Fix crash when another package is named 'stdlib' (test case added) * Doc what defines a package in the manual Modules with duplicate names within a package used to be given 'fake' packages to resolve conflicts. That prevented the ability to discern if a module belonged to the current project package or a foreign package. They now have the proper package owner and the names are mangled in a consistent manner to prevent codegen clashes. All module names are now mangled the same. Stdlib was treated special before, but now it is same as any other package. This fixes a crash when a foreign package is named 'stdlib'. Module mangling is altered for both file paths and symbols used by the backends. Removed an unused module name to package mapping that may have been intended for IC. The mapping was removed because it wasn't being used and was complicating the issue of package modules with duplicate names not having the proper package owner assigned. * Fix some tests * Refactor `packagehandling` * Remove `packagehandling.withPackageName` and its uses * Move module path mangling from `packagehandling` to `modulepaths` * Move `options.toRodFile` to `ic` to break import cycle * Changed import style to match preferred style Co-authored-by: quantimnot <quantimnot@users.noreply.github.com>
44 lines
1.3 KiB
Nim
44 lines
1.3 KiB
Nim
#
|
|
#
|
|
# The Nim Compiler
|
|
# (c) Copyright 2017 Andreas Rumpf
|
|
#
|
|
# See the file "copying.txt", included in this
|
|
# distribution, for details about the copyright.
|
|
#
|
|
|
|
iterator myParentDirs(p: string): string =
|
|
# XXX os's parentDirs is stupid (multiple yields) and triggers an old bug...
|
|
var current = p
|
|
while true:
|
|
current = current.parentDir
|
|
if current.len == 0: break
|
|
yield current
|
|
|
|
proc getNimbleFile*(conf: ConfigRef; path: string): string =
|
|
## returns absolute path to nimble file, e.g.: /pathto/cligen.nimble
|
|
var parents = 0
|
|
block packageSearch:
|
|
for d in myParentDirs(path):
|
|
if conf.packageCache.hasKey(d):
|
|
#echo "from cache ", d, " |", packageCache[d], "|", path.splitFile.name
|
|
return conf.packageCache[d]
|
|
inc parents
|
|
for file in walkFiles(d / "*.nimble"):
|
|
result = file
|
|
break packageSearch
|
|
# we also store if we didn't find anything:
|
|
for d in myParentDirs(path):
|
|
#echo "set cache ", d, " |", result, "|", parents
|
|
conf.packageCache[d] = result
|
|
dec parents
|
|
if parents <= 0: break
|
|
|
|
proc getPackageName*(conf: ConfigRef; path: string): string =
|
|
## returns nimble package name, e.g.: `cligen`
|
|
let path = getNimbleFile(conf, path)
|
|
if path.len > 0:
|
|
return path.splitFile.name
|
|
else:
|
|
return "unknown"
|