Skip to content

Use dedicated runtime functions instead of relying on caml_ml_channels explicitly #54

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dkalinichenko-js merged 2 commits into from
Oct 8, 2024
Merged

Use dedicated runtime functions instead of relying on caml_ml_channels explicitly #54

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f5bab2c
use new jsoo api
Mar 3, 2024
16b1bb0
fix opam
Jun 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions ppx_expect.opam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,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.
Expand Down
19 changes: 8 additions & 11 deletions runtime/runtime.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

Expand Down