diff options
Diffstat (limited to 'compiler/semexprs.nim')
-rw-r--r-- | compiler/semexprs.nim | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/compiler/semexprs.nim b/compiler/semexprs.nim index 43f04fc9f..61c530f61 100644 --- a/compiler/semexprs.nim +++ b/compiler/semexprs.nim @@ -2267,6 +2267,7 @@ proc semExportExcept(c: PContext, n: PNode): PNode = return n let exceptSet = readExceptSet(c, n) let exported = moduleName.sym + result = newNodeI(nkExportStmt, n.info) strTableAdd(c.module.tab, exported) var i: TTabIter var s = initTabIter(i, exported.tab) @@ -2274,11 +2275,12 @@ proc semExportExcept(c: PContext, n: PNode): PNode = if s.kind in ExportableSymKinds+{skModule} and s.name.id notin exceptSet: strTableAdd(c.module.tab, s) + result.add newSymNode(s, n.info) s = nextIter(i, exported.tab) - result = n proc semExport(c: PContext, n: PNode): PNode = - var x = newNodeI(n.kind, n.info) + result = newNodeI(nkExportStmt, n.info) + for i in 0..<n.len: let a = n.sons[i] var o: TOverloadIter @@ -2288,20 +2290,19 @@ proc semExport(c: PContext, n: PNode): PNode = elif s.kind == skModule: # forward everything from that module: strTableAdd(c.module.tab, s) - x.add(newSymNode(s, a.info)) var ti: TTabIter var it = initTabIter(ti, s.tab) while it != nil: if it.kind in ExportableSymKinds+{skModule}: strTableAdd(c.module.tab, it) + result.add newSymNode(it, a.info) it = nextIter(ti, s.tab) else: while s != nil: if s.kind in ExportableSymKinds+{skModule}: - x.add(newSymNode(s, a.info)) + result.add(newSymNode(s, a.info)) strTableAdd(c.module.tab, s) s = nextOverloadIter(o, c, a) - result = n proc shouldBeBracketExpr(n: PNode): bool = assert n.kind in nkCallKinds |