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

make tests green again

Browse source
This commit is contained in:
Andreas Rumpf 2016-07-29 01:56:32 +02:00
commit 953a5eb644
1 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
compiler/semstmts.nim
View file

@ -1355,11 +1355,13 @@ proc semMethod(c: PContext, n: PNode): PNode =
if isGenericRoutine(s): if isGenericRoutine(s):
let tt = s.typ let tt = s.typ
var foundObj = false var foundObj = false
for col in countup(0, sonsLen(tt)-1): # we start at 1 for now so that tparsecombnum continues to compile.
# XXX Revisit this problem later.
for col in countup(1, sonsLen(tt)-1):
let t = tt.sons[col] let t = tt.sons[col]
if t != nil and t.kind == tyGenericInvocation: if t != nil and t.kind == tyGenericInvocation:
var x = skipTypes(t.sons[0], {tyVar, tyPtr, tyRef, tyGenericInst, tyGenericInvocation, tyGenericBody}) var x = skipTypes(t.sons[0], {tyVar, tyPtr, tyRef, tyGenericInst, tyGenericInvocation, tyGenericBody})
if x.kind == tyObject: if x.kind == tyObject and t.len-1 == result.sons[genericParamsPos].len:
foundObj = true foundObj = true
x.methods.safeAdd((col,s)) x.methods.safeAdd((col,s))
if not foundObj: if not foundObj: