Merge pull request #54 from hhugo/jsoo-leak-chan

Use dedicated runtime functions instead of relying on caml_ml_channels explicitly

Author: dkalinichenko-js

ppx_expect.opam

@@ -20,6 +20,10 @@ depends: [
   "ppxlib"          {>= "0.28.0"}
 ]
 available: arch != "arm32" & arch != "x86_32"
+conflicts: [
+  "js_of_ocaml-compiler" {< "5.8"}
+]
+
 synopsis: "Cram like framework for OCaml"
 description: "
 Part of the Jane Street's PPX rewriters collection.

runtime/runtime.js

@@ -4,30 +4,27 @@ var ppx_expect_runtime_saved_stdout
 var ppx_expect_runtime_saved_stderr
 
 //Provides: ppx_expect_runtime_before_test
-//Requires: caml_ml_channels
+//Requires: caml_ml_channel_redirect
 //Requires: ppx_expect_runtime_saved_stderr, ppx_expect_runtime_saved_stdout
 function ppx_expect_runtime_before_test (voutput, vstdout, vstderr){
-  ppx_expect_runtime_saved_stderr = caml_ml_channels[vstderr];
-  ppx_expect_runtime_saved_stdout = caml_ml_channels[vstdout];
-  var output = caml_ml_channels[voutput];
-  caml_ml_channels[vstdout] = output;
-  caml_ml_channels[vstderr] = output;
+  ppx_expect_runtime_saved_stderr = caml_ml_channel_redirect(vstderr, voutput);
+  ppx_expect_runtime_saved_stdout = caml_ml_channel_redirect(vstdout, voutput);
   return 0;
 }
 
 //Provides: ppx_expect_runtime_after_test
-//Requires: caml_ml_channels
+//Requires: caml_ml_channel_restore
 //Requires: ppx_expect_runtime_saved_stderr, ppx_expect_runtime_saved_stdout
 function ppx_expect_runtime_after_test (vstdout, vstderr){
-  caml_ml_channels[vstdout] = ppx_expect_runtime_saved_stdout;
-  caml_ml_channels[vstderr] = ppx_expect_runtime_saved_stderr;
+  caml_ml_channel_restore(vstdout,ppx_expect_runtime_saved_stdout);
+  caml_ml_channel_restore(vstderr,ppx_expect_runtime_saved_stderr);
   return 0;
 }
 
 //Provides: ppx_expect_runtime_out_channel_position
-//Requires: caml_ml_channels
+//Requires: caml_ml_channel_get
 function ppx_expect_runtime_out_channel_position(chan){
-  var info = caml_ml_channels[chan];
+  var info = caml_ml_channel_get(chan);
   return info.offset
 }