Upgrade throw_continuation to be an escape function (return any).

felix-lang · Dec 30, 2022 · f3b6a43 · f3b6a43
1 parent afce9c6
commit f3b6a43
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 9 deletions.
diff --git a/src/compiler/flx_cpp_backend/flx_gen_exe.ml b/src/compiler/flx_cpp_backend/flx_gen_exe.ml
@@ -182,6 +182,7 @@ print_endline ("gen_exe: " ^ string_of_bexe bsym_table 0 exe);
         in
         let name = cpp_instance_name syms bsym_table index ts in
         if mem `Cfun props then begin
+          (* this code should work for an ESCAPE function too *)
           (if with_comments
           then "      //call cproc " ^ src_str ^ "\n"
           else "") ^
@@ -191,6 +192,16 @@ print_endline ("gen_exe: " ^ string_of_bexe bsym_table 0 exe);
           (*
           print_endline ("[handle_closure] GENERATING STACK CALL for " ^ id);
           *)
+         if is_ehandler then begin
+            let _,argt = a in
+              "      // stack call ESCAPE FUNCTION\n" ^
+              "      {\n" ^
+              subs ^
+              "      " ^ name ^ Flx_gen_display.strd the_display props ^ 
+              "\n      .apply (" ^ args ^ ");\n" ^
+              "      }\n"
+          end else
+
           (if with_comments
           then "      //run procedure " ^ src_str ^ "\n"
           else "") ^
@@ -203,6 +214,15 @@ print_endline ("gen_exe: " ^ string_of_bexe bsym_table 0 exe);
         else
         let ptrmap = name ^ "_ptr_map" in
         begin
+          if is_ehandler then begin
+            let _,argt = a in
+              "      // heap call ESCAPE FUNCTION\n" ^
+              "      {\n" ^
+              subs ^
+              "      (FLX_NEWP(" ^ name ^ ")" ^ Flx_gen_display.strd the_display props ^ ")" ^
+              "\n      ->apply (" ^ args ^ ");\n" ^
+              "      }\n"
+          end else
           match kind with
           | Function ->
 (*
@@ -233,14 +253,6 @@ print_endline ("gen_exe: " ^ string_of_bexe bsym_table 0 exe);
             "      }\n"
 
           | Procedure ->
-            if is_ehandler then begin
-            let _,argt = a in
-              "      {\n" ^
-              subs ^
-              "      (FLX_NEWP(" ^ name ^ ")" ^ Flx_gen_display.strd the_display props ^ ")" ^
-              "\n      ->apply (" ^ args ^ ");\n" ^
-              "      }\n"
-            end else
             let call_string =
               "      return (FLX_NEWP(" ^ name ^ ")" ^ Flx_gen_display.strd the_display props ^ ")" ^
               "\n      ->call(" ^ args ^ ");\n"

diff --git a/src/packages/control.fdoc b/src/packages/control.fdoc
@@ -131,7 +131,7 @@ open class Control
   //$  use a non-local goto, and they cannot pass across
   //$  a function boundary.
 
-  proc throw_continuation(x: unit->void) { _throw (C_hack::cast[cont] x); }
+  fun throw_continuation(x: unit->void) : any { _throw (C_hack::cast[cont] x); }
   private proc _throw: cont = "throw $1;";
 
  }