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

xo-object2 stack: refactor/tidy after GCObject -> alloc2

Browse source
This commit is contained in:
Roland Conybeare 2026-03-05 20:11:05 +11:00
commit e2b239dfb9
21 changed files with 29 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

14
CMakeLists.txt
View file

@ -48,7 +48,7 @@ xo_add_genfacetimpl(
# note: manual target; generated code committed to git # note: manual target; generated code committed to git
xo_add_genfacetimpl( xo_add_genfacetimpl(
TARGET xo-object2-facetimpl-gcobject-list TARGET xo-object2-facetimpl-gcobject-list
FACET_PKG xo_gc FACET_PKG xo_alloc2
FACET GCObject FACET GCObject
REPR List REPR List
INPUT idl/IGCObject_DList.json5 INPUT idl/IGCObject_DList.json5
@ -68,7 +68,7 @@ xo_add_genfacetimpl(
# note: manual target; generated code committed to git # note: manual target; generated code committed to git
xo_add_genfacetimpl( xo_add_genfacetimpl(
TARGET xo-object2-facetimpl-gcobject-boolean TARGET xo-object2-facetimpl-gcobject-boolean
FACET_PKG xo_gc FACET_PKG xo_alloc2
FACET GCObject FACET GCObject
REPR Boolean REPR Boolean
INPUT idl/IGCObject_DBoolean.json5 INPUT idl/IGCObject_DBoolean.json5
@ -88,7 +88,7 @@ xo_add_genfacetimpl(
# note: manual target; generated code committed to git # note: manual target; generated code committed to git
xo_add_genfacetimpl( xo_add_genfacetimpl(
TARGET xo-object2-facetimpl-gcobject-float TARGET xo-object2-facetimpl-gcobject-float
FACET_PKG xo_gc FACET_PKG xo_alloc2
FACET GCObject FACET GCObject
REPR Float REPR Float
INPUT idl/IGCObject_DFloat.json5 INPUT idl/IGCObject_DFloat.json5
@ -108,7 +108,7 @@ xo_add_genfacetimpl(
# note: manual target; generated code committed to git # note: manual target; generated code committed to git
xo_add_genfacetimpl( xo_add_genfacetimpl(
TARGET xo-object2-facetimpl-gcobject-integer TARGET xo-object2-facetimpl-gcobject-integer
FACET_PKG xo_gc FACET_PKG xo_alloc2
FACET GCObject FACET GCObject
REPR Integer REPR Integer
INPUT idl/IGCObject_DInteger.json5 INPUT idl/IGCObject_DInteger.json5
@ -137,7 +137,7 @@ xo_add_genfacetimpl(
# note: manual target; generated code committed to git # note: manual target; generated code committed to git
xo_add_genfacetimpl( xo_add_genfacetimpl(
TARGET xo-object2-facetimpl-gcobject-array TARGET xo-object2-facetimpl-gcobject-array
FACET_PKG xo_gc FACET_PKG xo_alloc2
FACET GCObject FACET GCObject
REPR Array REPR Array
INPUT idl/IGCObject_DArray.json5 INPUT idl/IGCObject_DArray.json5
@ -157,7 +157,7 @@ xo_add_genfacetimpl(
# note: manual target; generated code committed to git # note: manual target; generated code committed to git
xo_add_genfacetimpl( xo_add_genfacetimpl(
TARGET xo-object2-facetimpl-gcobject-dictionary TARGET xo-object2-facetimpl-gcobject-dictionary
FACET_PKG xo_gc FACET_PKG xo_alloc2
FACET GCObject FACET GCObject
REPR Dictionary REPR Dictionary
INPUT idl/IGCObject_DDictionary.json5 INPUT idl/IGCObject_DDictionary.json5
@ -177,7 +177,7 @@ xo_add_genfacetimpl(
# note: manual target; generated code committed to git # note: manual target; generated code committed to git
xo_add_genfacetimpl( xo_add_genfacetimpl(
TARGET xo-object2-facetimpl-gcobject-runtimeerror TARGET xo-object2-facetimpl-gcobject-runtimeerror
FACET_PKG xo_gc FACET_PKG xo_alloc2
FACET GCObject FACET GCObject
REPR RuntimeError REPR RuntimeError
INPUT idl/IGCObject_DRuntimeError.json5 INPUT idl/IGCObject_DRuntimeError.json5

2
cmake/xo_object2Config.cmake.in
View file

@ -2,8 +2,8 @@
include(CMakeFindDependencyMacro) include(CMakeFindDependencyMacro)
find_dependency(reflect) find_dependency(reflect)
find_dependency(xo_gc)
find_dependency(xo_stringtable2) find_dependency(xo_stringtable2)
find_dependency(xo_alloc2)
find_dependency(xo_printable2) find_dependency(xo_printable2)
find_dependency(subsys) find_dependency(subsys)
find_dependency(indentlog) find_dependency(indentlog)

2
idl/IGCObject_DArray.json5
View file

@ -4,7 +4,7 @@
output_hpp_dir: "include/xo/object2", output_hpp_dir: "include/xo/object2",
output_impl_subdir: "array", output_impl_subdir: "array",
includes: [ includes: [
"<xo/gc/GCObject.hpp>", "<xo/alloc2/GCObject.hpp>",
"<xo/alloc2/Allocator.hpp>" "<xo/alloc2/Allocator.hpp>"
], ],
local_types: [ ], local_types: [ ],

4
idl/IGCObject_DBoolean.json5
View file

@ -4,8 +4,8 @@
output_hpp_dir: "include/xo/object2", output_hpp_dir: "include/xo/object2",
output_impl_subdir: "boolean", output_impl_subdir: "boolean",
includes: [ includes: [
"<xo/gc/GCObject.hpp>", // "<xo/alloc2/GCObject.hpp>",
"<xo/alloc2/Allocator.hpp>" // "<xo/alloc2/Allocator.hpp>"
], ],
local_types: [ ], local_types: [ ],
namespace1: "xo", namespace1: "xo",

2
idl/IGCObject_DDictionary.json5
View file

@ -4,7 +4,7 @@
output_hpp_dir: "include/xo/object2", output_hpp_dir: "include/xo/object2",
output_impl_subdir: "dictionary", output_impl_subdir: "dictionary",
includes: [ includes: [
"<xo/gc/GCObject.hpp>", "<xo/alloc2/GCObject.hpp>",
"<xo/alloc2/Allocator.hpp>" "<xo/alloc2/Allocator.hpp>"
], ],
local_types: [ ], local_types: [ ],

2
idl/IGCObject_DFloat.json5
View file

@ -5,7 +5,7 @@
output_impl_subdir: "number", output_impl_subdir: "number",
includes: [ includes: [
"<xo/object2/number/GCObjectConversion_DFloat.hpp>", "<xo/object2/number/GCObjectConversion_DFloat.hpp>",
"<xo/gc/GCObject.hpp>", "<xo/alloc2/GCObject.hpp>",
"<xo/alloc2/Allocator.hpp>" "<xo/alloc2/Allocator.hpp>"
], ],
local_types: [ ], local_types: [ ],

2
idl/IGCObject_DInteger.json5
View file

@ -4,7 +4,7 @@
output_hpp_dir: "include/xo/object2", output_hpp_dir: "include/xo/object2",
output_impl_subdir: "number", output_impl_subdir: "number",
includes: [ includes: [
"<xo/gc/GCObject.hpp>", "<xo/alloc2/GCObject.hpp>",
"<xo/alloc2/Allocator.hpp>" "<xo/alloc2/Allocator.hpp>"
], ],
local_types: [ ], local_types: [ ],

2
idl/IGCObject_DList.json5
View file

@ -4,7 +4,7 @@
output_hpp_dir: "include/xo/object2", output_hpp_dir: "include/xo/object2",
output_impl_subdir: "list", output_impl_subdir: "list",
includes: [ includes: [
// "<xo/gc/GCObject.hpp>", // "<xo/alloc2/GCObject.hpp>",
// "<xo/alloc2/Allocator.hpp>" // "<xo/alloc2/Allocator.hpp>"
], ],
local_types: [ ], local_types: [ ],

2
idl/IGCObject_DRuntimeError.json5
View file

@ -4,7 +4,7 @@
output_hpp_dir: "include/xo/object2", output_hpp_dir: "include/xo/object2",
output_impl_subdir: "error", output_impl_subdir: "error",
includes: [ includes: [
// "<xo/gc/GCObject.hpp>", // "<xo/alloc2/GCObject.hpp>",
// "<xo/alloc2/Allocator.hpp>" // "<xo/alloc2/Allocator.hpp>"
], ],
local_types: [ ], local_types: [ ],

2
idl/Sequence.json5
View file

@ -3,7 +3,7 @@
output_cpp_dir: "src/object2", output_cpp_dir: "src/object2",
output_hpp_dir: "include/xo/object2", output_hpp_dir: "include/xo/object2",
output_impl_subdir: "sequence", output_impl_subdir: "sequence",
includes: ["<xo/gc/GCObject.hpp>"], includes: ["<xo/alloc2/GCObject.hpp>"],
// extra includes in Sequence.hpp, if any // extra includes in Sequence.hpp, if any
user_hpp_includes: [], user_hpp_includes: [],
namespace1: "xo", namespace1: "xo",

2
include/xo/object2/array/IGCObject_DArray.hpp
View file

@ -64,4 +64,4 @@ namespace xo {
} /*namespace scm*/ } /*namespace scm*/
} /*namespace xo*/ } /*namespace xo*/
/* end */ /* end */

4
include/xo/object2/boolean/IGCObject_DBoolean.hpp
View file

@ -14,8 +14,6 @@
#pragma once #pragma once
#include "GCObject.hpp" #include "GCObject.hpp"
#include <xo/alloc2/GCObject.hpp>
#include <xo/alloc2/Allocator.hpp>
#include "DBoolean.hpp" #include "DBoolean.hpp"
namespace xo { namespace scm { class IGCObject_DBoolean; } } namespace xo { namespace scm { class IGCObject_DBoolean; } }
@ -64,4 +62,4 @@ namespace xo {
} /*namespace scm*/ } /*namespace scm*/
} /*namespace xo*/ } /*namespace xo*/
/* end */ /* end */

2
include/xo/object2/dictionary/IGCObject_DDictionary.hpp
View file

@ -64,4 +64,4 @@ namespace xo {
} /*namespace scm*/ } /*namespace scm*/
} /*namespace xo*/ } /*namespace xo*/
/* end */ /* end */

2
include/xo/object2/number/GCObjectConversion_DFloat.hpp
View file

@ -7,7 +7,7 @@
#include "DFloat.hpp" #include "DFloat.hpp"
#include "number/IGCObject_DFloat.hpp" #include "number/IGCObject_DFloat.hpp"
#include <xo/gc/GCObjectConversion.hpp> #include <xo/alloc2/GCObjectConversion.hpp>
namespace xo { namespace xo {
namespace scm { namespace scm {

2
include/xo/object2/number/GCObjectConversion_DInteger.hpp
View file

@ -7,7 +7,7 @@
#include "DInteger.hpp" #include "DInteger.hpp"
#include "number/IGCObject_DInteger.hpp" #include "number/IGCObject_DInteger.hpp"
#include <xo/gc/GCObjectConversion.hpp> #include <xo/alloc2/GCObjectConversion.hpp>
namespace xo { namespace xo {
namespace scm { namespace scm {

2
include/xo/object2/number/IGCObject_DFloat.hpp
View file

@ -65,4 +65,4 @@ namespace xo {
} /*namespace scm*/ } /*namespace scm*/
} /*namespace xo*/ } /*namespace xo*/
/* end */ /* end */

2
include/xo/object2/number/IGCObject_DInteger.hpp
View file

@ -64,4 +64,4 @@ namespace xo {
} /*namespace scm*/ } /*namespace scm*/
} /*namespace xo*/ } /*namespace xo*/
/* end */ /* end */

2
src/object2/CMakeLists.txt
View file

@ -45,8 +45,8 @@ set(SELF_SRCS
xo_add_shared_library4(${SELF_LIB} ${PROJECT_NAME}Targets ${PROJECT_VERSION} 1 ${SELF_SRCS}) xo_add_shared_library4(${SELF_LIB} ${PROJECT_NAME}Targets ${PROJECT_VERSION} 1 ${SELF_SRCS})
# note: deps here must also appear in cmake/xo_object2Config.cmake.in # note: deps here must also appear in cmake/xo_object2Config.cmake.in
xo_dependency(${SELF_LIB} reflect) xo_dependency(${SELF_LIB} reflect)
xo_dependency(${SELF_LIB} xo_gc)
xo_dependency(${SELF_LIB} xo_stringtable2) xo_dependency(${SELF_LIB} xo_stringtable2)
xo_dependency(${SELF_LIB} xo_alloc2)
xo_dependency(${SELF_LIB} xo_printable2) xo_dependency(${SELF_LIB} xo_printable2)
xo_dependency(${SELF_LIB} subsys) xo_dependency(${SELF_LIB} subsys)
xo_dependency(${SELF_LIB} indentlog) xo_dependency(${SELF_LIB} indentlog)

2
src/object2/ISequence_Any.cpp
View file

@ -3,8 +3,8 @@
**/ **/
#include "sequence/ISequence_Any.hpp" #include "sequence/ISequence_Any.hpp"
#include <exception>
#include <iostream> #include <iostream>
#include <exception>
namespace xo { namespace xo {
namespace scm { namespace scm {

1
utest/CMakeLists.txt
View file

@ -12,5 +12,6 @@ set(UTEST_SRCS
xo_add_utest_executable(${UTEST_EXE} ${UTEST_SRCS}) xo_add_utest_executable(${UTEST_EXE} ${UTEST_SRCS})
xo_self_dependency(${UTEST_EXE} xo_object2) xo_self_dependency(${UTEST_EXE} xo_object2)
xo_dependency(${UTEST_EXE} xo_gc)
#xo_dependency(${UTEST_EXE} randomgen) #xo_dependency(${UTEST_EXE} randomgen)
xo_external_target_dependency(${UTEST_EXE} Catch2 Catch2::Catch2) xo_external_target_dependency(${UTEST_EXE} Catch2 Catch2::Catch2)

3
utest/Printable.test.cpp
View file

@ -20,7 +20,8 @@
#include <xo/object2/number/IGCObject_DInteger.hpp> #include <xo/object2/number/IGCObject_DInteger.hpp>
#include <xo/alloc2/Collector.hpp> #include <xo/alloc2/Collector.hpp>
#include <xo/gc/DX1Collector.hpp>
#include <xo/gc/X1Collector.hpp>
#include <xo/gc/detail/IAllocator_DX1Collector.hpp> #include <xo/gc/detail/IAllocator_DX1Collector.hpp>
#include <xo/gc/detail/ICollector_DX1Collector.hpp> #include <xo/gc/detail/ICollector_DX1Collector.hpp>