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

Merge branch 'Fixes-7845' of https://github.com/cooldome/Nim into cooldome-Fixes-7845

Browse source
This commit is contained in:
Araq 2018-10-15 11:50:12 +02:00
commit bf01d7136e
3 changed files with 23 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

5
compiler/semstmts.nim
View file

@ -823,9 +823,10 @@ proc semRaise(c: PContext, n: PNode): PNode =
checkSonsLen(n, 1, c.config)
if n[0].kind != nkEmpty:
n[0] = semExprWithType(c, n[0])
let typ = n[0].typ
var typ = n[0].typ
if not isImportedException(typ, c.config):
if typ.kind != tyRef or typ.lastSon.kind != tyObject:
typ = typ.skipTypes({tyAlias, tyGenericInst})
if typ.kind != tyRef:
localError(c.config, n.info, errExprCannotBeRaised)
if typ.len > 0 and not isException(typ.lastSon):
localError(c.config, n.info, "raised object of type $1 does not inherit from Exception",