From f777aeade0e9102db936c31723877a9f89ebeb52 Mon Sep 17 00:00:00 2001 From: Roland Conybeare Date: Tue, 17 Feb 2026 14:42:17 -0500 Subject: [PATCH] xo-interpreter2 stack: define-expr's work at top-level --- CMakeLists.txt | 11 +++ idl/IGCObject_DDefineExpr.json5 | 18 +++++ include/xo/expression2/DDefineExpr.hpp | 11 ++- include/xo/expression2/DGlobalSymtab.hpp | 4 ++ include/xo/expression2/DefineExpr.hpp | 2 +- .../define/IGCObject_DDefineExpr.hpp | 67 +++++++++++++++++++ src/expression2/CMakeLists.txt | 3 +- src/expression2/DDefineExpr.cpp | 32 ++++++++- src/expression2/IGCObject_DDefineExpr.cpp | 39 +++++++++++ .../expression2_register_facets.cpp | 9 +-- 10 files changed, 184 insertions(+), 12 deletions(-) create mode 100644 idl/IGCObject_DDefineExpr.json5 create mode 100644 include/xo/expression2/define/IGCObject_DDefineExpr.hpp create mode 100644 src/expression2/IGCObject_DDefineExpr.cpp diff --git a/CMakeLists.txt b/CMakeLists.txt index 1b84df8d..c9180ad8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -230,6 +230,17 @@ xo_add_genfacetimpl( OUTPUT_IMPL_SUBDIR detail ) +# note: manual target; generated code committed to git +xo_add_genfacetimpl( + TARGET xo-expression2-facetimpl-gcobject-defineexpr + FACET_PKG xo_gc + FACET GCObject + REPR DefineExpr + INPUT idl/IGCObject_DDefineExpr.json5 + OUTPUT_HPP_DIR include/xo/expression2 + OUTPUT_IMPL_SUBDIR define +) + # note: manual target; generated code committed to git xo_add_genfacetimpl( TARGET xo-expression2-facetimpl-printable-defineexpr diff --git a/idl/IGCObject_DDefineExpr.json5 b/idl/IGCObject_DDefineExpr.json5 new file mode 100644 index 00000000..6b0eba68 --- /dev/null +++ b/idl/IGCObject_DDefineExpr.json5 @@ -0,0 +1,18 @@ +{ + mode: "implementation", + output_cpp_dir: "src/expression2", + output_hpp_dir: "include/xo/expression2", + output_impl_subdir: "define", + includes: [ + "", + "" + ], + local_types: [ ], + namespace1: "xo", + namespace2: "scm", + facet_idl: "idl/GCObject.json5", + brief: "provide AGCObject interface for DDefineExpr", + using_doxygen: true, + repr: "DDefineExpr", + doc: [ "implement AGCObject for DDefineExpr" ], +} diff --git a/include/xo/expression2/DDefineExpr.hpp b/include/xo/expression2/DDefineExpr.hpp index 6b7716e3..6ad8494f 100644 --- a/include/xo/expression2/DDefineExpr.hpp +++ b/include/xo/expression2/DDefineExpr.hpp @@ -1,5 +1,5 @@ /** @file DDefineExpr.hpp -* + * * @author Roland Conybeare, Jan 2026 **/ @@ -23,6 +23,7 @@ namespace xo { class DDefineExpr { public: using ppindentinfo = xo::print::ppindentinfo; + using ACollector = xo::mm::ACollector; using AAllocator = xo::mm::AAllocator; using TypeDescr = xo::reflect::TypeDescr; @@ -67,6 +68,14 @@ namespace xo { TypeDescr valuetype() const noexcept { return lhs_var_->typeref().td(); } void assign_valuetype(TypeDescr td) noexcept; + ///@} + /** @defgroup scm-defineexpr-gcobject-facet **/ + ///@{ + + std::size_t shallow_size() const noexcept; + DDefineExpr * shallow_copy(obj mm) const noexcept; + std::size_t forward_children(obj gc) noexcept; + ///@} /** @defgroup scm-defineexpr-printable-facet **/ ///@{ diff --git a/include/xo/expression2/DGlobalSymtab.hpp b/include/xo/expression2/DGlobalSymtab.hpp index 63a2a91f..5cd03fb2 100644 --- a/include/xo/expression2/DGlobalSymtab.hpp +++ b/include/xo/expression2/DGlobalSymtab.hpp @@ -32,6 +32,7 @@ namespace xo { using AAllocator = xo::mm::AAllocator; using MemorySizeVisitor = xo::mm::MemorySizeVisitor; using ppindentinfo = xo::print::ppindentinfo; + using size_type = std::uint32_t; public: /** @defgroup scm-globalsymtab-ctors constructors **/ @@ -55,6 +56,9 @@ namespace xo { /** @defgroup scm-globalsymtab-access-methods access methods **/ ///@{ + size_type size() const noexcept { return map_->size(); } + size_type capacity() const noexcept { return map_->capacity(); } + /** visit symtab-owned memory pools; call visitor(info) for each **/ void visit_pools(const MemorySizeVisitor & visitor) const; diff --git a/include/xo/expression2/DefineExpr.hpp b/include/xo/expression2/DefineExpr.hpp index 37a77c03..4a0c42c2 100644 --- a/include/xo/expression2/DefineExpr.hpp +++ b/include/xo/expression2/DefineExpr.hpp @@ -7,7 +7,7 @@ #include "DDefineExpr.hpp" #include "detail/IExpression_DDefineExpr.hpp" -//#include "detail/IGCObject_DDefineExpr.hpp" +#include "define/IGCObject_DDefineExpr.hpp" #include "detail/IPrintable_DDefineExpr.hpp" /* end DefineExpr.hpp */ diff --git a/include/xo/expression2/define/IGCObject_DDefineExpr.hpp b/include/xo/expression2/define/IGCObject_DDefineExpr.hpp new file mode 100644 index 00000000..216dd18b --- /dev/null +++ b/include/xo/expression2/define/IGCObject_DDefineExpr.hpp @@ -0,0 +1,67 @@ +/** @file IGCObject_DDefineExpr.hpp + * + * Generated automagically from ingredients: + * 1. code generator: + * [xo-facet/codegen/genfacet] + * arguments: + * --input [idl/IGCObject_DDefineExpr.json5] + * 2. jinja2 template for abstract facet .hpp file: + * [iface_facet_repr.hpp.j2] + * 3. idl for facet methods + * [idl/IGCObject_DDefineExpr.json5] + **/ + +#pragma once + +#include "GCObject.hpp" +#include +#include +#include "DDefineExpr.hpp" + +namespace xo { namespace scm { class IGCObject_DDefineExpr; } } + +namespace xo { + namespace facet { + template <> + struct FacetImplementation + { + using ImplType = xo::mm::IGCObject_Xfer + ; + }; + } +} + +namespace xo { + namespace scm { + /** @class IGCObject_DDefineExpr + **/ + class IGCObject_DDefineExpr { + public: + /** @defgroup scm-gcobject-ddefineexpr-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-ddefineexpr-methods **/ + ///@{ + // const methods + /** memory consumption for this instance **/ + static size_type shallow_size(const DDefineExpr & self) noexcept; + /** copy instance using allocator **/ + static Opaque shallow_copy(const DDefineExpr & self, obj mm) noexcept; + + // non-const methods + /** during GC: forward immdiate children **/ + static size_type forward_children(DDefineExpr & self, obj gc) noexcept; + ///@} + }; + + } /*namespace scm*/ +} /*namespace xo*/ + +/* end */ \ No newline at end of file diff --git a/src/expression2/CMakeLists.txt b/src/expression2/CMakeLists.txt index 8aafa01a..f05cf2f1 100644 --- a/src/expression2/CMakeLists.txt +++ b/src/expression2/CMakeLists.txt @@ -9,7 +9,6 @@ set(SELF_SRCS DConstant.cpp DVariable.cpp DVarRef.cpp - DDefineExpr.cpp DApplyExpr.cpp TypeRef.cpp @@ -30,7 +29,9 @@ set(SELF_SRCS IGCObject_DVarRef.cpp IPrintable_DVarRef.cpp + DDefineExpr.cpp IExpression_DDefineExpr.cpp + IGCObject_DDefineExpr.cpp IPrintable_DDefineExpr.cpp IExpression_DApplyExpr.cpp diff --git a/src/expression2/DDefineExpr.cpp b/src/expression2/DDefineExpr.cpp index 961fbecc..aee6ccf9 100644 --- a/src/expression2/DDefineExpr.cpp +++ b/src/expression2/DDefineExpr.cpp @@ -4,13 +4,16 @@ **/ #include "DDefineExpr.hpp" -#include "detail/IPrintable_DVariable.hpp" +#include "Variable.hpp" +#include +#include #include #include #include #include namespace xo { + using xo::mm::poly_forward_inplace; using xo::print::APrintable; using xo::facet::FacetRegistry; using xo::facet::typeseq; @@ -68,10 +71,35 @@ namespace xo { } void - DDefineExpr::assign_rhs(obj x) { + DDefineExpr::assign_rhs(obj x) + { this->rhs_ = x; } + // ----- GCObject facet ----- + + std::size_t + DDefineExpr::shallow_size() const noexcept + { + return sizeof(*this); + } + + DDefineExpr * + DDefineExpr::shallow_copy(obj mm) const noexcept + { + return mm.std_copy_for(this); + } + + std::size_t + DDefineExpr::forward_children(obj gc) noexcept + { + gc.forward_inplace(&lhs_var_); + //gc.forward_inplace(&rhs_); // complicated - need to access via GCObject facet + poly_forward_inplace(gc, &rhs_); + + return this->shallow_size(); + } + bool DDefineExpr::pretty(const ppindentinfo & ppii) const { diff --git a/src/expression2/IGCObject_DDefineExpr.cpp b/src/expression2/IGCObject_DDefineExpr.cpp new file mode 100644 index 00000000..eb43932b --- /dev/null +++ b/src/expression2/IGCObject_DDefineExpr.cpp @@ -0,0 +1,39 @@ +/** @file IGCObject_DDefineExpr.cpp + * + * Generated automagically from ingredients: + * 1. code generator: + * [xo-facet/codegen/genfacet] + * arguments: + * --input [idl/IGCObject_DDefineExpr.json5] + * 2. jinja2 template for abstract facet .hpp file: + * [iface_facet_any.hpp.j2] + * 3. idl for facet methods + * [idl/IGCObject_DDefineExpr.json5] +**/ + +#include "define/IGCObject_DDefineExpr.hpp" + +namespace xo { + namespace scm { + auto + IGCObject_DDefineExpr::shallow_size(const DDefineExpr & self) noexcept -> size_type + { + return self.shallow_size(); + } + + auto + IGCObject_DDefineExpr::shallow_copy(const DDefineExpr & self, obj mm) noexcept -> Opaque + { + return self.shallow_copy(mm); + } + + auto + IGCObject_DDefineExpr::forward_children(DDefineExpr & self, obj gc) noexcept -> size_type + { + return self.forward_children(gc); + } + + } /*namespace scm*/ +} /*namespace xo*/ + +/* end IGCObject_DDefineExpr.cpp */ diff --git a/src/expression2/expression2_register_facets.cpp b/src/expression2/expression2_register_facets.cpp index c563c9da..82bff638 100644 --- a/src/expression2/expression2_register_facets.cpp +++ b/src/expression2/expression2_register_facets.cpp @@ -6,17 +6,12 @@ #include "expression2_register_facets.hpp" #include -//#include -//#include - -#include -//#include -#include #include #include #include +#include #include #include #include @@ -74,7 +69,7 @@ namespace xo { FacetRegistry::register_impl(); FacetRegistry::register_impl(); - //FacetRegistry::register_impl(); + FacetRegistry::register_impl(); FacetRegistry::register_impl(); FacetRegistry::register_impl();