diff options
| author | Araq <rumpf_a@web.de> | 2014-10-22 12:50:04 +0200 |
|---|---|---|
| committer | Araq <rumpf_a@web.de> | 2014-10-22 12:50:04 +0200 |
| commit | 2c5743db3eac0ecb19d30f7b3b43045a116dcbf4 (patch) | |
| tree | fbadb4db9d3820eb038673f37751f6d49f6bf2dc /compiler | |
| parent | 0f260400743967031fd2cea2e3e8443dc7fcaaa7 (diff) | |
| download | Nim-2c5743db3eac0ecb19d30f7b3b43045a116dcbf4.tar.gz | |
fixes #1029
Diffstat (limited to 'compiler')
| -rw-r--r-- | compiler/importer.nim | 4 | ||||
| -rw-r--r-- | compiler/semexprs.nim | 10 |
2 files changed, 8 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) = |