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

Merge branch 'devel' into bigbreak

Browse source 
Conflicts:
	web/news.txt
This commit is contained in:
Araq 2014-10-23 23:13:49 +02:00
commit 201d3c9ed0
7 changed files with 35 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

10
compiler/semexprs.nim
View file

@ -1949,11 +1949,13 @@ proc semExport(c: PContext, n: PNode): PNode =
while s != nil:
if s.kind in ExportableSymKinds+{skModule}:
x.add(newSymNode(s, a.info))
strTableAdd(c.module.tab, s)
s = nextOverloadIter(o, c, a)
if c.module.ast.isNil:
c.module.ast = newNodeI(nkStmtList, n.info)
assert c.module.ast.kind == nkStmtList
c.module.ast.add x
when false:
if c.module.ast.isNil:
c.module.ast = newNodeI(nkStmtList, n.info)
assert c.module.ast.kind == nkStmtList
c.module.ast.add x
result = n
proc setGenericParams(c: PContext, n: PNode) =