Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ on:
jobs:
emscripten_wasm:

runs-on: ubuntu-20.04
runs-on: ubuntu-22.04

strategy:
fail-fast: false
Expand Down
23 changes: 16 additions & 7 deletions include/xeus-lite/xembind.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -40,17 +40,26 @@ namespace xeus

xeus::xserver * get_server(xeus::xkernel * kernel);

template<class interpreter_type>
std::unique_ptr<xkernel> make_xkernel()
template <class interpreter_type>
using builder_type = interpreter_type* (*)(ems::val);

template <class interpreter_type>
interpreter_type* default_builder(ems::val)
{
return new interpreter_type();
}

template<class interpreter_type, builder_type<interpreter_type> builder>
std::unique_ptr<xkernel> make_xkernel(ems::val js_argv)
{
xeus::xconfiguration config;

using history_manager_ptr = std::unique_ptr<xeus::xhistory_manager>;
history_manager_ptr hist = xeus::make_in_memory_history_manager();

using interpreter_ptr = std::unique_ptr<interpreter_type>;

auto interpreter = interpreter_ptr(new interpreter_type());
std::unique_ptr<interpreter_type> interpreter;
interpreter.reset((*builder)(js_argv));

auto context = std::make_unique<xeus::xcontext_impl<empty_context_tag>>();

xeus::xkernel * kernel = new xeus::xkernel(config,
Expand All @@ -64,11 +73,11 @@ namespace xeus
return std::unique_ptr<xkernel>{kernel};
}

template<class interpreter_type>
template<class interpreter_type, builder_type<interpreter_type> builder = &default_builder<interpreter_type>>
void export_kernel(const std::string kernel_name)
{
ems::class_<xkernel>(kernel_name.c_str())
.constructor<>(&make_xkernel<interpreter_type>)
.constructor<>(&make_xkernel<interpreter_type, builder>)
.function("get_server", &get_server, ems::allow_raw_pointers())
.function("start", &xkernel::start)
;
Expand Down
6 changes: 4 additions & 2 deletions test/test_wasm.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ global.self = {
}

function test_start_kernel(Module) {
raw_xkernel = new Module.xkernel();
const argv = ["xtest_kernel"];
raw_xkernel = new Module.xkernel(argv);
var raw_xserver = raw_xkernel.get_server();
raw_xkernel.start()
}
Expand Down Expand Up @@ -48,7 +49,8 @@ function test_buffer_sequence_js_to_cpp(XeusModule) {
}

function test_notify_listener(Module) {
raw_xkernel = new Module.xkernel();
const argv = ["xtest_kernel"];
raw_xkernel = new Module.xkernel(argv);
var raw_xserver = raw_xkernel.get_server();
raw_xkernel.start()

Expand Down