Set xeus interpreter inside the constructor

jupyter-xeus · Jan 4, 2023 · 38591a9 · 38591a9
1 parent 6415d5f
commit 38591a9
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 1 deletion.
diff --git a/include/xeus-octave/xinterpreter.hpp b/include/xeus-octave/xinterpreter.hpp
@@ -39,6 +39,11 @@ class xoctave_interpreter : public xeus::xinterpreter
 
   octave::interpreter interpreter;
 
+public:
+
+  xoctave_interpreter();
+  virtual ~xoctave_interpreter() = default;
+
 private:
 
   void configure_impl() override;

diff --git a/src/main.cpp b/src/main.cpp
@@ -53,7 +53,6 @@ int main(int argc, char* argv[])
 #endif
 
   auto interpreter = xeus::xkernel::interpreter_ptr(new xeus_octave::xoctave_interpreter());
-  xeus::register_interpreter(interpreter.get());
   auto config = xeus::load_configuration(xeus::extract_filename(argc, argv));
   std::cout << xeus::print_starting_message(config);
 

diff --git a/src/xinterpreter.cpp b/src/xinterpreter.cpp
@@ -95,6 +95,11 @@ void register_all(octave::interpreter& interpreter)
 
 }  // namespace interpreter
 
+xoctave_interpreter::xoctave_interpreter()
+{
+  xeus::register_interpreter(this);
+}
+
 void xoctave_interpreter::publish_stream(std::string const& name, std::string const& text)
 {
   if (!m_silent)