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

xo-interpreter2: streamline setup

Browse source
This commit is contained in:
Roland Conybeare 2026-03-16 14:28:27 -05:00
commit 3303032235
9 changed files with 115 additions and 188 deletions
Download patch file Download diff file Expand all files Collapse all files

27
xo-interpreter2/include/xo/interpreter2/SetupInterpreter2.hpp Normal file
View file

@ -0,0 +1,27 @@
/** @file SetupInterpreter2.hpp
*
* @author Roland Conybeare, Mar 2026
**/
#pragma once
#include "PrimitiveRegistry.hpp"
#include <xo/alloc2/Collector.hpp>
namespace xo {
namespace scm {
struct SetupInterpreter2 {
public:
using ACollector = xo::mm::ACollector;
public:
static bool register_facets();
static bool register_types(obj<ACollector> gc);
static bool register_primitives(obj<ARuntimeContext> rcx,
InstallSink sink,
InstallFlags flags);
};
}
}
/* end SetupInterpreter2.hpp */

15
xo-interpreter2/include/xo/interpreter2/interpreter2_register_facets.hpp
View file

@ -1,15 +0,0 @@
/** @file interpreter2_register_facets.hpp
*
* @author Roland Conybeare, Feb 2026
**/
#pragma once
namespace xo {
namespace scm {
/** Register interpreter2 (facet,impl) combinations with FacetRegistry **/
bool interpreter2_register_facets();
}
}
/* end interpreter2_register_facets.hpp */

22
xo-interpreter2/include/xo/interpreter2/interpreter2_register_primitives.hpp
View file

@ -1,22 +0,0 @@
/** @file interpreter2_register_primitives.hpp
*
* @author Roland Conybeare, Mar 2026
**/
#pragma once
#include "PrimitiveRegistry.hpp"
#include <xo/alloc2/Collector.hpp>
namespace xo {
namespace scm {
/** Register primitive-factories **/
bool interpreter2_register_primitives(obj<ARuntimeContext> rcx,
//xo::mm::AAllocator> gc,
//StringTable * stbl,
InstallSink sink,
InstallFlags flags);
}
}
/* end interpreter2_register_primitives.hpp */

17
xo-interpreter2/include/xo/interpreter2/interpreter2_register_types.hpp
View file

@ -1,17 +0,0 @@
/** @file interpreter2_register_types.hpp
*
* @author Roland Conybeare, Dec 2025
**/
#pragma once
#include <xo/alloc2/Collector.hpp>
namespace xo {
namespace scm {
/** Register interpreter2 (facet,impl) combinations with FacetRegistry **/
bool interpreter2_register_types(obj<xo::mm::ACollector> gc);
}
}
/* end interpreter2_register_types.hpp */

4
xo-interpreter2/src/interpreter2/CMakeLists.txt
View file

@ -3,9 +3,7 @@
set(SELF_LIB xo_interpreter2)
set(SELF_SRCS
init_interpreter2.cpp
interpreter2_register_primitives.cpp
interpreter2_register_facets.cpp
interpreter2_register_types.cpp
SetupInterpreter2.cpp
VirtualSchematikaMachine.cpp
VsmPrimitives.cpp

88
xo-interpreter2/src/interpreter2/interpreter2_register_facets.cpp → xo-interpreter2/src/interpreter2/SetupInterpreter2.cpp
View file

@ -1,10 +1,10 @@
/** @file interpreter2_register_facets.cpp
/** @file SetupInterpreter2.cpp
*
* @author Roland Conybeare, Feb 2026
* @author Roland Conybeare, Mar 2026
**/
#include "interpreter2_register_facets.hpp"
#include "SetupInterpreter2.hpp"
#include "VsmPrimitives.hpp"
#include "DPrimitive_gco_2_gco_gco.hpp"
#include "VsmDefContFrame.hpp"
#include "VsmApplyFrame.hpp"
@ -24,15 +24,77 @@
#include <xo/indentlog/scope.hpp>
namespace xo {
using xo::mm::ACollector;
using xo::mm::AAllocator;
using xo::mm::AGCObject;
using xo::print::APrintable;
using xo::facet::FacetRegistry;
using xo::facet::impl_for;
using xo::reflect::typeseq;
using xo::xtag;
namespace scm {
/** TODO: MOVE THESE install_aux() remplates SOMEWHERE COMMON **/
template <typename PrimitiveRepr>
bool install_aux(InstallSink sink,
PrimitiveRepr * pm,
InstallFlags flags)
{
scope log(XO_DEBUG(true));
if ((flags & InstallFlags::f_generalpurpose) == InstallFlags::f_generalpurpose) {
log && log("create primitive", xtag("name", pm->name()));
return sink(pm->name(),
pm->fn_td(),
obj<AProcedure,PrimitiveRepr>(pm),
flags);
} else {
log && log("skip primitive", xtag("name", pm->name()));
return true;
}
}
template <typename Primitive>
bool install_aux(InstallSink sink,
obj<AAllocator> mm,
std::string_view name,
typename Primitive::FunctionPtrType impl,
InstallFlags flags)
{
if (flags != InstallFlags::f_none) {
auto pm
= Primitive::_make(mm, name, impl);
return install_aux(sink, pm, flags);
} else {
return true;
}
}
bool
interpreter2_register_facets()
SetupInterpreter2::register_primitives(obj<ARuntimeContext> rcx,
InstallSink sink,
InstallFlags flags)
{
scope log(XO_DEBUG(true));
obj<AAllocator> mm = rcx.allocator();
StringTable * stbl = rcx.stringtable();
bool ok = true;
ok = ok & install_aux(sink,
VsmPrimitives::make_report_memory_use_pm(mm, stbl),
flags);
return ok;
}
bool
SetupInterpreter2::register_facets()
{
scope log(XO_DEBUG(true));
@ -101,7 +163,21 @@ namespace xo {
return true;
}
bool
SetupInterpreter2::register_types(obj<ACollector> gc)
{
scope log(XO_DEBUG(true));
bool ok = true;
ok &= gc.install_type(impl_for<AGCObject, DVsmApplyFrame>());
ok &= gc.install_type(impl_for<AGCObject, DVsmEvalArgsFrame>());
return ok;
}
} /*namespace scm*/
} /*namespace xo*/
/* end interpreter2_register_facets.cpp */
/* end SetupInterpreter2.cpp */

16
xo-interpreter2/src/interpreter2/init_interpreter2.cpp
View file

@ -4,28 +4,22 @@
**/
#include "init_interpreter2.hpp"
#include "interpreter2_register_primitives.hpp"
#include "interpreter2_register_facets.hpp"
#include "interpreter2_register_types.hpp"
#include "SetupInterpreter2.hpp"
#include <xo/reader2/init_reader2.hpp>
#include <xo/alloc2/CollectorTypeRegistry.hpp>
namespace xo {
using xo::scm::interpreter2_register_primitives;
using xo::scm::interpreter2_register_facets;
using xo::scm::interpreter2_register_types;
using xo::scm::SetupInterpreter2;
using xo::scm::PrimitiveRegistry;
using xo::mm::CollectorTypeRegistry;
void
InitSubsys<S_interpreter2_tag>::init()
{
interpreter2_register_facets();
CollectorTypeRegistry::instance().register_types(&interpreter2_register_types);
PrimitiveRegistry::instance().register_primitives(&interpreter2_register_primitives);
SetupInterpreter2::register_facets();
CollectorTypeRegistry::instance().register_types(&SetupInterpreter2::register_types);
PrimitiveRegistry::instance().register_primitives(&SetupInterpreter2::register_primitives);
}
InitEvidence

78
xo-interpreter2/src/interpreter2/interpreter2_register_primitives.cpp
View file

@ -1,78 +0,0 @@
/** @file interpreter2_register_primitives.cpp
*
* @author Roland Conybeare, Mar 2026
**/
#include "interpreter2_register_primitives.hpp"
#include "VsmPrimitives.hpp"
namespace xo {
using xo::mm::AAllocator;
namespace scm {
/** TODO: MOVE THESE install_aux() remplates SOMEWHERE COMMON **/
template <typename PrimitiveRepr>
bool install_aux(InstallSink sink,
PrimitiveRepr * pm,
InstallFlags flags)
{
scope log(XO_DEBUG(true));
if ((flags & InstallFlags::f_generalpurpose) == InstallFlags::f_generalpurpose) {
log && log("create primitive", xtag("name", pm->name()));
return sink(pm->name(),
pm->fn_td(),
obj<AProcedure,PrimitiveRepr>(pm),
flags);
} else {
log && log("skip primitive", xtag("name", pm->name()));
return true;
}
}
template <typename Primitive>
bool install_aux(InstallSink sink,
obj<AAllocator> mm,
std::string_view name,
typename Primitive::FunctionPtrType impl,
InstallFlags flags)
{
if (flags != InstallFlags::f_none) {
auto pm
= Primitive::_make(mm, name, impl);
return install_aux(sink, pm, flags);
} else {
return true;
}
}
bool
interpreter2_register_primitives(obj<ARuntimeContext> rcx,
//obj<xo::mm::AAllocator> mm,
//StringTable * stbl,
InstallSink sink,
InstallFlags flags)
{
scope log(XO_DEBUG(true));
obj<AAllocator> mm = rcx.allocator();
StringTable * stbl = rcx.stringtable();
bool ok = true;
ok = ok & install_aux(sink,
VsmPrimitives::make_report_memory_use_pm(mm, stbl),
flags);
return ok;
}
} /*namespace scm*/
} /*namespace xo*/
/* end interpreter2_register_primitives.cpp **/

36
xo-interpreter2/src/interpreter2/interpreter2_register_types.cpp
View file

@ -1,36 +0,0 @@
/** @file interpreter2_register_types.cpp
*
* @author Roland Conybeare, Jan 2026
**/
#include "interpreter2_register_types.hpp"
#include "VsmApplyFrame.hpp"
#include "VsmEvalArgsFrame.hpp"
#include <xo/indentlog/scope.hpp>
namespace xo {
using xo::mm::ACollector;
using xo::mm::AGCObject;
using xo::facet::impl_for;
//using xo::facet::typeseq;
using xo::scope;
namespace scm {
bool
interpreter2_register_types(obj<ACollector> gc)
{
scope log(XO_DEBUG(true));
bool ok = true;
ok &= gc.install_type(impl_for<AGCObject, DVsmApplyFrame>());
ok &= gc.install_type(impl_for<AGCObject, DVsmEvalArgsFrame>());
return ok;
}
}
} /*namespace xo*/
/* end interpreter2_register_types.cpp */