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

Fix 105, few fixes for 101 (#11148)

Browse source
This commit is contained in:
genotrance 2019-05-04 15:38:52 -05:00 • committed by Andreas Rumpf
commit 45759b5e90
4 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
compiler/semtypinst.nim
View file

@ -63,11 +63,10 @@ proc cacheTypeInst*(inst: PType) =
# update the refcount
let gt = inst.sons[0]
let t = if gt.kind == tyGenericBody: gt.lastSon else: gt
if t.kind in {tyStatic, tyGenericParam} + tyTypeClasses:
if t.kind in {tyStatic, tyError, tyGenericParam} + tyTypeClasses:
return
gt.sym.typeInstCache.add(inst)
type
LayeredIdTable* = object
topLayer*: TIdTable
@ -363,6 +362,9 @@ proc handleGenericInvocation(cl: var TReplTypeVars, t: PType): PType =
# but we already raised an error!
rawAddSon(result, header.sons[i])
if body.kind == tyError:
return
let bbody = lastSon body
var newbody = replaceTypeVarsT(cl, bbody)
let bodyIsNew = newbody != bbody