diff --git a/xo-expression2/CMakeLists.txt b/xo-expression2/CMakeLists.txt index d070190e..382769ba 100644 --- a/xo-expression2/CMakeLists.txt +++ b/xo-expression2/CMakeLists.txt @@ -34,6 +34,7 @@ xo_add_genfacet( # ---------------------------------------------------------------- +# note: manual target; generated code committed to git xo_add_genfacetimpl( TARGET xo-expression2-facetimpl-symboltable-localsymtab FACET_PKG xo_expression2 @@ -45,6 +46,19 @@ xo_add_genfacetimpl( OUTPUT_CPP_DIR src/expression2 ) +# note: manual target; generated code committed to git +xo_add_genfacetimpl( + TARGET xo-expression2-facetimpl-gcobject-localsymtab + FACET_PKG xo_gc + FACET GCObject + REPR LocalSymtab + INPUT idl/IGCObject_DLocalSymtab.json5 + OUTPUT_HPP_DIR include/xo/expression2 + OUTPUT_IMPL_SUBDIR symtab + OUTPUT_CPP_DIR src/expression2 +) + +# note: manual target; generated code committed to git xo_add_genfacetimpl( TARGET xo-expression2-facetimpl-printable-localsymtab FACET_PKG xo_printable2 @@ -260,6 +274,18 @@ xo_add_genfacetimpl( OUTPUT_CPP_DIR src/expression2 ) +# note: manual target; generated code committed to git +xo_add_genfacetimpl( + TARGET xo-expression2-facetimpl-gcobject-lambdaexpr + FACET_PKG xo_gc + FACET GCObject + REPR LambdaExpr + INPUT idl/IGCObject_DLambdaExpr.json5 + OUTPUT_HPP_DIR include/xo/expression2 + OUTPUT_IMPL_SUBDIR detail + OUTPUT_CPP_DIR src/expression2 +) + # note: manual target; generated code committed to git xo_add_genfacetimpl( TARGET xo-expression2-facetimpl-printable-lambdaexpr diff --git a/xo-expression2/idl/IGCObject_DLambdaExpr.json5 b/xo-expression2/idl/IGCObject_DLambdaExpr.json5 new file mode 100644 index 00000000..b35ad45e --- /dev/null +++ b/xo-expression2/idl/IGCObject_DLambdaExpr.json5 @@ -0,0 +1,15 @@ +{ + mode: "implementation", + includes: [ + "", + "" + ], + local_types: [ ], + namespace1: "xo", + namespace2: "scm", + facet_idl: "idl/GCObject.json5", + brief: "provide AGCObject interface for DLambdaExpr", + using_doxygen: true, + repr: "DLambdaExpr", + doc: [ "implement AGCObject for DLambdaExpr" ], +} diff --git a/xo-expression2/idl/IGCObject_DLocalSymtab.json5 b/xo-expression2/idl/IGCObject_DLocalSymtab.json5 new file mode 100644 index 00000000..03705f5e --- /dev/null +++ b/xo-expression2/idl/IGCObject_DLocalSymtab.json5 @@ -0,0 +1,15 @@ +{ + mode: "implementation", + includes: [ + "", + "" + ], + local_types: [ ], + namespace1: "xo", + namespace2: "scm", + facet_idl: "idl/GCObject.json5", + brief: "provide AGCObject interface for DLocalSymtab", + using_doxygen: true, + repr: "DLocalSymtab", + doc: [ "implement AGCObject for DLocalSymtab" ], +} diff --git a/xo-expression2/idl/SymbolTable.json5 b/xo-expression2/idl/SymbolTable.json5 index 3d91a3d7..4d7dc2a4 100644 --- a/xo-expression2/idl/SymbolTable.json5 +++ b/xo-expression2/idl/SymbolTable.json5 @@ -56,4 +56,5 @@ // // Variable gives both {name, type} // void upsert_local(DVariable * target) = 0; ], + router_facet_explicit_content: [ ], } diff --git a/xo-expression2/include/xo/expression2/DLocalSymtab.hpp b/xo-expression2/include/xo/expression2/DLocalSymtab.hpp index 6d1a6480..6a75422d 100644 --- a/xo-expression2/include/xo/expression2/DLocalSymtab.hpp +++ b/xo-expression2/include/xo/expression2/DLocalSymtab.hpp @@ -25,6 +25,7 @@ namespace xo { // using typeseq = xo::reflect::typeseq; using ppindentinfo = xo::print::ppindentinfo; + using ACollector = xo::mm::ACollector; using AAllocator = xo::mm::AAllocator; /* note: uint16_t would be fine too */ using size_type = std::uint32_t; @@ -90,6 +91,14 @@ namespace xo { /** lookup binding for variable @p sym **/ Binding lookup_binding(const DUniqueString * sym) const noexcept; + ///@} + /** @defgroup xo-localsymtab-gcobject-facet gcobject facet **/ + ///@{ + + std::size_t shallow_size() const noexcept; + DLocalSymtab * shallow_copy(obj mm) const noexcept; + std::size_t forward_children(obj gc) noexcept; + ///@} /** @defgroup xo-localsymtab-printable-facet printable facet **/ ///@{ diff --git a/xo-expression2/include/xo/expression2/LambdaExpr.hpp b/xo-expression2/include/xo/expression2/LambdaExpr.hpp index 45f86b25..043ca319 100644 --- a/xo-expression2/include/xo/expression2/LambdaExpr.hpp +++ b/xo-expression2/include/xo/expression2/LambdaExpr.hpp @@ -7,7 +7,7 @@ #include "DLambdaExpr.hpp" #include "detail/IExpression_DLambdaExpr.hpp" -//#include "detail/IGCObject_DLambdaExpr.hpp" +#include "detail/IGCObject_DLambdaExpr.hpp" #include "detail/IPrintable_DLambdaExpr.hpp" /* end LambdaExpr.hpp */ diff --git a/xo-expression2/include/xo/expression2/LocalSymtab.hpp b/xo-expression2/include/xo/expression2/LocalSymtab.hpp index 4c852652..e594a08d 100644 --- a/xo-expression2/include/xo/expression2/LocalSymtab.hpp +++ b/xo-expression2/include/xo/expression2/LocalSymtab.hpp @@ -7,6 +7,7 @@ #include "DLocalSymtab.hpp" #include "symtab/ISymbolTable_DLocalSymtab.hpp" +#include "symtab/IGCObject_DLocalSymtab.hpp" #include "symtab/IPrintable_DLocalSymtab.hpp" /* end LocalSymtab.hpp */ diff --git a/xo-expression2/include/xo/expression2/detail/AExpression.hpp b/xo-expression2/include/xo/expression2/detail/AExpression.hpp index 59c83339..96d68a65 100644 --- a/xo-expression2/include/xo/expression2/detail/AExpression.hpp +++ b/xo-expression2/include/xo/expression2/detail/AExpression.hpp @@ -50,6 +50,8 @@ public: // const methods /** RTTI: unique id# for actual runtime data representation **/ virtual typeseq _typeseq() const noexcept = 0; + /** destroy instance @p d; calls c++ dtor only for actual runtime type; does not recover memory **/ + virtual void _drop(Opaque d) const noexcept = 0; /** expression type (constant | apply | ..) **/ virtual exprtype extype(Copaque data) const noexcept = 0; /** placeholder for type giving possible values for this expression **/ diff --git a/xo-expression2/include/xo/expression2/detail/IExpression_Any.hpp b/xo-expression2/include/xo/expression2/detail/IExpression_Any.hpp index 8ecb604d..827f9d9b 100644 --- a/xo-expression2/include/xo/expression2/detail/IExpression_Any.hpp +++ b/xo-expression2/include/xo/expression2/detail/IExpression_Any.hpp @@ -54,8 +54,11 @@ namespace scm { // from AExpression - // const methods + // builtin methods typeseq _typeseq() const noexcept override { return s_typeseq; } + [[noreturn]] void _drop(Opaque) const noexcept override { _fatal(); } + + // const methods [[noreturn]] exprtype extype(Copaque) const noexcept override { _fatal(); } [[noreturn]] TypeRef typeref(Copaque) const noexcept override { _fatal(); } [[noreturn]] TypeDescr valuetype(Copaque) const noexcept override { _fatal(); } diff --git a/xo-expression2/include/xo/expression2/detail/IExpression_Xfer.hpp b/xo-expression2/include/xo/expression2/detail/IExpression_Xfer.hpp index b95b8526..095e21ed 100644 --- a/xo-expression2/include/xo/expression2/detail/IExpression_Xfer.hpp +++ b/xo-expression2/include/xo/expression2/detail/IExpression_Xfer.hpp @@ -41,8 +41,11 @@ namespace scm { // from AExpression - // const methods + // builtin methods typeseq _typeseq() const noexcept override { return s_typeseq; } + void _drop(Opaque d) const noexcept override { _dcast(d).~DRepr(); } + + // const methods exprtype extype(Copaque data) const noexcept override { return I::extype(_dcast(data)); } diff --git a/xo-expression2/include/xo/expression2/detail/IGCObject_DLambdaExpr.hpp b/xo-expression2/include/xo/expression2/detail/IGCObject_DLambdaExpr.hpp new file mode 100644 index 00000000..7d1ba5b0 --- /dev/null +++ b/xo-expression2/include/xo/expression2/detail/IGCObject_DLambdaExpr.hpp @@ -0,0 +1,67 @@ +/** @file IGCObject_DLambdaExpr.hpp + * + * Generated automagically from ingredients: + * 1. code generator: + * [xo-facet/codegen/genfacet] + * arguments: + * --input [idl/IGCObject_DLambdaExpr.json5] + * 2. jinja2 template for abstract facet .hpp file: + * [iface_facet_repr.hpp.j2] + * 3. idl for facet methods + * [idl/IGCObject_DLambdaExpr.json5] + **/ + +#pragma once + +#include "GCObject.hpp" +#include +#include +#include "DLambdaExpr.hpp" + +namespace xo { namespace scm { class IGCObject_DLambdaExpr; } } + +namespace xo { + namespace facet { + template <> + struct FacetImplementation + { + using ImplType = xo::mm::IGCObject_Xfer + ; + }; + } +} + +namespace xo { + namespace scm { + /** @class IGCObject_DLambdaExpr + **/ + class IGCObject_DLambdaExpr { + public: + /** @defgroup scm-gcobject-dlambdaexpr-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-dlambdaexpr-methods **/ + ///@{ + // const methods + /** memory consumption for this instance **/ + static size_type shallow_size(const DLambdaExpr & self) noexcept; + /** copy instance using allocator **/ + static Opaque shallow_copy(const DLambdaExpr & self, obj mm) noexcept; + + // non-const methods + /** during GC: forward immdiate children **/ + static size_type forward_children(DLambdaExpr & self, obj gc) noexcept; + ///@} + }; + + } /*namespace scm*/ +} /*namespace xo*/ + +/* end */ \ No newline at end of file diff --git a/xo-expression2/include/xo/expression2/detail/RExpression.hpp b/xo-expression2/include/xo/expression2/detail/RExpression.hpp index a14a2ee5..89a8990f 100644 --- a/xo-expression2/include/xo/expression2/detail/RExpression.hpp +++ b/xo-expression2/include/xo/expression2/detail/RExpression.hpp @@ -46,8 +46,13 @@ public: /** @defgroup scm-expression-router-methods **/ ///@{ - // const methods + // explicit injected content + + // builtin methods typeseq _typeseq() const noexcept { return O::iface()->_typeseq(); } + void _drop() const noexcept { O::iface()->_drop(O::data()); } + + // const methods exprtype extype() const noexcept { return O::iface()->extype(O::data()); } diff --git a/xo-expression2/include/xo/expression2/symtab/ASymbolTable.hpp b/xo-expression2/include/xo/expression2/symtab/ASymbolTable.hpp index 50d6b4b7..59cf246f 100644 --- a/xo-expression2/include/xo/expression2/symtab/ASymbolTable.hpp +++ b/xo-expression2/include/xo/expression2/symtab/ASymbolTable.hpp @@ -47,6 +47,8 @@ public: // const methods /** RTTI: unique id# for actual runtime data representation **/ virtual typeseq _typeseq() const noexcept = 0; + /** destroy instance @p d; calls c++ dtor only for actual runtime type; does not recover memory **/ + virtual void _drop(Opaque d) const noexcept = 0; /** true iff this is toplevel (global) symbol table. **/ virtual bool is_global_symtab(Copaque data) const noexcept = 0; /** report ingredients needed to address variable at runtime. **/ diff --git a/xo-expression2/include/xo/expression2/symtab/IGCObject_DLocalSymtab.hpp b/xo-expression2/include/xo/expression2/symtab/IGCObject_DLocalSymtab.hpp new file mode 100644 index 00000000..94b9e279 --- /dev/null +++ b/xo-expression2/include/xo/expression2/symtab/IGCObject_DLocalSymtab.hpp @@ -0,0 +1,67 @@ +/** @file IGCObject_DLocalSymtab.hpp + * + * Generated automagically from ingredients: + * 1. code generator: + * [xo-facet/codegen/genfacet] + * arguments: + * --input [idl/IGCObject_DLocalSymtab.json5] + * 2. jinja2 template for abstract facet .hpp file: + * [iface_facet_repr.hpp.j2] + * 3. idl for facet methods + * [idl/IGCObject_DLocalSymtab.json5] + **/ + +#pragma once + +#include "GCObject.hpp" +#include +#include +#include "DLocalSymtab.hpp" + +namespace xo { namespace scm { class IGCObject_DLocalSymtab; } } + +namespace xo { + namespace facet { + template <> + struct FacetImplementation + { + using ImplType = xo::mm::IGCObject_Xfer + ; + }; + } +} + +namespace xo { + namespace scm { + /** @class IGCObject_DLocalSymtab + **/ + class IGCObject_DLocalSymtab { + public: + /** @defgroup scm-gcobject-dlocalsymtab-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-dlocalsymtab-methods **/ + ///@{ + // const methods + /** memory consumption for this instance **/ + static size_type shallow_size(const DLocalSymtab & self) noexcept; + /** copy instance using allocator **/ + static Opaque shallow_copy(const DLocalSymtab & self, obj mm) noexcept; + + // non-const methods + /** during GC: forward immdiate children **/ + static size_type forward_children(DLocalSymtab & self, obj gc) noexcept; + ///@} + }; + + } /*namespace scm*/ +} /*namespace xo*/ + +/* end */ \ No newline at end of file diff --git a/xo-expression2/include/xo/expression2/symtab/ISymbolTable_Any.hpp b/xo-expression2/include/xo/expression2/symtab/ISymbolTable_Any.hpp index 1f4c9b2e..2d873ea1 100644 --- a/xo-expression2/include/xo/expression2/symtab/ISymbolTable_Any.hpp +++ b/xo-expression2/include/xo/expression2/symtab/ISymbolTable_Any.hpp @@ -53,8 +53,11 @@ namespace scm { // from ASymbolTable - // const methods + // builtin methods typeseq _typeseq() const noexcept override { return s_typeseq; } + [[noreturn]] void _drop(Opaque) const noexcept override { _fatal(); } + + // const methods [[noreturn]] bool is_global_symtab(Copaque) const noexcept override { _fatal(); } [[noreturn]] Binding lookup_binding(Copaque, const DUniqueString *) const noexcept override { _fatal(); } diff --git a/xo-expression2/include/xo/expression2/symtab/ISymbolTable_Xfer.hpp b/xo-expression2/include/xo/expression2/symtab/ISymbolTable_Xfer.hpp index f19f6e2e..db81237f 100644 --- a/xo-expression2/include/xo/expression2/symtab/ISymbolTable_Xfer.hpp +++ b/xo-expression2/include/xo/expression2/symtab/ISymbolTable_Xfer.hpp @@ -39,8 +39,11 @@ namespace scm { // from ASymbolTable - // const methods + // builtin methods typeseq _typeseq() const noexcept override { return s_typeseq; } + void _drop(Opaque d) const noexcept override { _dcast(d).~DRepr(); } + + // const methods bool is_global_symtab(Copaque data) const noexcept override { return I::is_global_symtab(_dcast(data)); } diff --git a/xo-expression2/include/xo/expression2/symtab/RSymbolTable.hpp b/xo-expression2/include/xo/expression2/symtab/RSymbolTable.hpp index f6375b37..31405e89 100644 --- a/xo-expression2/include/xo/expression2/symtab/RSymbolTable.hpp +++ b/xo-expression2/include/xo/expression2/symtab/RSymbolTable.hpp @@ -45,8 +45,13 @@ public: /** @defgroup scm-symboltable-router-methods **/ ///@{ - // const methods + // explicit injected content + + // builtin methods typeseq _typeseq() const noexcept { return O::iface()->_typeseq(); } + void _drop() const noexcept { O::iface()->_drop(O::data()); } + + // const methods bool is_global_symtab() const noexcept { return O::iface()->is_global_symtab(O::data()); } diff --git a/xo-expression2/src/expression2/IGCObject_DLambdaExpr.cpp b/xo-expression2/src/expression2/IGCObject_DLambdaExpr.cpp new file mode 100644 index 00000000..c7724cd5 --- /dev/null +++ b/xo-expression2/src/expression2/IGCObject_DLambdaExpr.cpp @@ -0,0 +1,39 @@ +/** @file IGCObject_DLambdaExpr.cpp + * + * Generated automagically from ingredients: + * 1. code generator: + * [xo-facet/codegen/genfacet] + * arguments: + * --input [idl/IGCObject_DLambdaExpr.json5] + * 2. jinja2 template for abstract facet .hpp file: + * [iface_facet_any.hpp.j2] + * 3. idl for facet methods + * [idl/IGCObject_DLambdaExpr.json5] +**/ + +#include "detail/IGCObject_DLambdaExpr.hpp" + +namespace xo { + namespace scm { + auto + IGCObject_DLambdaExpr::shallow_size(const DLambdaExpr & self) noexcept -> size_type + { + return self.shallow_size(); + } + + auto + IGCObject_DLambdaExpr::shallow_copy(const DLambdaExpr & self, obj mm) noexcept -> Opaque + { + return self.shallow_copy(mm); + } + + auto + IGCObject_DLambdaExpr::forward_children(DLambdaExpr & self, obj gc) noexcept -> size_type + { + return self.forward_children(gc); + } + + } /*namespace scm*/ +} /*namespace xo*/ + +/* end IGCObject_DLambdaExpr.cpp */ diff --git a/xo-expression2/src/expression2/IGCObject_DLocalSymtab.cpp b/xo-expression2/src/expression2/IGCObject_DLocalSymtab.cpp new file mode 100644 index 00000000..ca96d3b6 --- /dev/null +++ b/xo-expression2/src/expression2/IGCObject_DLocalSymtab.cpp @@ -0,0 +1,39 @@ +/** @file IGCObject_DLocalSymtab.cpp + * + * Generated automagically from ingredients: + * 1. code generator: + * [xo-facet/codegen/genfacet] + * arguments: + * --input [idl/IGCObject_DLocalSymtab.json5] + * 2. jinja2 template for abstract facet .hpp file: + * [iface_facet_any.hpp.j2] + * 3. idl for facet methods + * [idl/IGCObject_DLocalSymtab.json5] +**/ + +#include "symtab/IGCObject_DLocalSymtab.hpp" + +namespace xo { + namespace scm { + auto + IGCObject_DLocalSymtab::shallow_size(const DLocalSymtab & self) noexcept -> size_type + { + return self.shallow_size(); + } + + auto + IGCObject_DLocalSymtab::shallow_copy(const DLocalSymtab & self, obj mm) noexcept -> Opaque + { + return self.shallow_copy(mm); + } + + auto + IGCObject_DLocalSymtab::forward_children(DLocalSymtab & self, obj gc) noexcept -> size_type + { + return self.forward_children(gc); + } + + } /*namespace scm*/ +} /*namespace xo*/ + +/* end IGCObject_DLocalSymtab.cpp */ diff --git a/xo-gc/include/xo/gc/detail/RGCObject.hpp b/xo-gc/include/xo/gc/detail/RGCObject.hpp index 435d5a64..ab4bcc54 100644 --- a/xo-gc/include/xo/gc/detail/RGCObject.hpp +++ b/xo-gc/include/xo/gc/detail/RGCObject.hpp @@ -85,4 +85,4 @@ namespace xo { namespace facet { }; } } -/* end RGCObject.hpp */ \ No newline at end of file +/* end RGCObject.hpp */ diff --git a/xo-interpreter2/CMakeLists.txt b/xo-interpreter2/CMakeLists.txt index 25d8cd0d..b0b3c63a 100644 --- a/xo-interpreter2/CMakeLists.txt +++ b/xo-interpreter2/CMakeLists.txt @@ -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) diff --git a/xo-interpreter2/idl/IGCObject_DClosure.json5 b/xo-interpreter2/idl/IGCObject_DClosure.json5 new file mode 100644 index 00000000..ec9f32fd --- /dev/null +++ b/xo-interpreter2/idl/IGCObject_DClosure.json5 @@ -0,0 +1,15 @@ +{ + mode: "implementation", + includes: [ + "", + "" + ], + 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" ], +} diff --git a/xo-interpreter2/idl/IGCObject_DLocalEnv.json5 b/xo-interpreter2/idl/IGCObject_DLocalEnv.json5 new file mode 100644 index 00000000..3c747621 --- /dev/null +++ b/xo-interpreter2/idl/IGCObject_DLocalEnv.json5 @@ -0,0 +1,15 @@ +{ + mode: "implementation", + includes: [ + "", + "" + ], + 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" ], +} diff --git a/xo-interpreter2/idl/IPrintable_DClosure.json5 b/xo-interpreter2/idl/IPrintable_DClosure.json5 new file mode 100644 index 00000000..d4b16a69 --- /dev/null +++ b/xo-interpreter2/idl/IPrintable_DClosure.json5 @@ -0,0 +1,13 @@ +{ + mode: "implementation", + includes: [ "", + "" ], + 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" ], +} diff --git a/xo-interpreter2/include/xo/interpreter2/Closure.hpp b/xo-interpreter2/include/xo/interpreter2/Closure.hpp index f352e7f0..5bbeb9b8 100644 --- a/xo-interpreter2/include/xo/interpreter2/Closure.hpp +++ b/xo-interpreter2/include/xo/interpreter2/Closure.hpp @@ -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 */ diff --git a/xo-interpreter2/include/xo/interpreter2/DClosure.hpp b/xo-interpreter2/include/xo/interpreter2/DClosure.hpp index bcf85c97..26ff2703 100644 --- a/xo-interpreter2/include/xo/interpreter2/DClosure.hpp +++ b/xo-interpreter2/include/xo/interpreter2/DClosure.hpp @@ -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 mm) const noexcept; + std::size_t forward_children(obj gc) noexcept; + ///@} /** @defgroup scm-closure-printable-facet **/ ///@{ diff --git a/xo-interpreter2/include/xo/interpreter2/DGlobalEnv.hpp b/xo-interpreter2/include/xo/interpreter2/DGlobalEnv.hpp index d0ab0827..e9f1a9c8 100644 --- a/xo-interpreter2/include/xo/interpreter2/DGlobalEnv.hpp +++ b/xo-interpreter2/include/xo/interpreter2/DGlobalEnv.hpp @@ -7,6 +7,7 @@ #include #include +#include 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. diff --git a/xo-interpreter2/include/xo/interpreter2/DLocalEnv.hpp b/xo-interpreter2/include/xo/interpreter2/DLocalEnv.hpp index 0291c748..5563fb3a 100644 --- a/xo-interpreter2/include/xo/interpreter2/DLocalEnv.hpp +++ b/xo-interpreter2/include/xo/interpreter2/DLocalEnv.hpp @@ -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 x); ///@} + /** @defgroup scm-localenv-gcobject-facet **/ + ///@{ + + std::size_t shallow_size() const noexcept; + DLocalEnv * shallow_copy(obj mm) const noexcept; + std::size_t forward_children(obj 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*/ diff --git a/xo-interpreter2/include/xo/interpreter2/LocalEnv.hpp b/xo-interpreter2/include/xo/interpreter2/LocalEnv.hpp index 8976452f..a709e006 100644 --- a/xo-interpreter2/include/xo/interpreter2/LocalEnv.hpp +++ b/xo-interpreter2/include/xo/interpreter2/LocalEnv.hpp @@ -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 */ diff --git a/xo-interpreter2/include/xo/interpreter2/VirtualSchematikaMachine.hpp b/xo-interpreter2/include/xo/interpreter2/VirtualSchematikaMachine.hpp index 7a209bf1..1aebed2c 100644 --- a/xo-interpreter2/include/xo/interpreter2/VirtualSchematikaMachine.hpp +++ b/xo-interpreter2/include/xo/interpreter2/VirtualSchematikaMachine.hpp @@ -8,6 +8,8 @@ #include "VsmConfig.hpp" #include "VsmInstr.hpp" #include "VsmFrame.hpp" +#include "DLocalEnv.hpp" +#include "DGlobalEnv.hpp" #include #include #include @@ -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 fn_; /** evaluated argument list **/ diff --git a/xo-interpreter2/include/xo/interpreter2/detail/IGCObject_DClosure.hpp b/xo-interpreter2/include/xo/interpreter2/detail/IGCObject_DClosure.hpp new file mode 100644 index 00000000..fb863205 --- /dev/null +++ b/xo-interpreter2/include/xo/interpreter2/detail/IGCObject_DClosure.hpp @@ -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 +#include +#include "DClosure.hpp" + +namespace xo { namespace scm { class IGCObject_DClosure; } } + +namespace xo { + namespace facet { + template <> + struct FacetImplementation + { + using ImplType = xo::mm::IGCObject_Xfer + ; + }; + } +} + +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 mm) noexcept; + + // non-const methods + /** during GC: forward immdiate children **/ + static size_type forward_children(DClosure & self, obj gc) noexcept; + ///@} + }; + + } /*namespace scm*/ +} /*namespace xo*/ + +/* end */ \ No newline at end of file diff --git a/xo-interpreter2/include/xo/interpreter2/detail/IGCObject_DLocalEnv.hpp b/xo-interpreter2/include/xo/interpreter2/detail/IGCObject_DLocalEnv.hpp new file mode 100644 index 00000000..d318bb61 --- /dev/null +++ b/xo-interpreter2/include/xo/interpreter2/detail/IGCObject_DLocalEnv.hpp @@ -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 +#include +#include "DLocalEnv.hpp" + +namespace xo { namespace scm { class IGCObject_DLocalEnv; } } + +namespace xo { + namespace facet { + template <> + struct FacetImplementation + { + using ImplType = xo::mm::IGCObject_Xfer + ; + }; + } +} + +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 mm) noexcept; + + // non-const methods + /** during GC: forward immdiate children **/ + static size_type forward_children(DLocalEnv & self, obj gc) noexcept; + ///@} + }; + + } /*namespace scm*/ +} /*namespace xo*/ + +/* end */ \ No newline at end of file diff --git a/xo-interpreter2/include/xo/interpreter2/detail/IPrintable_DClosure.hpp b/xo-interpreter2/include/xo/interpreter2/detail/IPrintable_DClosure.hpp new file mode 100644 index 00000000..6cc91cf1 --- /dev/null +++ b/xo-interpreter2/include/xo/interpreter2/detail/IPrintable_DClosure.hpp @@ -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 +#include +#include "DClosure.hpp" + +namespace xo { namespace scm { class IPrintable_DClosure; } } + +namespace xo { + namespace facet { + template <> + struct FacetImplementation + { + using ImplType = xo::print::IPrintable_Xfer + ; + }; + } +} + +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 */ \ No newline at end of file diff --git a/xo-interpreter2/src/interpreter2/CMakeLists.txt b/xo-interpreter2/src/interpreter2/CMakeLists.txt index b47ea31d..e7493775 100644 --- a/xo-interpreter2/src/interpreter2/CMakeLists.txt +++ b/xo-interpreter2/src/interpreter2/CMakeLists.txt @@ -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 ) diff --git a/xo-interpreter2/src/interpreter2/DClosure.cpp b/xo-interpreter2/src/interpreter2/DClosure.cpp index 1057a25d..b1868950 100644 --- a/xo-interpreter2/src/interpreter2/DClosure.cpp +++ b/xo-interpreter2/src/interpreter2/DClosure.cpp @@ -3,7 +3,10 @@ * @author Roland Conybeare, Feb 2026 **/ -#include "DClosure.hpp" +#include "Closure.hpp" +#include "LambdaExpr.hpp" +#include "LocalEnv.hpp" +#include 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 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 gc) noexcept + { + { + auto iface = xo::facet::impl_for(); + gc.forward_inplace(&iface, (void **)(&lambda_)); + + } + { + auto iface = xo::facet::impl_for(); + gc.forward_inplace(&iface, (void **)(&env_)); + } + + return shallow_size(); + } + } /*namespace scm*/ } /*namespace xo*/ diff --git a/xo-interpreter2/src/interpreter2/DLocalEnv.cpp b/xo-interpreter2/src/interpreter2/DLocalEnv.cpp index 3aba3aa8..9ba65085 100644 --- a/xo-interpreter2/src/interpreter2/DLocalEnv.cpp +++ b/xo-interpreter2/src/interpreter2/DLocalEnv.cpp @@ -3,7 +3,8 @@ * @author Roland Conybeare, Feb 2026 **/ -#include "DLocalEnv.hpp" +#include "LocalEnv.hpp" +#include #include 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 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 gc) noexcept + { + { + auto iface = xo::facet::impl_for(); + gc.forward_inplace(&iface, (void **)(&parent_)); + } + { + auto iface = xo::facet::impl_for(); + gc.forward_inplace(&iface, (void **)(&symtab_)); + } + { + auto iface = xo::facet::impl_for(); + gc.forward_inplace(&iface, (void **)(&args_)); + } + + return shallow_size(); + } + } /*namespace scm*/ } /*namespace xo*/ diff --git a/xo-interpreter2/src/interpreter2/IGCObject_DClosure.cpp b/xo-interpreter2/src/interpreter2/IGCObject_DClosure.cpp new file mode 100644 index 00000000..28dd3277 --- /dev/null +++ b/xo-interpreter2/src/interpreter2/IGCObject_DClosure.cpp @@ -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 mm) noexcept -> Opaque + { + return self.shallow_copy(mm); + } + + auto + IGCObject_DClosure::forward_children(DClosure & self, obj gc) noexcept -> size_type + { + return self.forward_children(gc); + } + + } /*namespace scm*/ +} /*namespace xo*/ + +/* end IGCObject_DClosure.cpp */ diff --git a/xo-interpreter2/src/interpreter2/IGCObject_DLocalEnv.cpp b/xo-interpreter2/src/interpreter2/IGCObject_DLocalEnv.cpp new file mode 100644 index 00000000..3ee3b7c7 --- /dev/null +++ b/xo-interpreter2/src/interpreter2/IGCObject_DLocalEnv.cpp @@ -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 mm) noexcept -> Opaque + { + return self.shallow_copy(mm); + } + + auto + IGCObject_DLocalEnv::forward_children(DLocalEnv & self, obj gc) noexcept -> size_type + { + return self.forward_children(gc); + } + + } /*namespace scm*/ +} /*namespace xo*/ + +/* end IGCObject_DLocalEnv.cpp */ diff --git a/xo-interpreter2/src/interpreter2/IPrintable_DClosure.cpp b/xo-interpreter2/src/interpreter2/IPrintable_DClosure.cpp new file mode 100644 index 00000000..e9c599fb --- /dev/null +++ b/xo-interpreter2/src/interpreter2/IPrintable_DClosure.cpp @@ -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 */ diff --git a/xo-interpreter2/src/interpreter2/VirtualSchematikaMachine.cpp b/xo-interpreter2/src/interpreter2/VirtualSchematikaMachine.cpp index 767ef784..bfd5e09f 100644 --- a/xo-interpreter2/src/interpreter2/VirtualSchematikaMachine.cpp +++ b/xo-interpreter2/src/interpreter2/VirtualSchematikaMachine.cpp @@ -6,7 +6,9 @@ #include "VirtualSchematikaMachine.hpp" #include "VsmApplyFrame.hpp" #include "VsmEvalArgsFrame.hpp" +#include "Closure.hpp" #include +#include #include #include #include @@ -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::from(expr_); + + DClosure * closure = DClosure::make(mm_.to_op(), + lambda.data(), + local_env_); + + this->value_ = obj(obj(closure)); // not implemented assert(false); diff --git a/xo-interpreter2/src/interpreter2/interpreter2_register_facets.cpp b/xo-interpreter2/src/interpreter2/interpreter2_register_facets.cpp index 820dac2c..1953bf1d 100644 --- a/xo-interpreter2/src/interpreter2/interpreter2_register_facets.cpp +++ b/xo-interpreter2/src/interpreter2/interpreter2_register_facets.cpp @@ -7,7 +7,6 @@ #include "VsmApplyFrame.hpp" #include "VsmEvalArgsFrame.hpp" - #include "Closure.hpp" #include @@ -38,6 +37,9 @@ namespace xo { FacetRegistry::register_impl(); FacetRegistry::register_impl(); + FacetRegistry::register_impl(); + FacetRegistry::register_impl(); + // Procedure // +- Primitive_gco_2_gco_gco // \- Closure diff --git a/xo-object2/include/xo/object2/Array.hpp b/xo-object2/include/xo/object2/Array.hpp new file mode 100644 index 00000000..12c6eaa5 --- /dev/null +++ b/xo-object2/include/xo/object2/Array.hpp @@ -0,0 +1,14 @@ +/** @file Array.hpp + * + * @author Roland Conybeare, Feb 2026 + **/ + +#pragma once + +#include "DArray.hpp" +#include "array/ISequence_DArray.hpp" +#include "array/IGCObject_DArray.hpp" +#include "array/IPrintable_DArray.hpp" + + +/* end Array.hpp */