progress2

Author: yglukhov

compiler/closureiters.nim

@@ -334,8 +334,8 @@ proc collectExceptState(ctx: var Ctx, n: PNode): PNode {.inline.} =
           assert(c[i].kind == nkType)
           let nextCond = newTreeIT(nkCall, c.info, ctx.g.getSysType(c.info, tyBool),
             newSymNode(g.getSysMagic(c.info, "of", mOf)),
-            ctx.newCurExcAccess(),
-            # g.callCodegenProc("getCurrentException"),
+            # ctx.newCurExcAccess(),
+            g.callCodegenProc("getCurrentException"),
             c[i])
 
           if cond.isNil:
@@ -356,17 +356,17 @@ proc collectExceptState(ctx: var Ctx, n: PNode): PNode {.inline.} =
       ifStmt.add(ifBranch)
 
   if ifStmt.len != 0:
-    let setupExc = newTree(nkCall, newSymNode(ctx.g.getCompilerProc("pushCurrentException")), ctx.newCurExcAccess())
+    # let setupExc = newTree(nkCall, newSymNode(ctx.g.getCompilerProc("pushCurrentException")), ctx.newCurExcAccess())
     # result = newTree(nkStmtList, ctx.newNullifyCurExc(n.info), ifStmt)
-    result = newTree(nkStmtList, setupExc, ifStmt)
+    result = newTree(nkStmtList, ifStmt)
   else:
     result = ctx.g.emptyNode
 
 proc addElseToExcept(ctx: var Ctx, n, gotoOut: PNode) =
   # We should adjust finallyPath to gotoOut if exception is handled
   # if there is no finally node next to this except, gotoOut must be nil
   if n.kind == nkStmtList:
-    if n[1].kind == nkIfStmt and n[1][^1].kind != nkElse:
+    if n[0].kind == nkIfStmt and n[0][^1].kind != nkElse:
       # Not all cases are covered
       let branchBody = newNodeI(nkStmtList, n.info)
 
@@ -385,11 +385,11 @@ proc addElseToExcept(ctx: var Ctx, n, gotoOut: PNode) =
         branchBody.add(newTree(nkGotoState, ctx.curExcLandingState))
 
       let elseBranch = newTree(nkElse, branchBody)
-      n[1].add(elseBranch)
+      n[0].add(elseBranch)
 
     n.add newTree(nkCall,
       newSymNode(ctx.g.getCompilerProc("popCurrentException")))
-
+    n.add(ctx.newNullifyCurExc(n.info))
     if gotoOut != nil:
       n.add(ctx.newFinallyPathAssign(ctx.curFinallyLevel - 1, gotoOut[0], n.info))
 
@@ -1444,9 +1444,17 @@ proc wrapIntoTryExcept(ctx: var Ctx, n: PNode): PNode {.inline.} =
 
   # let tryBody = newTree(nkStmtList, setupExc, n)
   let tryBody = newTree(nkStmtList, n)
-  let exceptBranch = newTree(nkExceptBranch, ctx.newCatchBody(ctx.fn.info))
+  let exceptBody = ctx.newCatchBody(ctx.fn.info)
+  let exceptBranch = newTree(nkExceptBranch, exceptBody)
+
+  result = newTree(nkStmtList)
+  let getCurExc = ctx.g.callCodegenProc("getCurrentException")
+  let tempExc = ctx.newTempVar(getCurExc.typ, result)
+  result.add newTree(nkTryStmt, tryBody, exceptBranch)
+  exceptBody.add ctx.newTempVarAsgn(tempExc, getCurExc)
 
-  result = newTree(nkTryStmt, tryBody, exceptBranch)
+  result.add newTree(nkCall, newSymNode(ctx.g.getCompilerProc("pushCurrentException")), ctx.newTempVarAccess(tempExc))
+  # result = newTree(nkTryStmt, tryBody, exceptBranch)
 
 proc wrapIntoStateLoop(ctx: var Ctx, n: PNode): PNode =
   # while true: