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

Bugfix: macros can be exported again

Browse source
This commit is contained in:
Andreas Rumpf 2010-03-05 12:55:13 +01:00
commit 13c69f5540
6 changed files with 26 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

27
rod/lookups.nim
View file

@ -69,6 +69,17 @@ proc addDecl(c: PContext, sym: PSym) =
proc addDeclAt(c: PContext, sym: PSym, at: Natural) =
if SymTabAddUniqueAt(c.tab, sym, at) == Failure:
liMessage(sym.info, errAttemptToRedefine, sym.Name.s)
proc AddInterfaceDeclAux(c: PContext, sym: PSym) =
if (sfInInterface in sym.flags):
# add to interface:
if c.module == nil: InternalError(sym.info, "AddInterfaceDeclAux")
StrTableAdd(c.module.tab, sym)
if getCurrOwner().kind == skModule: incl(sym.flags, sfGlobal)
proc addInterfaceDeclAt*(c: PContext, sym: PSym, at: Natural) =
addDeclAt(c, sym, at)
AddInterfaceDeclAux(c, sym)
proc addOverloadableSymAt(c: PContext, fn: PSym, at: Natural) =
if not (fn.kind in OverloadableSyms):
@ -77,13 +88,6 @@ proc addOverloadableSymAt(c: PContext, fn: PSym, at: Natural) =
if (check != nil) and not (check.Kind in OverloadableSyms):
liMessage(fn.info, errAttemptToRedefine, fn.Name.s)
SymTabAddAt(c.tab, fn, at)
proc AddInterfaceDeclAux(c: PContext, sym: PSym) =
if (sfInInterface in sym.flags):
# add to interface:
if c.module == nil: InternalError(sym.info, "AddInterfaceDeclAux")
StrTableAdd(c.module.tab, sym)
if getCurrOwner().kind == skModule: incl(sym.flags, sfGlobal)
proc addInterfaceDecl(c: PContext, sym: PSym) =
# it adds the symbol to the interface if appropriate
@ -115,9 +119,6 @@ proc lookUp(c: PContext, n: PNode): PSym =
if result.kind == skStub: loadStub(result)
proc QualifiedLookUp(c: PContext, n: PNode, ambiguousCheck: bool): PSym =
var
m: PSym
ident: PIdent
case n.kind
of nkIdent:
result = SymtabGet(c.Tab, n.ident)
@ -136,9 +137,9 @@ proc QualifiedLookUp(c: PContext, n: PNode, ambiguousCheck: bool): PSym =
liMessage(n.info, errUseQualifier, n.sym.name.s)
of nkDotExpr:
result = nil
m = qualifiedLookUp(c, n.sons[0], false)
var m = qualifiedLookUp(c, n.sons[0], false)
if (m != nil) and (m.kind == skModule):
ident = nil
var ident: PIdent = nil
if (n.sons[1].kind == nkIdent):
ident = n.sons[1].ident
elif (n.sons[1].kind == nkAccQuoted) and
@ -236,4 +237,4 @@ proc nextOverloadIter(o: var TOverloadIter, c: PContext, n: PNode): PSym =
else:
result = nil
if (result != nil) and (result.kind == skStub): loadStub(result)