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

fixes #8740

Browse source
This commit is contained in:
Araq 2018-09-03 09:06:52 +02:00
commit cfbf9dcc59
2 changed files with 16 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
compiler/vm.nim
View file

@ -273,7 +273,7 @@ proc cleanUpOnException(c: PCtx; tos: PStackFrame):
abstractPtrs) abstractPtrs)
else: nil else: nil
#echo typeToString(exceptType), " ", typeToString(raisedType) #echo typeToString(exceptType), " ", typeToString(raisedType)
if exceptType.isNil or inheritanceDiff(exceptType, raisedType) <= 0: if exceptType.isNil or inheritanceDiff(raisedType, exceptType) <= 0:
# mark exception as handled but keep it in B for # mark exception as handled but keep it in B for
# the getCurrentException() builtin: # the getCurrentException() builtin:
c.currentExceptionB = c.currentExceptionA c.currentExceptionB = c.currentExceptionA

15
tests/vm/trgba.nim → tests/vm/tmisc_vm.nim
View file

@ -2,6 +2,8 @@ discard """
output: '''[127, 127, 0, 255] output: '''[127, 127, 0, 255]
[127, 127, 0, 255] [127, 127, 0, 255]
''' '''
nimout: '''caught Exception'''
""" """
#bug #1009 #bug #1009
@ -34,3 +36,16 @@ proc ABGR*(val: int| int64): TAggRgba8 =
const const
c1 = ABGR(0xFF007F7F) c1 = ABGR(0xFF007F7F)
echo ABGR(0xFF007F7F).repr, c1.repr echo ABGR(0xFF007F7F).repr, c1.repr
# bug 8740
static:
try:
raise newException(ValueError, "foo")
except Exception:
echo "caught Exception"
except Defect:
echo "caught Defect"
except ValueError:
echo "caught ValueError"