roland/xo-alloc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

bugfix: destructor ordering for VirtualSchematikaMachine

Browse source
This commit is contained in:
Roland Conybeare 2025-11-25 13:28:33 -05:00
commit 2bffef29d5
1 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

14
xo-interpreter/src/interpreter/Schematika.cpp
View file

@ -29,8 +29,9 @@ namespace xo {
**/
Impl(const Config & config, up<IAlloc> mm, gp<Env> toplevel_env) :
config_{config},
vsm_{mm.get(), toplevel_env, config.vsm_log_level_},
mm_{std::move(mm)} {}
mm_{std::move(mm)},
vsm_{mm_.get(), toplevel_env, config.vsm_log_level_} {}
~Impl();
/** create instance + allocator **/
static up<Impl> make(const Config & cfg);
@ -50,15 +51,19 @@ namespace xo {
private:
/** configuration **/
Config config_;
/** schematika interpreter **/
VirtualSchematikaMachine vsm_;
/** ownership for memory allocator / garbage collector;
* @ref vsm_ holds naked pointer, so this could in principle be nullptr
* in case want to maintain allocator ownership from outside.
*
* note: must appear before @ref vsm_, so latter gets destroyed first
**/
up<IAlloc> mm_;
/** schematika interpreter **/
VirtualSchematikaMachine vsm_;
};
Schematika::Impl::~Impl() = default;
up<Schematika::Impl>
Schematika::Impl::make(const Config & cfg)
{
@ -218,6 +223,7 @@ namespace xo {
/* here: input.empty() or error encountered */
cerr << endl;
}
auto [expr, _1, _2, error] = rdr.read_expr(input, true /*eof*/);