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

Fixes #3691.

Browse source
This commit is contained in:
Dominik Picheta 2017-02-01 21:11:40 +01:00
commit 3cbfd56e1d
4 changed files with 41 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

24
compiler/semstmts.nim
View file

@ -291,8 +291,16 @@ proc semTry(c: PContext, n: PNode): PNode =
symbolNode = a.sons[j].sons[2]
# Resolve the type ident into a PType.
var typ = semTypeNode(c, typeNode, nil)
if not symbolNode.isNil:
var typ = semTypeNode(c, typeNode, nil).toObject()
if typ.kind != tyObject:
localError(a.sons[j].info, errExprCannotBeRaised)
let newTypeNode = newNodeI(nkType, typeNode.info)
newTypeNode.typ = typ
if symbolNode.isNil:
a.sons[j] = newTypeNode
else:
a.sons[j].sons[1] = newTypeNode
# Add the exception ident to the symbol table.
let symbol = newSymG(skLet, symbolNode, c)
symbol.typ = typ.toRef()
@ -302,18 +310,6 @@ proc semTry(c: PContext, n: PNode): PNode =
symNode.sym = symbol
a.sons[j].sons[2] = symNode
if typ.kind == tyRef: typ = typ.sons[0]
if typ.kind != tyObject:
localError(a.sons[j].info, errExprCannotBeRaised)
let newTypeNode = newNodeI(nkType, typeNode.info)
if symbolNode.isNil:
a.sons[j] = newTypeNode
a.sons[j].typ = typ
else:
a.sons[j].sons[1] = newTypeNode
a.sons[j].sons[1].typ = typ
if containsOrIncl(check, typ.id):
localError(a.sons[j].info, errExceptionAlreadyHandled)
elif a.kind != nkFinally: