Fixed forward-return case

Author: PhucVH888

src/back/CodeGen/Expr.hs

@@ -1116,17 +1116,40 @@ instance Translatable A.Expr (State Ctx.Context (CCode Lval, CCode Stat)) where
   translate ret@(A.Return{A.val}) =
       do (nval, tval) <- translate val
          eCtx <- gets Ctx.getExecCtx
+         isAsyncForward <- gets Ctx.isAsyncForward
          let theReturn =
-               case eCtx of
-                 Ctx.FunctionContext fun ->
-                   [dtraceFunctionExit (A.functionName fun), Return nval]
-                 Ctx.MethodContext mdecl ->
-                   [dtraceMethodExit thisVar (A.methodName mdecl), Return nval]
-                 Ctx.ClosureContext clos ->
-                   let ty = (Ty.getResultType $ A.getType clos)
-                   in [dtraceClosureExit,
-                       Return $ asEncoreArgT (translate ty) nval]
-                 _ -> error "Expr.hs: No context to return from"
+              if isAsyncForward then
+                  case eCtx of
+                    Ctx.FunctionContext fun ->
+                      let ty = A.getType fun
+                      in [dtraceFunctionExit (A.functionName fun)
+                          ,Statement $ Call futureFulfil [AsExpr encoreCtxVar, AsExpr futVar
+                                                ,asEncoreArgT (translate ty) nval]
+                          ,Return Skip]
+                    Ctx.MethodContext mdecl ->
+                      let ty = A.getType mdecl
+                      in [dtraceMethodExit thisVar (A.methodName mdecl)
+                          ,Statement $ Call futureFulfil [AsExpr encoreCtxVar, AsExpr futVar
+                                                ,asEncoreArgT (translate ty) nval]
+                          ,Return Skip]
+                    Ctx.ClosureContext clos ->
+                      let ty = (Ty.getResultType $ A.getType clos)
+                      in [dtraceClosureExit
+                          ,Statement $ Call futureFulfil [AsExpr encoreCtxVar, AsExpr futVar
+                                                ,asEncoreArgT (translate ty) nval]
+                          ,Return Skip]
+                    _ -> error "Expr.hs: No context to return from"
+              else
+                  case eCtx of
+                    Ctx.FunctionContext fun ->
+                      [dtraceFunctionExit (A.functionName fun), Return nval]
+                    Ctx.MethodContext mdecl ->
+                      [dtraceMethodExit thisVar (A.methodName mdecl), Return nval]
+                    Ctx.ClosureContext clos ->
+                      let ty = (Ty.getResultType $ A.getType clos)
+                      in [dtraceClosureExit,
+                         Return $ asEncoreArgT (translate ty) nval]
+                    _ -> error "Expr.hs: No context to return from"
          return (unit, Seq $ tval:theReturn)
 
   translate iseos@(A.IsEos{A.target}) =

src/tests/encore/forward/failedPolyTypeStreamWithObject.enc

@@ -3,10 +3,10 @@ active class Main
     if b then
       forward (this ! foo(b))
     else
-      return this.foo(b)
+      return 42
     end
   end
   def main() : unit
-    this.foo(false)
+    println(this.foo(false))
   end
 end

src/tests/encore/forward/forwardReturn.enc

@@ -0,0 +1 @@
+42