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

fixes the new to be documented imports

Browse source
This commit is contained in:
Andreas Rumpf 2017-11-05 16:33:26 +01:00
commit eee43e4f8f
1 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
compiler/modulepaths.nim
View file

@ -98,6 +98,7 @@ proc resolveDollar(project, source, pkg, subdir: string; info: TLineInfo): strin
proc scriptableImport(pkg, sub: string; info: TLineInfo): string = proc scriptableImport(pkg, sub: string; info: TLineInfo): string =
result = resolveDollar(gProjectFull, info.toFullPath(), pkg, sub, info) result = resolveDollar(gProjectFull, info.toFullPath(), pkg, sub, info)
if result.isNil: result = ""
proc lookupPackage(pkg, subdir: PNode): string = proc lookupPackage(pkg, subdir: PNode): string =
let sub = if subdir != nil: renderTree(subdir, {renderNoComments}).replace(" ") else: "" let sub = if subdir != nil: renderTree(subdir, {renderNoComments}).replace(" ") else: ""
@ -166,7 +167,8 @@ proc checkModuleName*(n: PNode; doLocalError=true): int32 =
let fullPath = findModule(modulename, n.info.toFullPath) let fullPath = findModule(modulename, n.info.toFullPath)
if fullPath.len == 0: if fullPath.len == 0:
if doLocalError: if doLocalError:
localError(n.info, errCannotOpenFile, modulename) let m = if modulename.len > 0: modulename else: $n
localError(n.info, errCannotOpenFile, m)
result = InvalidFileIDX result = InvalidFileIDX
else: else:
result = fullPath.fileInfoIdx result = fullPath.fileInfoIdx