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

2
compiler/importer.nim
View file

@ -92,7 +92,7 @@ proc importSymbol(c: PContext, n: PNode, fromMod: PSym) =
rawImportSymbol(c, e) rawImportSymbol(c, e)
e = nextIdentIter(it, fromMod.tab) e = nextIdentIter(it, fromMod.tab)
else: rawImportSymbol(c, s) else: rawImportSymbol(c, s)
suggestSym(c.config, n.info, s, c.graph.usageSym, false) suggestSym(c.config, n.info, s, c.graph.usageSym, false)
proc importAllSymbolsExcept(c: PContext, fromMod: PSym, exceptSet: IntSet) = proc importAllSymbolsExcept(c: PContext, fromMod: PSym, exceptSet: IntSet) =
var i: TTabIter var i: TTabIter

2
compiler/semtypes.nim
View file

@ -1035,7 +1035,7 @@ proc liftParamType(c: PContext, procKind: TSymKind, genericParams: PNode,
if lifted != nil: paramType.sons[i] = lifted if lifted != nil: paramType.sons[i] = lifted
let body = paramType.base let body = paramType.base
if body.kind == tyForward: if body.kind in {tyForward, tyError}:
# this may happen for proc type appearing in a type section # this may happen for proc type appearing in a type section
# before one of its param types # before one of its param types
return return

6
compiler/semtypinst.nim
View file

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

1
compiler/types.nim
View file

@ -123,6 +123,7 @@ proc elemType*(t: PType): PType =
case t.kind case t.kind
of tyGenericInst, tyDistinct, tyAlias, tySink: result = elemType(lastSon(t)) of tyGenericInst, tyDistinct, tyAlias, tySink: result = elemType(lastSon(t))
of tyArray: result = t.sons[1] of tyArray: result = t.sons[1]
of tyError: result = t
else: result = t.lastSon else: result = t.lastSon
assert(result != nil) assert(result != nil)