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

xo-interpreter2 stack: work on VSM for apply -> closure action [WIP]

Browse source
This commit is contained in:
Roland Conybeare 2026-02-08 01:01:03 -05:00
commit 82c82ea332
21 changed files with 508 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

42
CMakeLists.txt
View file

@ -81,14 +81,52 @@ xo_add_genfacetimpl(
xo_add_genfacetimpl(
TARGET xo-interpreter2-facetimpl-procedure-closure
FACET_PKG xo_procedure2
FACET Printable
REPR DClosure
FACET Procedure
REPR Closure
INPUT idl/IProcedure_DClosure.json5
OUTPUT_HPP_DIR include/xo/interpreter2
OUTPUT_IMPL_SUBDIR detail
OUTPUT_CPP_DIR src/interpreter2
)
# note: manual target; generated code committed to git
xo_add_genfacetimpl(
TARGET xo-interpreter2-facetimpl-gcobject-closure
FACET_PKG xo_gc
FACET GCObject
REPR Closure
INPUT idl/IGCObject_DClosure.json5
OUTPUT_HPP_DIR include/xo/interpreter2
OUTPUT_IMPL_SUBDIR detail
OUTPUT_CPP_DIR src/interpreter2
)
# note: manual target; generated code committed to git
xo_add_genfacetimpl(
TARGET xo-interpreter2-facetimpl-printable-closure
FACET_PKG xo_printable2
FACET Printable
REPR Closure
INPUT idl/IPrintable_DClosure.json5
OUTPUT_HPP_DIR include/xo/interpreter2
OUTPUT_IMPL_SUBDIR detail
OUTPUT_CPP_DIR src/interpreter2
)
# ----------------------------------------------------------------
# note: manual target; generated code committed to git
xo_add_genfacetimpl(
TARGET xo-interpreter2-facetimpl-gcobject-localenv
FACET_PKG xo_gc
FACET GCObject
REPR LocalEnv
INPUT idl/IGCObject_DLocalEnv.json5
OUTPUT_HPP_DIR include/xo/interpreter2
OUTPUT_IMPL_SUBDIR detail
OUTPUT_CPP_DIR src/interpreter2
)
# ----------------------------------------------------------------
xo_add_genfacet_all(xo-interpreter2-genfacet-all)

15
idl/IGCObject_DClosure.json5 Normal file
View file

@ -0,0 +1,15 @@
{
mode: "implementation",
includes: [
"<xo/gc/GCObject.hpp>",
"<xo/alloc2/Allocator.hpp>"
],
local_types: [ ],
namespace1: "xo",
namespace2: "scm",
facet_idl: "idl/GCObject.json5",
brief: "provide AGCObject interface for Closure",
using_doxygen: true,
repr: "DClosure",
doc: [ "implement AGCObject for DClosure" ],
}

15
idl/IGCObject_DLocalEnv.json5 Normal file
View file

@ -0,0 +1,15 @@
{
mode: "implementation",
includes: [
"<xo/gc/GCObject.hpp>",
"<xo/alloc2/Allocator.hpp>"
],
local_types: [ ],
namespace1: "xo",
namespace2: "scm",
facet_idl: "idl/GCObject.json5",
brief: "provide AGCObject interface for LocalEnv",
using_doxygen: true,
repr: "DLocalEnv",
doc: [ "implement AGCObject for DLocalEnv" ],
}

13
idl/IPrintable_DClosure.json5 Normal file
View file

@ -0,0 +1,13 @@
{
mode: "implementation",
includes: [ "<xo/printable2/Printable.hpp>",
"<xo/printable2/detail/IPrintable_Xfer.hpp>" ],
local_types: [ ],
namespace1: "xo",
namespace2: "scm",
facet_idl: "idl/Printable.json5",
brief: "provide APrintable interface for DClosure",
using_doxygen: true,
repr: "DClosure",
doc: [ "implement APrintable for DClosure" ],
}

2
include/xo/interpreter2/Closure.hpp
View file

@ -7,5 +7,7 @@
#include "DClosure.hpp"
#include "detail/IProcedure_DClosure.hpp"
#include "detail/IGCObject_DClosure.hpp"
#include "detail/IPrintable_DClosure.hpp"
/* end Closure.hpp */

5
include/xo/interpreter2/DClosure.hpp
View file

@ -19,6 +19,7 @@ namespace xo {
class DClosure {
public:
using ARuntimeContext = xo::scm::ARuntimeContext;
using ACollector = xo::mm::ACollector;
using AAllocator = xo::mm::AAllocator;
using AGCObject = xo::mm::AGCObject;
using ppindentinfo = xo::print::ppindentinfo;
@ -56,6 +57,10 @@ namespace xo {
/** @defgroup scm-closure-gcobject-facet **/
///@{
std::size_t shallow_size() const noexcept;
DClosure * shallow_copy(obj<AAllocator> mm) const noexcept;
std::size_t forward_children(obj<ACollector> gc) noexcept;
///@}
/** @defgroup scm-closure-printable-facet **/
///@{

6
include/xo/interpreter2/DGlobalEnv.hpp
View file

@ -7,6 +7,7 @@
#include <xo/expression2/DGlobalSymtab.hpp>
#include <xo/object2/DList.hpp>
#include <xo/object2/DArray.hpp>
namespace xo {
namespace scm {
@ -16,9 +17,10 @@ namespace xo {
**/
class DGlobalEnv {
public:
DGLobalEnv() = default;
DGlobalEnv() = default;
protected: // temporary, to appease compiler
private:
// absurd O(n) implementation for now
// replace with gc-aware hashtable, when available.

11
include/xo/interpreter2/DLocalEnv.hpp
View file

@ -16,6 +16,7 @@ namespace xo {
class DLocalEnv {
public:
using DArray = xo::scm::DArray;
using ACollector = xo::mm::ACollector;
using AAllocator = xo::mm::AAllocator;
using AGCObject = xo::mm::AGCObject;
using ppindentinfo = xo::print::ppindentinfo;
@ -49,6 +50,14 @@ namespace xo {
void assign_value(Binding ix, obj<AGCObject> x);
///@}
/** @defgroup scm-localenv-gcobject-facet **/
///@{
std::size_t shallow_size() const noexcept;
DLocalEnv * shallow_copy(obj<AAllocator> mm) const noexcept;
std::size_t forward_children(obj<ACollector> gc) noexcept;
///@}
private:
/** parent environment (from closure) **/
@ -58,7 +67,7 @@ namespace xo {
/** bindings.
* (*args)[i] associates a value with symtab->slots_[i]
**/
DArray * args_ = nullptr;;
DArray * args_ = nullptr;
};
} /*namespace scm*/

2
include/xo/interpreter2/LocalEnv.hpp
View file

@ -6,7 +6,7 @@
#pragma once
#include "DLocalEnv.hpp"
//#include "detail/IGCObject_DLocalEnv.hpp"
#include "detail/IGCObject_DLocalEnv.hpp"
//#include "detail/IPrintable_DLocalEnv.hpp"
/* end LocalEnv.hpp */

4
include/xo/interpreter2/VirtualSchematikaMachine.hpp
View file

@ -8,6 +8,8 @@
#include "VsmConfig.hpp"
#include "VsmInstr.hpp"
#include "VsmFrame.hpp"
#include "DLocalEnv.hpp"
#include "DGlobalEnv.hpp"
#include <xo/reader2/SchematikaReader.hpp>
#include <xo/expression2/Expression.hpp>
#include <xo/gc/GCObject.hpp>
@ -214,11 +216,13 @@ namespace xo {
* in execution
**/
DLocalEnv * local_env_ = nullptr;
protected: // temporarily, to appease compiler
/** environment pointer. Maintains bindings
* for global variables.
**/
DGlobalEnv * global_env_ = nullptr;
private:
/** function to call **/
obj<AProcedure> fn_;
/** evaluated argument list **/

67
include/xo/interpreter2/detail/IGCObject_DClosure.hpp Normal file
View file

@ -0,0 +1,67 @@
/** @file IGCObject_DClosure.hpp
*
* Generated automagically from ingredients:
* 1. code generator:
* [xo-facet/codegen/genfacet]
* arguments:
* --input [idl/IGCObject_DClosure.json5]
* 2. jinja2 template for abstract facet .hpp file:
* [iface_facet_repr.hpp.j2]
* 3. idl for facet methods
* [idl/IGCObject_DClosure.json5]
**/
#pragma once
#include "GCObject.hpp"
#include <xo/gc/GCObject.hpp>
#include <xo/alloc2/Allocator.hpp>
#include "DClosure.hpp"
namespace xo { namespace scm { class IGCObject_DClosure; } }
namespace xo {
namespace facet {
template <>
struct FacetImplementation<xo::mm::AGCObject,
xo::scm::DClosure>
{
using ImplType = xo::mm::IGCObject_Xfer
<xo::scm::DClosure,
xo::scm::IGCObject_DClosure>;
};
}
}
namespace xo {
namespace scm {
/** @class IGCObject_DClosure
**/
class IGCObject_DClosure {
public:
/** @defgroup scm-gcobject-dclosure-type-traits **/
///@{
using size_type = xo::mm::AGCObject::size_type;
using AAllocator = xo::mm::AGCObject::AAllocator;
using ACollector = xo::mm::AGCObject::ACollector;
using Copaque = xo::mm::AGCObject::Copaque;
using Opaque = xo::mm::AGCObject::Opaque;
///@}
/** @defgroup scm-gcobject-dclosure-methods **/
///@{
// const methods
/** memory consumption for this instance **/
static size_type shallow_size(const DClosure & self) noexcept;
/** copy instance using allocator **/
static Opaque shallow_copy(const DClosure & self, obj<AAllocator> mm) noexcept;
// non-const methods
/** during GC: forward immdiate children **/
static size_type forward_children(DClosure & self, obj<ACollector> gc) noexcept;
///@}
};
} /*namespace scm*/
} /*namespace xo*/
/* end */

67
include/xo/interpreter2/detail/IGCObject_DLocalEnv.hpp Normal file
View file

@ -0,0 +1,67 @@
/** @file IGCObject_DLocalEnv.hpp
*
* Generated automagically from ingredients:
* 1. code generator:
* [xo-facet/codegen/genfacet]
* arguments:
* --input [idl/IGCObject_DLocalEnv.json5]
* 2. jinja2 template for abstract facet .hpp file:
* [iface_facet_repr.hpp.j2]
* 3. idl for facet methods
* [idl/IGCObject_DLocalEnv.json5]
**/
#pragma once
#include "GCObject.hpp"
#include <xo/gc/GCObject.hpp>
#include <xo/alloc2/Allocator.hpp>
#include "DLocalEnv.hpp"
namespace xo { namespace scm { class IGCObject_DLocalEnv; } }
namespace xo {
namespace facet {
template <>
struct FacetImplementation<xo::mm::AGCObject,
xo::scm::DLocalEnv>
{
using ImplType = xo::mm::IGCObject_Xfer
<xo::scm::DLocalEnv,
xo::scm::IGCObject_DLocalEnv>;
};
}
}
namespace xo {
namespace scm {
/** @class IGCObject_DLocalEnv
**/
class IGCObject_DLocalEnv {
public:
/** @defgroup scm-gcobject-dlocalenv-type-traits **/
///@{
using size_type = xo::mm::AGCObject::size_type;
using AAllocator = xo::mm::AGCObject::AAllocator;
using ACollector = xo::mm::AGCObject::ACollector;
using Copaque = xo::mm::AGCObject::Copaque;
using Opaque = xo::mm::AGCObject::Opaque;
///@}
/** @defgroup scm-gcobject-dlocalenv-methods **/
///@{
// const methods
/** memory consumption for this instance **/
static size_type shallow_size(const DLocalEnv & self) noexcept;
/** copy instance using allocator **/
static Opaque shallow_copy(const DLocalEnv & self, obj<AAllocator> mm) noexcept;
// non-const methods
/** during GC: forward immdiate children **/
static size_type forward_children(DLocalEnv & self, obj<ACollector> gc) noexcept;
///@}
};
} /*namespace scm*/
} /*namespace xo*/
/* end */

62
include/xo/interpreter2/detail/IPrintable_DClosure.hpp Normal file
View file

@ -0,0 +1,62 @@
/** @file IPrintable_DClosure.hpp
*
* Generated automagically from ingredients:
* 1. code generator:
* [xo-facet/codegen/genfacet]
* arguments:
* --input [idl/IPrintable_DClosure.json5]
* 2. jinja2 template for abstract facet .hpp file:
* [iface_facet_repr.hpp.j2]
* 3. idl for facet methods
* [idl/IPrintable_DClosure.json5]
**/
#pragma once
#include "Printable.hpp"
#include <xo/printable2/Printable.hpp>
#include <xo/printable2/detail/IPrintable_Xfer.hpp>
#include "DClosure.hpp"
namespace xo { namespace scm { class IPrintable_DClosure; } }
namespace xo {
namespace facet {
template <>
struct FacetImplementation<xo::print::APrintable,
xo::scm::DClosure>
{
using ImplType = xo::print::IPrintable_Xfer
<xo::scm::DClosure,
xo::scm::IPrintable_DClosure>;
};
}
}
namespace xo {
namespace scm {
/** @class IPrintable_DClosure
**/
class IPrintable_DClosure {
public:
/** @defgroup scm-printable-dclosure-type-traits **/
///@{
using ppindentinfo = xo::print::APrintable::ppindentinfo;
using Copaque = xo::print::APrintable::Copaque;
using Opaque = xo::print::APrintable::Opaque;
///@}
/** @defgroup scm-printable-dclosure-methods **/
///@{
// const methods
/** Pretty-printing support for this object.
See [xo-indentlog/xo/indentlog/pretty.hpp] **/
static bool pretty(const DClosure & self, const ppindentinfo & ppii);
// non-const methods
///@}
};
} /*namespace scm*/
} /*namespace xo*/
/* end */

7
src/interpreter2/CMakeLists.txt
View file

@ -16,12 +16,15 @@ set(SELF_SRCS
IGCObject_DVsmApplyFrame.cpp
IPrintable_DVsmApplyFrame.cpp
DClosure.cpp
IGCObject_DClosure.cpp
IProcedure_DClosure.cpp
IGCObject_DLocalEnv.cpp
DLocalEnv.cpp
VsmInstr.cpp
DClosure.cpp
DLocalEnv.cpp
#IExpression_Any.cpp
)

36
src/interpreter2/DClosure.cpp
View file

@ -3,7 +3,10 @@
* @author Roland Conybeare, Feb 2026
**/
#include "DClosure.hpp"
#include "Closure.hpp"
#include "LambdaExpr.hpp"
#include "LocalEnv.hpp"
#include <cstddef>
namespace xo {
using xo::mm::AGCObject;
@ -35,6 +38,37 @@ namespace xo {
assert(false);
}
size_t
DClosure::shallow_size() const noexcept {
return sizeof(DClosure);
}
DClosure *
DClosure::shallow_copy(obj<AAllocator> mm) const noexcept {
DClosure * copy = (DClosure *)mm.alloc_copy((std::byte *)this);
if (copy)
*copy = *this;
return copy;
}
std::size_t
DClosure::forward_children(obj<ACollector> gc) noexcept
{
{
auto iface = xo::facet::impl_for<AGCObject,DLambdaExpr>();
gc.forward_inplace(&iface, (void **)(&lambda_));
}
{
auto iface = xo::facet::impl_for<AGCObject,DLocalEnv>();
gc.forward_inplace(&iface, (void **)(&env_));
}
return shallow_size();
}
} /*namespace scm*/
} /*namespace xo*/

37
src/interpreter2/DLocalEnv.cpp
View file

@ -3,7 +3,8 @@
* @author Roland Conybeare, Feb 2026
**/
#include "DLocalEnv.hpp"
#include "LocalEnv.hpp"
#include <xo/object2/Array.hpp>
#include <xo/reflectutil/typeseq.hpp>
namespace xo {
@ -86,6 +87,40 @@ namespace xo {
/* something terribly wrong if control here */
}
std::size_t
DLocalEnv::shallow_size() const noexcept {
return sizeof(DLocalEnv);
}
DLocalEnv *
DLocalEnv::shallow_copy(obj<AAllocator> mm) const noexcept {
DLocalEnv * copy = (DLocalEnv *)mm.alloc_copy((std::byte *)this);
if (copy)
*copy = *this;
return copy;
}
std::size_t
DLocalEnv::forward_children(obj<ACollector> gc) noexcept
{
{
auto iface = xo::facet::impl_for<AGCObject,DLocalEnv>();
gc.forward_inplace(&iface, (void **)(&parent_));
}
{
auto iface = xo::facet::impl_for<AGCObject,DLocalSymtab>();
gc.forward_inplace(&iface, (void **)(&symtab_));
}
{
auto iface = xo::facet::impl_for<AGCObject,DArray>();
gc.forward_inplace(&iface, (void **)(&args_));
}
return shallow_size();
}
} /*namespace scm*/
} /*namespace xo*/

39
src/interpreter2/IGCObject_DClosure.cpp Normal file
View file

@ -0,0 +1,39 @@
/** @file IGCObject_DClosure.cpp
*
* Generated automagically from ingredients:
* 1. code generator:
* [xo-facet/codegen/genfacet]
* arguments:
* --input [idl/IGCObject_DClosure.json5]
* 2. jinja2 template for abstract facet .hpp file:
* [iface_facet_any.hpp.j2]
* 3. idl for facet methods
* [idl/IGCObject_DClosure.json5]
**/
#include "detail/IGCObject_DClosure.hpp"
namespace xo {
namespace scm {
auto
IGCObject_DClosure::shallow_size(const DClosure & self) noexcept -> size_type
{
return self.shallow_size();
}
auto
IGCObject_DClosure::shallow_copy(const DClosure & self, obj<AAllocator> mm) noexcept -> Opaque
{
return self.shallow_copy(mm);
}
auto
IGCObject_DClosure::forward_children(DClosure & self, obj<ACollector> gc) noexcept -> size_type
{
return self.forward_children(gc);
}
} /*namespace scm*/
} /*namespace xo*/
/* end IGCObject_DClosure.cpp */

39
src/interpreter2/IGCObject_DLocalEnv.cpp Normal file
View file

@ -0,0 +1,39 @@
/** @file IGCObject_DLocalEnv.cpp
*
* Generated automagically from ingredients:
* 1. code generator:
* [xo-facet/codegen/genfacet]
* arguments:
* --input [idl/IGCObject_DLocalEnv.json5]
* 2. jinja2 template for abstract facet .hpp file:
* [iface_facet_any.hpp.j2]
* 3. idl for facet methods
* [idl/IGCObject_DLocalEnv.json5]
**/
#include "detail/IGCObject_DLocalEnv.hpp"
namespace xo {
namespace scm {
auto
IGCObject_DLocalEnv::shallow_size(const DLocalEnv & self) noexcept -> size_type
{
return self.shallow_size();
}
auto
IGCObject_DLocalEnv::shallow_copy(const DLocalEnv & self, obj<AAllocator> mm) noexcept -> Opaque
{
return self.shallow_copy(mm);
}
auto
IGCObject_DLocalEnv::forward_children(DLocalEnv & self, obj<ACollector> gc) noexcept -> size_type
{
return self.forward_children(gc);
}
} /*namespace scm*/
} /*namespace xo*/
/* end IGCObject_DLocalEnv.cpp */

28
src/interpreter2/IPrintable_DClosure.cpp Normal file
View file

@ -0,0 +1,28 @@
/** @file IPrintable_DClosure.cpp
*
* Generated automagically from ingredients:
* 1. code generator:
* [xo-facet/codegen/genfacet]
* arguments:
* --input [idl/IPrintable_DClosure.json5]
* 2. jinja2 template for abstract facet .hpp file:
* [iface_facet_any.hpp.j2]
* 3. idl for facet methods
* [idl/IPrintable_DClosure.json5]
**/
#include "detail/IPrintable_DClosure.hpp"
namespace xo {
namespace scm {
auto
IPrintable_DClosure::pretty(const DClosure & self, const ppindentinfo & ppii) -> bool
{
return self.pretty(ppii);
}
} /*namespace scm*/
} /*namespace xo*/
/* end IPrintable_DClosure.cpp */

21
src/interpreter2/VirtualSchematikaMachine.cpp
View file

@ -6,7 +6,9 @@
#include "VirtualSchematikaMachine.hpp"
#include "VsmApplyFrame.hpp"
#include "VsmEvalArgsFrame.hpp"
#include "Closure.hpp"
#include <xo/expression2/ApplyExpr.hpp>
#include <xo/expression2/LambdaExpr.hpp>
#include <xo/expression2/Constant.hpp>
#include <xo/procedure2/RuntimeContext.hpp>
#include <xo/procedure2/SimpleRcx.hpp>
@ -21,7 +23,7 @@ namespace xo {
using xo::print::ppconfig;
using xo::print::ppstate_standalone;
using xo::mm::AGCObject;
using xo::mm::MemorySizeInfo;
//using xo::mm::MemorySizeInfo; // not used yet
using xo::mm::DX1Collector;
using xo::facet::FacetRegistry;
using std::cout;
@ -217,7 +219,7 @@ namespace xo {
// <--------------------------------------/ | |
// | |
// v v
// DLocalSymtab DLambdaExpr
// DLocalSymtab DLambdaExpr
//
// DClosure runtime procedure (created below)
// DArray bound non-local variables (established by VSM)
@ -225,8 +227,21 @@ namespace xo {
// h alloc header
// DLocalSymtab local symbol table (created by parser)
// DLambdaExpr lambda expression (created by parser)
//
DArray * args =
// will create DClosure with local_env_
// local_env_
// global_env_
auto lambda
= obj<AExpression,DLambdaExpr>::from(expr_);
DClosure * closure = DClosure::make(mm_.to_op(),
lambda.data(),
local_env_);
this->value_ = obj<AGCObject>(obj<AGCObject,DClosure>(closure));
// not implemented
assert(false);

4
src/interpreter2/interpreter2_register_facets.cpp
View file

@ -7,7 +7,6 @@
#include "VsmApplyFrame.hpp"
#include "VsmEvalArgsFrame.hpp"
#include "Closure.hpp"
#include <xo/printable2/detail/APrintable.hpp>
@ -38,6 +37,9 @@ namespace xo {
FacetRegistry::register_impl<AGCObject, DVsmEvalArgsFrame>();
FacetRegistry::register_impl<APrintable, DVsmEvalArgsFrame>();
FacetRegistry::register_impl<AGCObject, DClosure>();
FacetRegistry::register_impl<APrintable, DClosure>();
// Procedure
// +- Primitive_gco_2_gco_gco
// \- Closure