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

fixes #10912 (#11317)

Browse source 
* fixes #10912

* update the tutorial examples
This commit is contained in:
Andreas Rumpf 2019-05-24 18:33:53 +02:00 • committed by GitHub
commit ef8ddef47b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 54 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
compiler/cgmeth.nim
View file

@ -56,7 +56,7 @@ proc methodCall*(n: PNode; conf: ConfigRef): PNode =
type
MethodResult = enum No, Invalid, Yes
proc sameMethodBucket(a, b: PSym): MethodResult =
proc sameMethodBucket(a, b: PSym; multiMethods: bool): MethodResult =
if a.name.id != b.name.id: return
if sonsLen(a.typ) != sonsLen(b.typ):
return
@ -75,7 +75,7 @@ proc sameMethodBucket(a, b: PSym): MethodResult =
if sameType(a.typ.sons[i], b.typ.sons[i]):
if aa.kind == tyObject and result != Invalid:
result = Yes
elif aa.kind == tyObject and bb.kind == tyObject:
elif aa.kind == tyObject and bb.kind == tyObject and (i == 1 or multiMethods):
let diff = inheritanceDiff(bb, aa)
if diff < 0:
if result != Invalid:
@ -162,7 +162,7 @@ proc methodDef*(g: ModuleGraph; s: PSym, fromCache: bool) =
var witness: PSym
for i in 0 ..< L:
let disp = g.methods[i].dispatcher
case sameMethodBucket(disp, s)
case sameMethodBucket(disp, s, multimethods = optMultiMethods in g.config.globalOptions)
of Yes:
add(g.methods[i].methods, s)
attachDispatcher(s, disp.ast[dispatcherPos])