diff options
author | Zahary Karadjov <zahary@gmail.com> | 2018-05-04 17:47:37 +0300 |
---|---|---|
committer | Andreas Rumpf <rumpf_a@web.de> | 2018-05-07 09:37:49 +0200 |
commit | cf13c5fba48e757531b3f9cb0e3aeae7710c849c (patch) | |
tree | 37c2ab529a4dfe808f6fd0118a5f7a51d51ad4ee /compiler/importer.nim | |
parent | 72976139009b9ae74669dc2443474f091c99f2e4 (diff) | |
download | Nim-cf13c5fba48e757531b3f9cb0e3aeae7710c849c.tar.gz |
implement the export/except statement
Diffstat (limited to 'compiler/importer.nim')
-rw-r--r-- | compiler/importer.nim | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/compiler/importer.nim b/compiler/importer.nim index f4903e6c4..a5c361864 100644 --- a/compiler/importer.nim +++ b/compiler/importer.nim @@ -16,6 +16,13 @@ import proc evalImport*(c: PContext, n: PNode): PNode proc evalFrom*(c: PContext, n: PNode): PNode +proc readExceptSet*(n: PNode): IntSet = + assert n.kind in {nkImportExceptStmt, nkExportExceptStmt} + result = initIntSet() + for i in 1 ..< n.len: + let ident = lookups.considerQuotedIdent(n[i]) + result.incl(ident.id) + proc importPureEnumField*(c: PContext; s: PSym) = var check = strTableGet(c.importTable.symbols, s.name) if check == nil: @@ -198,9 +205,5 @@ proc evalImportExcept*(c: PContext, n: PNode): PNode = if m != nil: n.sons[0] = newSymNode(m) addDecl(c, m, n.info) # add symbol to symbol table of module - var exceptSet = initIntSet() - for i in countup(1, sonsLen(n) - 1): - let ident = lookups.considerQuotedIdent(n.sons[i]) - exceptSet.incl(ident.id) - importAllSymbolsExcept(c, m, exceptSet) + importAllSymbolsExcept(c, m, readExceptSet(n)) #importForwarded(c, m.ast, exceptSet) |