This commit is contained in:
Andreas Rumpf
2019-05-23 19:32:44 +02:00
committed by GitHub
parent 44cc5f6360
commit aa4cf92ae8
2 changed files with 38 additions and 0 deletions

View File

@@ -357,6 +357,16 @@ proc genObjectInit(p: BProc, section: TCProcSection, t: PType, a: TLoc,
var r = if takeAddr: addrLoc(p.config, a) else: rdLoc(a)
linefmt(p, section, "#objectInit($1, $2);$n", [r, genTypeInfo(p.module, t, a.lode.info)])
if isException(t):
var r = rdLoc(a)
if not takeAddr: r = "(*$1)" % [r]
var s = skipTypes(t, abstractInst)
if not p.module.compileToCpp:
while s.kind == tyObject and s.sons[0] != nil and s.sym.magic != mException:
add(r, ".Sup")
s = skipTypes(s.sons[0], skipPtrs)
linefmt(p, section, "$1.name = $2;$n", [r, makeCString(t.skipTypes(abstractInst).sym.name.s)])
type
TAssignmentFlag = enum
needToCopy

View File

@@ -0,0 +1,28 @@
discard """
outputsub: "CustomChildError"
exitcode: 1
"""
type
CustomError* = object of Exception
CustomChildError* = object of CustomError
FutureBase* = ref object of RootObj
error*: ref Exception
Future*[T] = ref object of FutureBase
v: T
proc fail[T](future: Future[T], error: ref Exception) =
future.error = error
proc w1(): Future[int] =
result = Future[int]()
result.fail(newException(CustomChildError, "abc"))
proc main =
var fut = w1()
if true:
raise fut.error
main()