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

fixes 'import x as y' regression

Browse source
This commit is contained in:
Araq 2014-10-22 01:54:27 +02:00
commit fa77547310
2 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
compiler/importer.nim
View file

@ -153,7 +153,7 @@ proc importModuleAs(n: PNode, realModule: PSym): PSym =
localError(n.info, errGenerated, "module alias must be an identifier") localError(n.info, errGenerated, "module alias must be an identifier")
elif n.sons[1].ident.id != realModule.name.id: elif n.sons[1].ident.id != realModule.name.id:
# some misguided guy will write 'import abc.foo as foo' ... # some misguided guy will write 'import abc.foo as foo' ...
result = createModuleAlias(realModule, n.sons[1].ident, n.sons[1].info) result = createModuleAlias(realModule, n.sons[1].ident, realModule.info)
proc myImportModule(c: PContext, n: PNode): PSym = proc myImportModule(c: PContext, n: PNode): PSym =
var f = checkModuleName(n) var f = checkModuleName(n)

3
tests/modules/tselfimport.nim
View file

@ -1,8 +1,9 @@
discard """ discard """
file: "tselfimport.nim" file: "tselfimport.nim"
line: 6 line: 7
errormsg: "A module cannot import itself" errormsg: "A module cannot import itself"
""" """
import strutils as su # guard against regression
import tselfimport #ERROR import tselfimport #ERROR
echo("Hello World") echo("Hello World")