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

allowing definitions of procs and templates to be overridden in local scopes

Browse source
This commit is contained in:
Zahary Karadjov 2012-03-14 20:57:13 +02:00
commit d1d5fc8254
3 changed files with 20 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

11
compiler/lookups.nim
View file

@ -164,7 +164,7 @@ proc QualifiedLookUp*(c: PContext, n: PNode, flags = {checkUndeclared}): PSym =
result = nil result = nil
if result != nil and result.kind == skStub: loadStub(result) if result != nil and result.kind == skStub: loadStub(result)
proc InitOverloadIter*(o: var TOverloadIter, c: PContext, n: PNode): PSym = proc InitOverloadIter*(o: var TOverloadIter, c: PContext, n: PNode): PSym =
case n.kind case n.kind
of nkIdent, nkAccQuoted: of nkIdent, nkAccQuoted:
var ident = considerAcc(n) var ident = considerAcc(n)
@ -174,7 +174,7 @@ proc InitOverloadIter*(o: var TOverloadIter, c: PContext, n: PNode): PSym =
dec(o.stackPtr) dec(o.stackPtr)
if o.stackPtr < 0: break if o.stackPtr < 0: break
result = InitIdentIter(o.it, c.tab.stack[o.stackPtr], ident) result = InitIdentIter(o.it, c.tab.stack[o.stackPtr], ident)
of nkSym: of nkSym:
result = n.sym result = n.sym
o.mode = oimDone o.mode = oimDone
of nkDotExpr: of nkDotExpr:
@ -204,6 +204,13 @@ proc InitOverloadIter*(o: var TOverloadIter, c: PContext, n: PNode): PSym =
Incl(o.inSymChoice, result.id) Incl(o.inSymChoice, result.id)
else: nil else: nil
if result != nil and result.kind == skStub: loadStub(result) if result != nil and result.kind == skStub: loadStub(result)
proc lastOverloadScope*(o: TOverloadIter): int =
case o.mode
of oimNoQualifier: result = o.stackPtr
of oimSelfModule: result = ModuleTablePos
of oimOtherModule: result = ImportTablePos
else: result = -1
proc nextOverloadIter*(o: var TOverloadIter, c: PContext, n: PNode): PSym = proc nextOverloadIter*(o: var TOverloadIter, c: PContext, n: PNode): PSym =
case o.mode case o.mode

9
compiler/semcall.nim
View file

@ -36,14 +36,15 @@ proc resolveOverloads(c: PContext, n, orig: PNode,
template best: expr = result template best: expr = result
#Message(n.info, warnUser, renderTree(n)) #Message(n.info, warnUser, renderTree(n))
var sym = initOverloadIter(o, c, f) var sym = initOverloadIter(o, c, f)
var symScope = o.lastOverloadScope
if sym == nil: return if sym == nil: return
initCandidate(best, sym, initialBinding) initCandidate(best, sym, initialBinding, symScope)
initCandidate(alt, sym, initialBinding) initCandidate(alt, sym, initialBinding, symScope)
while sym != nil: while sym != nil:
if sym.kind in filter: if sym.kind in filter:
initCandidate(z, sym, initialBinding) initCandidate(z, sym, initialBinding, o.lastOverloadScope)
z.calleeSym = sym z.calleeSym = sym
matches(c, n, orig, z) matches(c, n, orig, z)
if z.state == csMatch: if z.state == csMatch:

7
compiler/sigmatch.nim
View file

@ -27,6 +27,7 @@ type
state*: TCandidateState state*: TCandidateState
callee*: PType # may not be nil! callee*: PType # may not be nil!
calleeSym*: PSym # may be nil calleeSym*: PSym # may be nil
calleeScope: int # may be -1 for unknown scope
call*: PNode # modified call call*: PNode # modified call
bindings*: TIdTable # maps types to types bindings*: TIdTable # maps types to types
baseTypeMatch: bool # needed for conversions from T to openarray[T] baseTypeMatch: bool # needed for conversions from T to openarray[T]
@ -60,9 +61,10 @@ proc put(t: var TIdTable, key, val: PType) {.inline.} =
IdentEq(val.sym.name, "TTable"): IdentEq(val.sym.name, "TTable"):
assert false assert false
proc initCandidate*(c: var TCandidate, callee: PSym, binding: PNode) = proc initCandidate*(c: var TCandidate, callee: PSym, binding: PNode, calleeScope = -1) =
initCandidateAux(c, callee.typ) initCandidateAux(c, callee.typ)
c.calleeSym = callee c.calleeSym = callee
c.calleeScope = calleeScope
initIdTable(c.bindings) initIdTable(c.bindings)
if binding != nil: if binding != nil:
var typeParams = callee.ast[genericParamsPos] var typeParams = callee.ast[genericParamsPos]
@ -94,6 +96,9 @@ proc cmpCandidates*(a, b: TCandidate): int =
result = a.intConvMatches - b.intConvMatches result = a.intConvMatches - b.intConvMatches
if result != 0: return if result != 0: return
result = a.convMatches - b.convMatches result = a.convMatches - b.convMatches
if result != 0: return
if (a.calleeScope != -1) and (b.calleeScope != -1):
result = a.calleeScope - b.calleeScope
proc writeMatches(c: TCandidate) = proc writeMatches(c: TCandidate) =
Writeln(stdout, "exact matches: " & $c.exactMatches) Writeln(stdout, "exact matches: " & $c.exactMatches)