diff --git a/CMakeLists.txt b/CMakeLists.txt index d31bbd4c..18463e9d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -172,7 +172,6 @@ xo_add_genfacetimpl( xo_add_genfacetimpl( TARGET xo-interpreter2-facetimpl-gcobject-localenv FACET_PKG xo_alloc2 -# REPR LocalEnv INPUT idl/IGCObject_DLocalEnv.json5 ) @@ -180,7 +179,6 @@ xo_add_genfacetimpl( xo_add_genfacetimpl( TARGET xo-interpreter2-facetimpl-printable-localenv FACET_PKG xo_printable2 -# REPR LocalEnv INPUT idl/IPrintable_DLocalEnv.json5 ) @@ -189,7 +187,6 @@ xo_add_genfacetimpl( xo_add_genfacetimpl( TARGET xo-interpreter2-facetimpl-runtimecontext-vsmrcx FACET_PKG xo_procedure2 -# REPR DVsmRcx INPUT idl/IRuntimeContext_DVsmRcx.json5 ) diff --git a/include/xo/interpreter2/DVsmDefContFrame.hpp b/include/xo/interpreter2/DVsmDefContFrame.hpp index c0e6ed0f..249ead9c 100644 --- a/include/xo/interpreter2/DVsmDefContFrame.hpp +++ b/include/xo/interpreter2/DVsmDefContFrame.hpp @@ -51,7 +51,7 @@ namespace xo { ///@{ std::size_t shallow_size() const noexcept; - DVsmDefContFrame * shallow_copy(obj mm) const noexcept; + DVsmDefContFrame * shallow_copy(obj mm) noexcept; std::size_t forward_children(obj gc) noexcept; ///@} diff --git a/include/xo/interpreter2/DVsmIfElseContFrame.hpp b/include/xo/interpreter2/DVsmIfElseContFrame.hpp index 8efd9299..af98b9a5 100644 --- a/include/xo/interpreter2/DVsmIfElseContFrame.hpp +++ b/include/xo/interpreter2/DVsmIfElseContFrame.hpp @@ -51,7 +51,7 @@ namespace xo { ///@{ std::size_t shallow_size() const noexcept; - DVsmIfElseContFrame * shallow_copy(obj mm) const noexcept; + DVsmIfElseContFrame * shallow_copy(obj mm) noexcept; std::size_t forward_children(obj gc) noexcept; ///@} diff --git a/include/xo/interpreter2/DVsmSeqContFrame.hpp b/include/xo/interpreter2/DVsmSeqContFrame.hpp index 6b543d8b..bb4e64fc 100644 --- a/include/xo/interpreter2/DVsmSeqContFrame.hpp +++ b/include/xo/interpreter2/DVsmSeqContFrame.hpp @@ -56,7 +56,7 @@ namespace xo { ///@{ std::size_t shallow_size() const noexcept; - DVsmSeqContFrame * shallow_copy(obj mm) const noexcept; + DVsmSeqContFrame * shallow_copy(obj mm) noexcept; std::size_t forward_children(obj gc) noexcept; ///@} diff --git a/include/xo/interpreter2/LocalEnv.hpp b/include/xo/interpreter2/LocalEnv.hpp index 8955e35d..b1b302fd 100644 --- a/include/xo/interpreter2/LocalEnv.hpp +++ b/include/xo/interpreter2/LocalEnv.hpp @@ -6,7 +6,7 @@ #pragma once #include "DLocalEnv.hpp" -#include "detail/IGCObject_DLocalEnv.hpp" +#include "env/IGCObject_DLocalEnv.hpp" #include "detail/IPrintable_DLocalEnv.hpp" /* end LocalEnv.hpp */ diff --git a/include/xo/interpreter2/define/IGCObject_DVsmDefContFrame.hpp b/include/xo/interpreter2/define/IGCObject_DVsmDefContFrame.hpp index f287f9fb..33192f6e 100644 --- a/include/xo/interpreter2/define/IGCObject_DVsmDefContFrame.hpp +++ b/include/xo/interpreter2/define/IGCObject_DVsmDefContFrame.hpp @@ -52,10 +52,10 @@ namespace xo { // const methods /** memory consumption for this instance **/ static size_type shallow_size(const DVsmDefContFrame & self) noexcept; - /** copy instance using allocator **/ - static Opaque shallow_copy(const DVsmDefContFrame & self, obj mm) noexcept; // non-const methods + /** copy instance using allocator **/ + static Opaque shallow_copy(DVsmDefContFrame & self, obj mm) noexcept; /** during GC: forward immdiate children **/ static size_type forward_children(DVsmDefContFrame & self, obj gc) noexcept; ///@} diff --git a/include/xo/interpreter2/detail/IGCObject_DClosure.hpp b/include/xo/interpreter2/detail/IGCObject_DClosure.hpp index 592b1640..67bb24ae 100644 --- a/include/xo/interpreter2/detail/IGCObject_DClosure.hpp +++ b/include/xo/interpreter2/detail/IGCObject_DClosure.hpp @@ -52,10 +52,10 @@ namespace xo { // 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 + /** copy instance using allocator **/ + static Opaque shallow_copy(DClosure & self, obj mm) noexcept; /** during GC: forward immdiate children **/ static size_type forward_children(DClosure & self, obj gc) noexcept; ///@} diff --git a/include/xo/interpreter2/detail/IGCObject_DLocalEnv.hpp b/include/xo/interpreter2/detail/IGCObject_DLocalEnv.hpp deleted file mode 100644 index 25db925a..00000000 --- a/include/xo/interpreter2/detail/IGCObject_DLocalEnv.hpp +++ /dev/null @@ -1,67 +0,0 @@ -/** @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 */ diff --git a/include/xo/interpreter2/detail/IGCObject_DVsmApplyClosureFrame.hpp b/include/xo/interpreter2/detail/IGCObject_DVsmApplyClosureFrame.hpp index 1d455a71..6151d76b 100644 --- a/include/xo/interpreter2/detail/IGCObject_DVsmApplyClosureFrame.hpp +++ b/include/xo/interpreter2/detail/IGCObject_DVsmApplyClosureFrame.hpp @@ -52,10 +52,10 @@ namespace xo { // const methods /** memory consumption for this instance **/ static size_type shallow_size(const DVsmApplyClosureFrame & self) noexcept; - /** copy instance using allocator **/ - static Opaque shallow_copy(const DVsmApplyClosureFrame & self, obj mm) noexcept; // non-const methods + /** copy instance using allocator **/ + static Opaque shallow_copy(DVsmApplyClosureFrame & self, obj mm) noexcept; /** during GC: forward immdiate children **/ static size_type forward_children(DVsmApplyClosureFrame & self, obj gc) noexcept; ///@} diff --git a/include/xo/interpreter2/detail/IGCObject_DVsmApplyFrame.hpp b/include/xo/interpreter2/detail/IGCObject_DVsmApplyFrame.hpp index a2257125..384b5b32 100644 --- a/include/xo/interpreter2/detail/IGCObject_DVsmApplyFrame.hpp +++ b/include/xo/interpreter2/detail/IGCObject_DVsmApplyFrame.hpp @@ -52,10 +52,10 @@ namespace xo { // const methods /** memory consumption for this instance **/ static size_type shallow_size(const DVsmApplyFrame & self) noexcept; - /** copy instance using allocator **/ - static Opaque shallow_copy(const DVsmApplyFrame & self, obj mm) noexcept; // non-const methods + /** copy instance using allocator **/ + static Opaque shallow_copy(DVsmApplyFrame & self, obj mm) noexcept; /** during GC: forward immdiate children **/ static size_type forward_children(DVsmApplyFrame & self, obj gc) noexcept; ///@} diff --git a/include/xo/interpreter2/detail/IGCObject_DVsmEvalArgsFrame.hpp b/include/xo/interpreter2/detail/IGCObject_DVsmEvalArgsFrame.hpp index 3816203c..17651a71 100644 --- a/include/xo/interpreter2/detail/IGCObject_DVsmEvalArgsFrame.hpp +++ b/include/xo/interpreter2/detail/IGCObject_DVsmEvalArgsFrame.hpp @@ -52,10 +52,10 @@ namespace xo { // const methods /** memory consumption for this instance **/ static size_type shallow_size(const DVsmEvalArgsFrame & self) noexcept; - /** copy instance using allocator **/ - static Opaque shallow_copy(const DVsmEvalArgsFrame & self, obj mm) noexcept; // non-const methods + /** copy instance using allocator **/ + static Opaque shallow_copy(DVsmEvalArgsFrame & self, obj mm) noexcept; /** during GC: forward immdiate children **/ static size_type forward_children(DVsmEvalArgsFrame & self, obj gc) noexcept; ///@} diff --git a/include/xo/interpreter2/env/IGCObject_DLocalEnv.hpp b/include/xo/interpreter2/env/IGCObject_DLocalEnv.hpp index 93f1cce3..9d2cc682 100644 --- a/include/xo/interpreter2/env/IGCObject_DLocalEnv.hpp +++ b/include/xo/interpreter2/env/IGCObject_DLocalEnv.hpp @@ -52,10 +52,10 @@ namespace xo { // 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 + /** copy instance using allocator **/ + static Opaque shallow_copy(DLocalEnv & self, obj mm) noexcept; /** during GC: forward immdiate children **/ static size_type forward_children(DLocalEnv & self, obj gc) noexcept; ///@} diff --git a/include/xo/interpreter2/ifelse/IGCObject_DVsmIfElseContFrame.hpp b/include/xo/interpreter2/ifelse/IGCObject_DVsmIfElseContFrame.hpp index d62c896b..71afdd6a 100644 --- a/include/xo/interpreter2/ifelse/IGCObject_DVsmIfElseContFrame.hpp +++ b/include/xo/interpreter2/ifelse/IGCObject_DVsmIfElseContFrame.hpp @@ -52,10 +52,10 @@ namespace xo { // const methods /** memory consumption for this instance **/ static size_type shallow_size(const DVsmIfElseContFrame & self) noexcept; - /** copy instance using allocator **/ - static Opaque shallow_copy(const DVsmIfElseContFrame & self, obj mm) noexcept; // non-const methods + /** copy instance using allocator **/ + static Opaque shallow_copy(DVsmIfElseContFrame & self, obj mm) noexcept; /** during GC: forward immdiate children **/ static size_type forward_children(DVsmIfElseContFrame & self, obj gc) noexcept; ///@} diff --git a/include/xo/interpreter2/sequence/IGCObject_DVsmSeqContFrame.hpp b/include/xo/interpreter2/sequence/IGCObject_DVsmSeqContFrame.hpp index acf77945..e778456d 100644 --- a/include/xo/interpreter2/sequence/IGCObject_DVsmSeqContFrame.hpp +++ b/include/xo/interpreter2/sequence/IGCObject_DVsmSeqContFrame.hpp @@ -52,10 +52,10 @@ namespace xo { // const methods /** memory consumption for this instance **/ static size_type shallow_size(const DVsmSeqContFrame & self) noexcept; - /** copy instance using allocator **/ - static Opaque shallow_copy(const DVsmSeqContFrame & self, obj mm) noexcept; // non-const methods + /** copy instance using allocator **/ + static Opaque shallow_copy(DVsmSeqContFrame & self, obj mm) noexcept; /** during GC: forward immdiate children **/ static size_type forward_children(DVsmSeqContFrame & self, obj gc) noexcept; ///@} diff --git a/include/xo/interpreter2/vsm/IGCObject_DVirtualSchematikaMachine.hpp b/include/xo/interpreter2/vsm/IGCObject_DVirtualSchematikaMachine.hpp index a9f61740..7b391c2f 100644 --- a/include/xo/interpreter2/vsm/IGCObject_DVirtualSchematikaMachine.hpp +++ b/include/xo/interpreter2/vsm/IGCObject_DVirtualSchematikaMachine.hpp @@ -52,10 +52,10 @@ namespace xo { // const methods /** memory consumption for this instance **/ static size_type shallow_size(const DVirtualSchematikaMachine & self) noexcept; - /** copy instance using allocator **/ - static Opaque shallow_copy(const DVirtualSchematikaMachine & self, obj mm) noexcept; // non-const methods + /** copy instance using allocator **/ + static Opaque shallow_copy(DVirtualSchematikaMachine & self, obj mm) noexcept; /** during GC: forward immdiate children **/ static size_type forward_children(DVirtualSchematikaMachine & self, obj gc) noexcept; ///@} diff --git a/src/interpreter2/DVsmDefContFrame.cpp b/src/interpreter2/DVsmDefContFrame.cpp index 2d5c9adf..6d39d1f1 100644 --- a/src/interpreter2/DVsmDefContFrame.cpp +++ b/src/interpreter2/DVsmDefContFrame.cpp @@ -38,7 +38,7 @@ namespace xo { } DVsmDefContFrame * - DVsmDefContFrame::shallow_copy(obj mm) const noexcept + DVsmDefContFrame::shallow_copy(obj mm) noexcept { return mm.std_copy_for(this); } diff --git a/src/interpreter2/DVsmIfElseContFrame.cpp b/src/interpreter2/DVsmIfElseContFrame.cpp index f47419e0..cc5427aa 100644 --- a/src/interpreter2/DVsmIfElseContFrame.cpp +++ b/src/interpreter2/DVsmIfElseContFrame.cpp @@ -36,7 +36,7 @@ namespace xo { } DVsmIfElseContFrame * - DVsmIfElseContFrame::shallow_copy(obj mm) const noexcept + DVsmIfElseContFrame::shallow_copy(obj mm) noexcept { return mm.std_copy_for(this); } diff --git a/src/interpreter2/DVsmSeqContFrame.cpp b/src/interpreter2/DVsmSeqContFrame.cpp index 80c1665f..8a4fc555 100644 --- a/src/interpreter2/DVsmSeqContFrame.cpp +++ b/src/interpreter2/DVsmSeqContFrame.cpp @@ -39,7 +39,7 @@ namespace xo { } DVsmSeqContFrame * - DVsmSeqContFrame::shallow_copy(obj mm) const noexcept + DVsmSeqContFrame::shallow_copy(obj mm) noexcept { return mm.std_copy_for(this); } diff --git a/src/interpreter2/IGCObject_DClosure.cpp b/src/interpreter2/IGCObject_DClosure.cpp index 28dd3277..be8edfc4 100644 --- a/src/interpreter2/IGCObject_DClosure.cpp +++ b/src/interpreter2/IGCObject_DClosure.cpp @@ -22,11 +22,10 @@ namespace xo { } auto - IGCObject_DClosure::shallow_copy(const DClosure & self, obj mm) noexcept -> Opaque + IGCObject_DClosure::shallow_copy(DClosure & self, obj mm) noexcept -> Opaque { return self.shallow_copy(mm); } - auto IGCObject_DClosure::forward_children(DClosure & self, obj gc) noexcept -> size_type { diff --git a/src/interpreter2/IGCObject_DVsmApplyClosureFrame.cpp b/src/interpreter2/IGCObject_DVsmApplyClosureFrame.cpp index 7a05d47e..9bfd8cb3 100644 --- a/src/interpreter2/IGCObject_DVsmApplyClosureFrame.cpp +++ b/src/interpreter2/IGCObject_DVsmApplyClosureFrame.cpp @@ -22,11 +22,10 @@ namespace xo { } auto - IGCObject_DVsmApplyClosureFrame::shallow_copy(const DVsmApplyClosureFrame & self, obj mm) noexcept -> Opaque + IGCObject_DVsmApplyClosureFrame::shallow_copy(DVsmApplyClosureFrame & self, obj mm) noexcept -> Opaque { return self.shallow_copy(mm); } - auto IGCObject_DVsmApplyClosureFrame::forward_children(DVsmApplyClosureFrame & self, obj gc) noexcept -> size_type { diff --git a/src/interpreter2/IGCObject_DVsmApplyFrame.cpp b/src/interpreter2/IGCObject_DVsmApplyFrame.cpp index 1e794477..0c544c22 100644 --- a/src/interpreter2/IGCObject_DVsmApplyFrame.cpp +++ b/src/interpreter2/IGCObject_DVsmApplyFrame.cpp @@ -22,11 +22,10 @@ namespace xo { } auto - IGCObject_DVsmApplyFrame::shallow_copy(const DVsmApplyFrame & self, obj mm) noexcept -> Opaque + IGCObject_DVsmApplyFrame::shallow_copy(DVsmApplyFrame & self, obj mm) noexcept -> Opaque { return self.shallow_copy(mm); } - auto IGCObject_DVsmApplyFrame::forward_children(DVsmApplyFrame & self, obj gc) noexcept -> size_type { diff --git a/src/interpreter2/IGCObject_DVsmDefContFrame.cpp b/src/interpreter2/IGCObject_DVsmDefContFrame.cpp index 26a23611..c133e714 100644 --- a/src/interpreter2/IGCObject_DVsmDefContFrame.cpp +++ b/src/interpreter2/IGCObject_DVsmDefContFrame.cpp @@ -22,11 +22,10 @@ namespace xo { } auto - IGCObject_DVsmDefContFrame::shallow_copy(const DVsmDefContFrame & self, obj mm) noexcept -> Opaque + IGCObject_DVsmDefContFrame::shallow_copy(DVsmDefContFrame & self, obj mm) noexcept -> Opaque { return self.shallow_copy(mm); } - auto IGCObject_DVsmDefContFrame::forward_children(DVsmDefContFrame & self, obj gc) noexcept -> size_type { diff --git a/src/interpreter2/IGCObject_DVsmEvalArgsFrame.cpp b/src/interpreter2/IGCObject_DVsmEvalArgsFrame.cpp index d64b47bd..13c72cfe 100644 --- a/src/interpreter2/IGCObject_DVsmEvalArgsFrame.cpp +++ b/src/interpreter2/IGCObject_DVsmEvalArgsFrame.cpp @@ -22,11 +22,10 @@ namespace xo { } auto - IGCObject_DVsmEvalArgsFrame::shallow_copy(const DVsmEvalArgsFrame & self, obj mm) noexcept -> Opaque + IGCObject_DVsmEvalArgsFrame::shallow_copy(DVsmEvalArgsFrame & self, obj mm) noexcept -> Opaque { return self.shallow_copy(mm); } - auto IGCObject_DVsmEvalArgsFrame::forward_children(DVsmEvalArgsFrame & self, obj gc) noexcept -> size_type { diff --git a/src/interpreter2/IGCObject_DVsmIfElseContFrame.cpp b/src/interpreter2/IGCObject_DVsmIfElseContFrame.cpp index ba66cd8d..e28d5121 100644 --- a/src/interpreter2/IGCObject_DVsmIfElseContFrame.cpp +++ b/src/interpreter2/IGCObject_DVsmIfElseContFrame.cpp @@ -22,11 +22,10 @@ namespace xo { } auto - IGCObject_DVsmIfElseContFrame::shallow_copy(const DVsmIfElseContFrame & self, obj mm) noexcept -> Opaque + IGCObject_DVsmIfElseContFrame::shallow_copy(DVsmIfElseContFrame & self, obj mm) noexcept -> Opaque { return self.shallow_copy(mm); } - auto IGCObject_DVsmIfElseContFrame::forward_children(DVsmIfElseContFrame & self, obj gc) noexcept -> size_type { diff --git a/src/interpreter2/IGCObject_DVsmSeqContFrame.cpp b/src/interpreter2/IGCObject_DVsmSeqContFrame.cpp index eecdf291..8bdbd2fc 100644 --- a/src/interpreter2/IGCObject_DVsmSeqContFrame.cpp +++ b/src/interpreter2/IGCObject_DVsmSeqContFrame.cpp @@ -22,11 +22,10 @@ namespace xo { } auto - IGCObject_DVsmSeqContFrame::shallow_copy(const DVsmSeqContFrame & self, obj mm) noexcept -> Opaque + IGCObject_DVsmSeqContFrame::shallow_copy(DVsmSeqContFrame & self, obj mm) noexcept -> Opaque { return self.shallow_copy(mm); } - auto IGCObject_DVsmSeqContFrame::forward_children(DVsmSeqContFrame & self, obj gc) noexcept -> size_type { diff --git a/src/interpreter2/facet/IGCObject_DLocalEnv.cpp b/src/interpreter2/facet/IGCObject_DLocalEnv.cpp index 3b6cd5f7..7e36de26 100644 --- a/src/interpreter2/facet/IGCObject_DLocalEnv.cpp +++ b/src/interpreter2/facet/IGCObject_DLocalEnv.cpp @@ -22,11 +22,10 @@ namespace xo { } auto - IGCObject_DLocalEnv::shallow_copy(const DLocalEnv & self, obj mm) noexcept -> Opaque + IGCObject_DLocalEnv::shallow_copy(DLocalEnv & self, obj mm) noexcept -> Opaque { return self.shallow_copy(mm); } - auto IGCObject_DLocalEnv::forward_children(DLocalEnv & self, obj gc) noexcept -> size_type { diff --git a/src/interpreter2/facet/IGCObject_DVirtualSchematikaMachine.cpp b/src/interpreter2/facet/IGCObject_DVirtualSchematikaMachine.cpp index 557990f8..acb698ac 100644 --- a/src/interpreter2/facet/IGCObject_DVirtualSchematikaMachine.cpp +++ b/src/interpreter2/facet/IGCObject_DVirtualSchematikaMachine.cpp @@ -22,11 +22,10 @@ namespace xo { } auto - IGCObject_DVirtualSchematikaMachine::shallow_copy(const DVirtualSchematikaMachine & self, obj mm) noexcept -> Opaque + IGCObject_DVirtualSchematikaMachine::shallow_copy(DVirtualSchematikaMachine & self, obj mm) noexcept -> Opaque { return self.shallow_copy(mm); } - auto IGCObject_DVirtualSchematikaMachine::forward_children(DVirtualSchematikaMachine & self, obj gc) noexcept -> size_type {