diff --git a/xo-object2/CMakeLists.txt b/xo-object2/CMakeLists.txt index 396bac1a..a07933af 100644 --- a/xo-object2/CMakeLists.txt +++ b/xo-object2/CMakeLists.txt @@ -88,6 +88,18 @@ xo_add_genfacetimpl( OUTPUT_CPP_DIR src/object2 ) +# note: manual target; generated code committed to git +xo_add_genfacetimpl( + TARGET xo-object2-facetimpl-gcobject-integer + FACET_PKG xo_gc + FACET GCObject + REPR Integer + INPUT idl/IGCObject_DInteger.json5 + OUTPUT_HPP_DIR include/xo/object2 + OUTPUT_IMPL_SUBDIR number + OUTPUT_CPP_DIR src/object2 +) + # note: manual target; generated code committed to git xo_add_genfacetimpl( TARGET xo-object2-facetimpl-printable-string diff --git a/xo-object2/idl/IGCObject_DInteger.json5 b/xo-object2/idl/IGCObject_DInteger.json5 new file mode 100644 index 00000000..65f24371 --- /dev/null +++ b/xo-object2/idl/IGCObject_DInteger.json5 @@ -0,0 +1,15 @@ +{ + mode: "implementation", + includes: [ + "", + "" + ], + local_types: [ ], + namespace1: "xo", + namespace2: "scm", + facet_idl: "idl/GCObject.json5", + brief: "provide AGCObject interface for DInteger", + using_doxygen: true, + repr: "DInteger", + doc: [ "implement AGCObject for DInteger" ], +} diff --git a/xo-object2/include/xo/object2/DInteger.hpp b/xo-object2/include/xo/object2/DInteger.hpp index 8cb109f4..c56a4be1 100644 --- a/xo-object2/include/xo/object2/DInteger.hpp +++ b/xo-object2/include/xo/object2/DInteger.hpp @@ -5,6 +5,7 @@ #pragma once +#include #include #include #include @@ -14,6 +15,7 @@ namespace xo { namespace scm { struct DInteger { using AAllocator = xo::mm::AAllocator; + using ACollector = xo::mm::ACollector; using ppindentinfo = xo::print::ppindentinfo; using value_type = long; @@ -32,6 +34,12 @@ namespace xo { operator long() const noexcept { return value_; } + // GCObject facet + + std::size_t shallow_size() const noexcept; + DInteger * shallow_copy(obj mm) const noexcept; + std::size_t forward_children(obj gc) noexcept; + private: /** boxed integer value **/ long value_; diff --git a/xo-object2/include/xo/object2/IGCObject_DInteger.hpp b/xo-object2/include/xo/object2/IGCObject_DInteger.hpp deleted file mode 100644 index b3061980..00000000 --- a/xo-object2/include/xo/object2/IGCObject_DInteger.hpp +++ /dev/null @@ -1,45 +0,0 @@ -/** @file IGCObject_DInteger.hpp - * - * @author Roland Conybeare, Dec 2025 - **/ - -#pragma once - -#include -#include "xo/alloc2/alloc/AAllocator.hpp" -#include -#include -#include "DInteger.hpp" - -namespace xo { - namespace scm { struct IGCObject_DInteger; } - - namespace facet { - template <> - struct FacetImplementation - { - using ImplType = xo::mm::IGCObject_Xfer - ; - }; - } - - namespace scm { - /* changes here coordinate with: - * IGCObject_Xfer - */ - struct IGCObject_DInteger { - public: - using AAllocator = xo::mm::AAllocator; - using ACollector = xo::mm::ACollector; - using size_type = std::size_t; - - static size_type shallow_size(const DInteger & d) noexcept; - static DInteger * shallow_copy(const DInteger & d, obj mm) noexcept; - static size_type forward_children(DInteger & d, obj gc) noexcept; - }; - } /*namespace scm*/ -} /*namespace xo*/ - -/* end IGCObject_DInteger.hpp */ diff --git a/xo-object2/include/xo/object2/number/IGCObject_DInteger.hpp b/xo-object2/include/xo/object2/number/IGCObject_DInteger.hpp new file mode 100644 index 00000000..10a5c685 --- /dev/null +++ b/xo-object2/include/xo/object2/number/IGCObject_DInteger.hpp @@ -0,0 +1,67 @@ +/** @file IGCObject_DInteger.hpp + * + * Generated automagically from ingredients: + * 1. code generator: + * [/Users/roland/proj/xo-umbrella2/xo-facet/codegen/genfacet] + * arguments: + * --input [idl/IGCObject_DInteger.json5] + * 2. jinja2 template for abstract facet .hpp file: + * [iface_facet_repr.hpp.j2] + * 3. idl for facet methods + * [idl/IGCObject_DInteger.json5] + **/ + +#pragma once + +#include "GCObject.hpp" +#include +#include +#include "DInteger.hpp" + +namespace xo { namespace scm { class IGCObject_DInteger; } } + +namespace xo { + namespace facet { + template <> + struct FacetImplementation + { + using ImplType = xo::mm::IGCObject_Xfer + ; + }; + } +} + +namespace xo { + namespace scm { + /** @class IGCObject_DInteger + **/ + class IGCObject_DInteger { + public: + /** @defgroup scm-gcobject-dinteger-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-dinteger-methods **/ + ///@{ + // const methods + /** memory consumption for this instance **/ + static size_type shallow_size(const DInteger & self) noexcept; + /** copy instance using allocator **/ + static Opaque shallow_copy(const DInteger & self, obj mm) noexcept; + + // non-const methods + /** during GC: forward immdiate children **/ + static size_type forward_children(DInteger & self, obj gc) noexcept; + ///@} + }; + + } /*namespace scm*/ +} /*namespace xo*/ + +/* end */ \ No newline at end of file diff --git a/xo-object2/src/object2/DInteger.cpp b/xo-object2/src/object2/DInteger.cpp index 6c670ccd..284806d1 100644 --- a/xo-object2/src/object2/DInteger.cpp +++ b/xo-object2/src/object2/DInteger.cpp @@ -26,6 +26,31 @@ namespace xo { { return ppdetail_atomic::print_pretty(ppii, value_); } + + size_t + DInteger::shallow_size() const noexcept + { + return sizeof(DInteger); + } + + DInteger * + DInteger::shallow_copy(obj mm) const noexcept + { + DInteger * copy = (DInteger *)mm.alloc_copy((std::byte *)this); + + if (copy) + *copy = *this; + + return copy; + } + + size_t + DInteger::forward_children(obj) noexcept + { + return shallow_size(); + } + + } /*namespace scm*/ } /*namespace xo*/ diff --git a/xo-object2/src/object2/IGCObject_DInteger.cpp b/xo-object2/src/object2/IGCObject_DInteger.cpp index cbc27f63..8b8a0112 100644 --- a/xo-object2/src/object2/IGCObject_DInteger.cpp +++ b/xo-object2/src/object2/IGCObject_DInteger.cpp @@ -1,46 +1,39 @@ /** @file IGCObject_DInteger.cpp * - * @author Roland Conybeare, Dec 2025 - **/ + * Generated automagically from ingredients: + * 1. code generator: + * [/Users/roland/proj/xo-umbrella2/xo-facet/codegen/genfacet] + * arguments: + * --input [idl/IGCObject_DInteger.json5] + * 2. jinja2 template for abstract facet .hpp file: + * [iface_facet_any.hpp.j2] + * 3. idl for facet methods + * [idl/IGCObject_DInteger.json5] +**/ -#include "IGCObject_DInteger.hpp" -#include "xo/alloc2/alloc/AAllocator.hpp" -#include "xo/facet/obj.hpp" -#include +#include "number/IGCObject_DInteger.hpp" namespace xo { - using xo::mm::AAllocator; - using xo::facet::obj; - using xo::facet::typeseq; - using std::size_t; - namespace scm { - size_t - IGCObject_DInteger::shallow_size(const DInteger &) noexcept + auto + IGCObject_DInteger::shallow_size(const DInteger & self) noexcept -> size_type { - return sizeof(DInteger); + return self.shallow_size(); } - DInteger * - IGCObject_DInteger::shallow_copy(const DInteger & src, - obj mm) noexcept + auto + IGCObject_DInteger::shallow_copy(const DInteger & self, obj mm) noexcept -> Opaque { - DInteger * copy = (DInteger *)mm.alloc_copy((std::byte *)&src); - - if (copy) - *copy = src; - - return copy; + return self.shallow_copy(mm); } - size_t - IGCObject_DInteger::forward_children(DInteger & src, - obj) noexcept + auto + IGCObject_DInteger::forward_children(DInteger & self, obj gc) noexcept -> size_type { - return shallow_size(src); + return self.forward_children(gc); } } /*namespace scm*/ } /*namespace xo*/ -/* end IGCObject_DInteger.cpp */ +/* end IGCObject_DInteger.cpp */ \ No newline at end of file diff --git a/xo-object2/src/object2/object2_register_facets.cpp b/xo-object2/src/object2/object2_register_facets.cpp index 94de94c6..0ea0db57 100644 --- a/xo-object2/src/object2/object2_register_facets.cpp +++ b/xo-object2/src/object2/object2_register_facets.cpp @@ -7,7 +7,7 @@ #include #include -#include +#include #include #include diff --git a/xo-object2/src/object2/object2_register_types.cpp b/xo-object2/src/object2/object2_register_types.cpp index 9c6a9196..2c9de20b 100644 --- a/xo-object2/src/object2/object2_register_types.cpp +++ b/xo-object2/src/object2/object2_register_types.cpp @@ -7,7 +7,7 @@ #include "list/IGCObject_DList.hpp" #include "number/IGCObject_DFloat.hpp" -#include "IGCObject_DInteger.hpp" +#include "number/IGCObject_DInteger.hpp" #include "string/IGCObject_DString.hpp" #include "list/IPrintable_DList.hpp" diff --git a/xo-object2/utest/Printable.test.cpp b/xo-object2/utest/Printable.test.cpp index 76a2b17a..6c09ca90 100644 --- a/xo-object2/utest/Printable.test.cpp +++ b/xo-object2/utest/Printable.test.cpp @@ -17,7 +17,7 @@ #include #include -#include +#include #include #include