diff options
| -rw-r--r-- | compiler/importer.nim | 4 | ||||
| -rw-r--r-- | compiler/semexprs.nim | 10 | ||||
| -rw-r--r-- | tests/modules/texport.nim | 3 |
3 files changed, 11 insertions, 6 deletions
diff --git a/compiler/importer.nim b/compiler/importer.nim index 58b5ef8d4..33ed7e055 100644 --- a/compiler/importer.nim +++ b/compiler/importer.nim @@ -173,7 +173,7 @@ proc evalImport(c: PContext, n: PNode): PNode = # ``addDecl`` needs to be done before ``importAllSymbols``! addDecl(c, m) # add symbol to symbol table of module importAllSymbolsExcept(c, m, emptySet) - importForwarded(c, m.ast, emptySet) + #importForwarded(c, m.ast, emptySet) proc evalFrom(c: PContext, n: PNode): PNode = result = n @@ -198,4 +198,4 @@ proc evalImportExcept*(c: PContext, n: PNode): PNode = let ident = lookups.considerQuotedIdent(n.sons[i]) exceptSet.incl(ident.id) importAllSymbolsExcept(c, m, exceptSet) - importForwarded(c, m.ast, exceptSet) + #importForwarded(c, m.ast, exceptSet) diff --git a/compiler/semexprs.nim b/compiler/semexprs.nim index 46e6f1ab3..58cef36f9 100644 --- a/compiler/semexprs.nim +++ b/compiler/semexprs.nim @@ -1935,11 +1935,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) = diff --git a/tests/modules/texport.nim b/tests/modules/texport.nim index 99228dfce..9515f9060 100644 --- a/tests/modules/texport.nim +++ b/tests/modules/texport.nim @@ -4,6 +4,9 @@ discard """ import mexporta +# bug #1029: +from rawsockets import accept + # B.TMyObject has been imported implicitly here: var x: TMyObject echo($x, q(0), q"0") |