From 28348e46ec674ac74c869bd98c248fa13edd2744 Mon Sep 17 00:00:00 2001 From: Roland Conybeare Date: Mon, 16 Feb 2026 17:46:51 -0500 Subject: [PATCH] xo-interpreter2 stack: OUTPUT_CPP_DIR cmake->idl/ --- xo-alloc2/CMakeLists.txt | 1 - xo-alloc2/idl/ResourceVisitor.json5 | 1 + .../xo/alloc2/visitor/AResourceVisitor.hpp | 2 ++ .../alloc2/visitor/IResourceVisitor_Any.hpp | 5 +++- .../alloc2/visitor/IResourceVisitor_Xfer.hpp | 5 +++- .../xo/alloc2/visitor/RResourceVisitor.hpp | 7 ++++- xo-expression2/CMakeLists.txt | 30 ------------------- xo-expression2/idl/Expression.json5 | 1 + .../idl/IExpression_DApplyExpr.json5 | 1 + .../idl/IExpression_DConstant.json5 | 1 + .../idl/IExpression_DDefineExpr.json5 | 1 + .../idl/IExpression_DIfElseExpr.json5 | 1 + .../idl/IExpression_DLambdaExpr.json5 | 1 + .../idl/IExpression_DSequenceExpr.json5 | 1 + xo-expression2/idl/IExpression_DVarRef.json5 | 1 + .../idl/IExpression_DVariable.json5 | 1 + xo-expression2/idl/IGCObject_DApplyExpr.json5 | 1 + xo-expression2/idl/IGCObject_DConstant.json5 | 1 + .../idl/IGCObject_DIfElseExpr.json5 | 1 + .../idl/IGCObject_DLambdaExpr.json5 | 1 + .../idl/IGCObject_DLocalSymtab.json5 | 1 + .../idl/IGCObject_DSequenceExpr.json5 | 1 + .../idl/IGCObject_DUniqueString.json5 | 1 + xo-expression2/idl/IGCObject_DVarRef.json5 | 1 + xo-expression2/idl/IGCObject_DVariable.json5 | 1 + .../idl/IPrintable_DApplyExpr.json5 | 1 + xo-expression2/idl/IPrintable_DConstant.json5 | 1 + .../idl/IPrintable_DDefineExpr.json5 | 1 + .../idl/IPrintable_DIfElseExpr.json5 | 1 + .../idl/IPrintable_DLambdaExpr.json5 | 1 + .../idl/IPrintable_DLocalSymtab.json5 | 1 + .../idl/IPrintable_DSequenceExpr.json5 | 1 + .../idl/IPrintable_DUniqueString.json5 | 1 + xo-expression2/idl/IPrintable_DVarRef.json5 | 1 + xo-expression2/idl/IPrintable_DVariable.json5 | 1 + .../idl/ISymbolTable_DLocalSymtab.json5 | 1 + xo-expression2/idl/SymbolTable.json5 | 1 + xo-gc/CMakeLists.txt | 1 - xo-gc/idl/GCObject.json5 | 1 + xo-gc/include/xo/gc/GCObject.hpp | 3 +- xo-gc/include/xo/gc/detail/AGCObject.hpp | 6 ++-- xo-gc/include/xo/gc/detail/IGCObject_Any.hpp | 9 ++++-- xo-gc/include/xo/gc/detail/IGCObject_Xfer.hpp | 9 ++++-- xo-gc/include/xo/gc/detail/RGCObject.hpp | 9 ++++-- xo-gc/src/gc/IGCObject_Any.cpp | 2 +- xo-interpreter2/CMakeLists.txt | 16 ---------- xo-interpreter2/idl/IGCObject_DClosure.json5 | 1 + xo-interpreter2/idl/IGCObject_DLocalEnv.json5 | 1 + .../idl/IGCObject_DVsmApplyClosureFrame.json5 | 1 + .../idl/IGCObject_DVsmApplyFrame.json5 | 1 + .../idl/IGCObject_DVsmEvalArgsFrame.json5 | 1 + .../idl/IGCObject_DVsmIfElseContFrame.json5 | 1 + .../idl/IGCObject_DVsmSeqContFrame.json5 | 1 + xo-interpreter2/idl/IPrintable_DClosure.json5 | 1 + .../idl/IPrintable_DLocalEnv.json5 | 1 + .../IPrintable_DVsmApplyClosureFrame.json5 | 1 + .../idl/IPrintable_DVsmApplyFrame.json5 | 1 + .../idl/IPrintable_DVsmEvalArgsFrame.json5 | 1 + .../idl/IPrintable_DVsmIfElseContFrame.json5 | 1 + .../idl/IPrintable_DVsmSeqContFrame.json5 | 1 + .../idl/IRuntimeContext_DVsmRcx.json5 | 1 + xo-object2/CMakeLists.txt | 17 ----------- xo-object2/idl/IGCObject_DArray.json5 | 1 + xo-object2/idl/IGCObject_DBoolean.json5 | 1 + xo-object2/idl/IGCObject_DFloat.json5 | 1 + xo-object2/idl/IGCObject_DInteger.json5 | 1 + xo-object2/idl/IGCObject_DList.json5 | 1 + xo-object2/idl/IGCObject_DRuntimeError.json5 | 1 + xo-object2/idl/IGCObject_DString.json5 | 1 + xo-object2/idl/IPrintable_DArray.json5 | 1 + xo-object2/idl/IPrintable_DBoolean.json5 | 1 + xo-object2/idl/IPrintable_DFloat.json5 | 1 + xo-object2/idl/IPrintable_DInteger.json5 | 1 + xo-object2/idl/IPrintable_DList.json5 | 1 + xo-object2/idl/IPrintable_DRuntimeError.json5 | 1 + xo-object2/idl/IPrintable_DString.json5 | 1 + xo-object2/idl/ISequence_DArray.json5 | 1 + xo-object2/idl/ISequence_DList.json5 | 1 + xo-object2/idl/Sequence.json5 | 2 ++ xo-object2/include/xo/object2/Sequence.hpp | 4 +-- .../xo/object2/array/IGCObject_DArray.hpp | 2 +- .../xo/object2/array/IPrintable_DArray.hpp | 2 +- .../xo/object2/array/ISequence_DArray.hpp | 2 +- .../xo/object2/boolean/IGCObject_DBoolean.hpp | 2 +- .../object2/boolean/IPrintable_DBoolean.hpp | 2 +- .../xo/object2/list/IGCObject_DList.hpp | 2 +- .../xo/object2/list/IPrintable_DList.hpp | 2 +- .../xo/object2/list/ISequence_DList.hpp | 2 +- .../xo/object2/number/IGCObject_DFloat.hpp | 2 +- .../xo/object2/number/IGCObject_DInteger.hpp | 2 +- .../xo/object2/number/IPrintable_DFloat.hpp | 2 +- .../xo/object2/number/IPrintable_DInteger.hpp | 2 +- .../include/xo/object2/sequence/ASequence.hpp | 6 ++-- .../xo/object2/sequence/ISequence_Any.hpp | 9 ++++-- .../xo/object2/sequence/ISequence_Xfer.hpp | 9 ++++-- .../include/xo/object2/sequence/RSequence.hpp | 11 +++++-- .../xo/object2/string/IGCObject_DString.hpp | 2 +- .../xo/object2/string/IPrintable_DString.hpp | 2 +- xo-object2/src/object2/IGCObject_DArray.cpp | 4 +-- xo-object2/src/object2/IGCObject_DBoolean.cpp | 4 +-- xo-object2/src/object2/IGCObject_DFloat.cpp | 4 +-- xo-object2/src/object2/IGCObject_DInteger.cpp | 4 +-- xo-object2/src/object2/IGCObject_DList.cpp | 4 +-- xo-object2/src/object2/IGCObject_DString.cpp | 4 +-- xo-object2/src/object2/IPrintable_DArray.cpp | 4 +-- .../src/object2/IPrintable_DBoolean.cpp | 4 +-- xo-object2/src/object2/IPrintable_DFloat.cpp | 4 +-- .../src/object2/IPrintable_DInteger.cpp | 4 +-- xo-object2/src/object2/IPrintable_DList.cpp | 4 +-- xo-object2/src/object2/IPrintable_DString.cpp | 4 +-- xo-object2/src/object2/ISequence_Any.cpp | 2 +- xo-object2/src/object2/ISequence_DArray.cpp | 4 +-- xo-object2/src/object2/ISequence_DList.cpp | 4 +-- xo-printable2/CMakeLists.txt | 1 - xo-printable2/idl/Printable.json5 | 1 + xo-reader2/CMakeLists.txt | 27 ----------------- xo-reader2/idl/IPrintable_DApplySsm.json5 | 1 + xo-reader2/idl/IPrintable_DDefineSsm.json5 | 1 + .../idl/IPrintable_DExpectExprSsm.json5 | 1 + .../idl/IPrintable_DExpectFormalArgSsm.json5 | 1 + .../IPrintable_DExpectFormalArglistSsm.json5 | 1 + .../idl/IPrintable_DExpectSymbolSsm.json5 | 1 + .../idl/IPrintable_DExpectTypeSsm.json5 | 1 + xo-reader2/idl/IPrintable_DIfElseSsm.json5 | 1 + xo-reader2/idl/IPrintable_DLambdaSsm.json5 | 1 + xo-reader2/idl/IPrintable_DParenSsm.json5 | 1 + xo-reader2/idl/IPrintable_DProgressSsm.json5 | 1 + xo-reader2/idl/IPrintable_DSequenceSsm.json5 | 1 + .../idl/IPrintable_DToplevelSeqSsm.json5 | 1 + .../idl/ISyntaxStateMachine_DApplySsm.json5 | 1 + .../idl/ISyntaxStateMachine_DDefineSsm.json5 | 1 + .../ISyntaxStateMachine_DExpectExprSsm.json5 | 1 + ...ntaxStateMachine_DExpectFormalArgSsm.json5 | 1 + ...StateMachine_DExpectFormalArglistSsm.json5 | 1 + ...ISyntaxStateMachine_DExpectSymbolSsm.json5 | 1 + .../ISyntaxStateMachine_DExpectTypeSsm.json5 | 1 + .../idl/ISyntaxStateMachine_DIfElseSsm.json5 | 1 + .../idl/ISyntaxStateMachine_DLambdaSsm.json5 | 1 + .../idl/ISyntaxStateMachine_DParenSsm.json5 | 1 + .../ISyntaxStateMachine_DProgressSsm.json5 | 1 + .../ISyntaxStateMachine_DSequenceSsm.json5 | 1 + .../ISyntaxStateMachine_DToplevelSeqSsm.json5 | 1 + xo-reader2/idl/SyntaxStateMachine.json5 | 1 + .../ssm/IPrintable_DToplevelSeqSsm.hpp | 4 +-- .../ISyntaxStateMachine_DToplevelSeqSsm.hpp | 4 +-- 145 files changed, 207 insertions(+), 169 deletions(-) diff --git a/xo-alloc2/CMakeLists.txt b/xo-alloc2/CMakeLists.txt index 54a2cc4c..b4b03193 100644 --- a/xo-alloc2/CMakeLists.txt +++ b/xo-alloc2/CMakeLists.txt @@ -25,7 +25,6 @@ xo_add_genfacet( INPUT idl/ResourceVisitor.json5 OUTPUT_HPP_DIR include/xo/alloc2 OUTPUT_IMPL_SUBDIR visitor - OUTPUT_CPP_DIR src/alloc2 ) # ---------------------------------------------------------------- diff --git a/xo-alloc2/idl/ResourceVisitor.json5 b/xo-alloc2/idl/ResourceVisitor.json5 index a3369649..79c9d81b 100644 --- a/xo-alloc2/idl/ResourceVisitor.json5 +++ b/xo-alloc2/idl/ResourceVisitor.json5 @@ -1,5 +1,6 @@ { mode: "facet", + output_cpp_dir: "src/alloc2", includes: [ "\"Allocator.hpp\"" ], diff --git a/xo-alloc2/include/xo/alloc2/visitor/AResourceVisitor.hpp b/xo-alloc2/include/xo/alloc2/visitor/AResourceVisitor.hpp index 1466474a..c8ab3744 100644 --- a/xo-alloc2/include/xo/alloc2/visitor/AResourceVisitor.hpp +++ b/xo-alloc2/include/xo/alloc2/visitor/AResourceVisitor.hpp @@ -48,6 +48,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; /** report memory consumption **/ virtual void on_allocator(Copaque data, obj mm) const noexcept = 0; diff --git a/xo-alloc2/include/xo/alloc2/visitor/IResourceVisitor_Any.hpp b/xo-alloc2/include/xo/alloc2/visitor/IResourceVisitor_Any.hpp index a0d3e3c3..18ae11a0 100644 --- a/xo-alloc2/include/xo/alloc2/visitor/IResourceVisitor_Any.hpp +++ b/xo-alloc2/include/xo/alloc2/visitor/IResourceVisitor_Any.hpp @@ -54,8 +54,11 @@ namespace mm { // from AResourceVisitor - // const methods + // builtin methods typeseq _typeseq() const noexcept override { return s_typeseq; } + [[noreturn]] void _drop(Opaque) const noexcept override { _fatal(); } + + // const methods [[noreturn]] void on_allocator(Copaque, obj) const noexcept override { _fatal(); } // nonconst methods diff --git a/xo-alloc2/include/xo/alloc2/visitor/IResourceVisitor_Xfer.hpp b/xo-alloc2/include/xo/alloc2/visitor/IResourceVisitor_Xfer.hpp index 2ff8abdb..ded806e4 100644 --- a/xo-alloc2/include/xo/alloc2/visitor/IResourceVisitor_Xfer.hpp +++ b/xo-alloc2/include/xo/alloc2/visitor/IResourceVisitor_Xfer.hpp @@ -39,8 +39,11 @@ namespace mm { // from AResourceVisitor - // const methods + // builtin methods typeseq _typeseq() const noexcept override { return s_typeseq; } + void _drop(Opaque d) const noexcept override { _dcast(d).~DRepr(); } + + // const methods void on_allocator(Copaque data, obj mm) const noexcept override { return I::on_allocator(_dcast(data), mm); } diff --git a/xo-alloc2/include/xo/alloc2/visitor/RResourceVisitor.hpp b/xo-alloc2/include/xo/alloc2/visitor/RResourceVisitor.hpp index 3396e6e7..6fa7a633 100644 --- a/xo-alloc2/include/xo/alloc2/visitor/RResourceVisitor.hpp +++ b/xo-alloc2/include/xo/alloc2/visitor/RResourceVisitor.hpp @@ -46,8 +46,13 @@ public: /** @defgroup mm-resourcevisitor-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 void on_allocator(obj mm) const noexcept { return O::iface()->on_allocator(O::data(), mm); } diff --git a/xo-expression2/CMakeLists.txt b/xo-expression2/CMakeLists.txt index 382769ba..dd7ee89a 100644 --- a/xo-expression2/CMakeLists.txt +++ b/xo-expression2/CMakeLists.txt @@ -29,7 +29,6 @@ xo_add_genfacet( INPUT idl/SymbolTable.json5 OUTPUT_HPP_DIR include/xo/expression2 OUTPUT_IMPL_SUBDIR detail - OUTPUT_CPP_DIR src/expression2 ) # ---------------------------------------------------------------- @@ -43,7 +42,6 @@ xo_add_genfacetimpl( INPUT idl/ISymbolTable_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 @@ -55,7 +53,6 @@ xo_add_genfacetimpl( 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 @@ -67,7 +64,6 @@ xo_add_genfacetimpl( INPUT idl/IPrintable_DLocalSymtab.json5 OUTPUT_HPP_DIR include/xo/expression2 OUTPUT_IMPL_SUBDIR symtab - OUTPUT_CPP_DIR src/expression2 ) # ---------------------------------------------------------------- @@ -79,7 +75,6 @@ xo_add_genfacet( INPUT idl/Expression.json5 OUTPUT_HPP_DIR include/xo/expression2 OUTPUT_IMPL_SUBDIR detail - OUTPUT_CPP_DIR src/expression2 ) # ---------------------------------------------------------------- @@ -93,7 +88,6 @@ xo_add_genfacetimpl( INPUT idl/IExpression_DConstant.json5 OUTPUT_HPP_DIR include/xo/expression2 OUTPUT_IMPL_SUBDIR detail - OUTPUT_CPP_DIR src/expression2 ) # note: manual target; generated code committed to git @@ -105,7 +99,6 @@ xo_add_genfacetimpl( INPUT idl/IGCObject_DConstant.json5 OUTPUT_HPP_DIR include/xo/expression2 OUTPUT_IMPL_SUBDIR detail - OUTPUT_CPP_DIR src/expression2 ) # note: manual target; generated code committed to git @@ -117,7 +110,6 @@ xo_add_genfacetimpl( INPUT idl/IPrintable_DConstant.json5 OUTPUT_HPP_DIR include/xo/expression2 OUTPUT_IMPL_SUBDIR detail - OUTPUT_CPP_DIR src/expression2 ) # ---------------------------------------------------------------- @@ -131,7 +123,6 @@ xo_add_genfacetimpl( INPUT idl/IExpression_DVariable.json5 OUTPUT_HPP_DIR include/xo/expression2 OUTPUT_IMPL_SUBDIR detail - OUTPUT_CPP_DIR src/expression2 ) # note: manual target; generated code committed to git @@ -143,7 +134,6 @@ xo_add_genfacetimpl( INPUT idl/IGCObject_DVariable.json5 OUTPUT_HPP_DIR include/xo/expression2 OUTPUT_IMPL_SUBDIR detail - OUTPUT_CPP_DIR src/expression2 ) # note: manual target; generated code committed to git @@ -155,7 +145,6 @@ xo_add_genfacetimpl( INPUT idl/IPrintable_DVariable.json5 OUTPUT_HPP_DIR include/xo/expression2 OUTPUT_IMPL_SUBDIR detail - OUTPUT_CPP_DIR src/expression2 ) # ---------------------------------------------------------------- @@ -169,7 +158,6 @@ xo_add_genfacetimpl( INPUT idl/IExpression_DVarRef.json5 OUTPUT_HPP_DIR include/xo/expression2 OUTPUT_IMPL_SUBDIR detail - OUTPUT_CPP_DIR src/expression2 ) # note: manual target; generated code committed to git @@ -181,7 +169,6 @@ xo_add_genfacetimpl( INPUT idl/IGCObject_DVarRef.json5 OUTPUT_HPP_DIR include/xo/expression2 OUTPUT_IMPL_SUBDIR detail - OUTPUT_CPP_DIR src/expression2 ) # note: manual target; generated code committed to git @@ -193,7 +180,6 @@ xo_add_genfacetimpl( INPUT idl/IPrintable_DVarRef.json5 OUTPUT_HPP_DIR include/xo/expression2 OUTPUT_IMPL_SUBDIR detail - OUTPUT_CPP_DIR src/expression2 ) # ---------------------------------------------------------------- @@ -207,7 +193,6 @@ xo_add_genfacetimpl( INPUT idl/IExpression_DDefineExpr.json5 OUTPUT_HPP_DIR include/xo/expression2 OUTPUT_IMPL_SUBDIR detail - OUTPUT_CPP_DIR src/expression2 ) # note: manual target; generated code committed to git @@ -219,7 +204,6 @@ xo_add_genfacetimpl( INPUT idl/IPrintable_DDefineExpr.json5 OUTPUT_HPP_DIR include/xo/expression2 OUTPUT_IMPL_SUBDIR detail - OUTPUT_CPP_DIR src/expression2 ) # ---------------------------------------------------------------- @@ -233,7 +217,6 @@ xo_add_genfacetimpl( INPUT idl/IExpression_DApplyExpr.json5 OUTPUT_HPP_DIR include/xo/expression2 OUTPUT_IMPL_SUBDIR detail - OUTPUT_CPP_DIR src/expression2 ) # note: manual target; generated code committed to git @@ -245,7 +228,6 @@ xo_add_genfacetimpl( INPUT idl/IGCObject_DApplyExpr.json5 OUTPUT_HPP_DIR include/xo/expression2 OUTPUT_IMPL_SUBDIR detail - OUTPUT_CPP_DIR src/expression2 ) # note: manual target; generated code committed to git @@ -257,7 +239,6 @@ xo_add_genfacetimpl( INPUT idl/IPrintable_DApplyExpr.json5 OUTPUT_HPP_DIR include/xo/expression2 OUTPUT_IMPL_SUBDIR detail - OUTPUT_CPP_DIR src/expression2 ) # ---------------------------------------------------------------- @@ -271,7 +252,6 @@ xo_add_genfacetimpl( INPUT idl/IExpression_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 @@ -283,7 +263,6 @@ xo_add_genfacetimpl( 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 @@ -295,7 +274,6 @@ xo_add_genfacetimpl( INPUT idl/IPrintable_DLambdaExpr.json5 OUTPUT_HPP_DIR include/xo/expression2 OUTPUT_IMPL_SUBDIR detail - OUTPUT_CPP_DIR src/expression2 ) # ---------------------------------------------------------------- @@ -309,7 +287,6 @@ xo_add_genfacetimpl( INPUT idl/IExpression_DIfElseExpr.json5 OUTPUT_HPP_DIR include/xo/expression2 OUTPUT_IMPL_SUBDIR detail - OUTPUT_CPP_DIR src/expression2 ) # note: manual target; generated code committed to git @@ -321,7 +298,6 @@ xo_add_genfacetimpl( INPUT idl/IGCObject_DIfElseExpr.json5 OUTPUT_HPP_DIR include/xo/expression2 OUTPUT_IMPL_SUBDIR detail - OUTPUT_CPP_DIR src/expression2 ) # note: manual target; generated code committed to git @@ -333,7 +309,6 @@ xo_add_genfacetimpl( INPUT idl/IPrintable_DIfElseExpr.json5 OUTPUT_HPP_DIR include/xo/expression2 OUTPUT_IMPL_SUBDIR detail - OUTPUT_CPP_DIR src/expression2 ) # ---------------------------------------------------------------- @@ -347,7 +322,6 @@ xo_add_genfacetimpl( INPUT idl/IExpression_DSequenceExpr.json5 OUTPUT_HPP_DIR include/xo/expression2 OUTPUT_IMPL_SUBDIR detail - OUTPUT_CPP_DIR src/expression2 ) # note: manual target; generated code committed to git @@ -359,7 +333,6 @@ xo_add_genfacetimpl( INPUT idl/IGCObject_DSequenceExpr.json5 OUTPUT_HPP_DIR include/xo/expression2 OUTPUT_IMPL_SUBDIR detail - OUTPUT_CPP_DIR src/expression2 ) # note: manual target; generated code committed to git @@ -371,7 +344,6 @@ xo_add_genfacetimpl( INPUT idl/IPrintable_DSequenceExpr.json5 OUTPUT_HPP_DIR include/xo/expression2 OUTPUT_IMPL_SUBDIR detail - OUTPUT_CPP_DIR src/expression2 ) # ---------------------------------------------------------------- @@ -385,7 +357,6 @@ xo_add_genfacetimpl( INPUT idl/IGCObject_DUniqueString.json5 OUTPUT_HPP_DIR include/xo/expression2 OUTPUT_IMPL_SUBDIR detail - OUTPUT_CPP_DIR src/expression2 ) # note: manual target; generated code committed to git @@ -397,7 +368,6 @@ xo_add_genfacetimpl( INPUT idl/IPrintable_DUniqueString.json5 OUTPUT_HPP_DIR include/xo/expression2 OUTPUT_IMPL_SUBDIR detail - OUTPUT_CPP_DIR src/expression2 ) # ---------------------------------------------------------------- diff --git a/xo-expression2/idl/Expression.json5 b/xo-expression2/idl/Expression.json5 index 83ae1402..5391e89a 100644 --- a/xo-expression2/idl/Expression.json5 +++ b/xo-expression2/idl/Expression.json5 @@ -1,5 +1,6 @@ { mode: "facet", + output_cpp_dir: "src/expression2", includes: [ "\"TypeRef.hpp\"", "\"exprtype.hpp\"", ""], diff --git a/xo-expression2/idl/IExpression_DApplyExpr.json5 b/xo-expression2/idl/IExpression_DApplyExpr.json5 index 6814547c..353a7147 100644 --- a/xo-expression2/idl/IExpression_DApplyExpr.json5 +++ b/xo-expression2/idl/IExpression_DApplyExpr.json5 @@ -1,5 +1,6 @@ { mode: "implementation", + output_cpp_dir: "src/expression2", includes: [ "\"Expression.hpp\"" ], local_types: [ ], namespace1: "xo", diff --git a/xo-expression2/idl/IExpression_DConstant.json5 b/xo-expression2/idl/IExpression_DConstant.json5 index d7628f81..3e491f2b 100644 --- a/xo-expression2/idl/IExpression_DConstant.json5 +++ b/xo-expression2/idl/IExpression_DConstant.json5 @@ -1,5 +1,6 @@ { mode: "implementation", + output_cpp_dir: "src/expression2", includes: [ "\"Expression.hpp\"" ], local_types: [ ], namespace1: "xo", diff --git a/xo-expression2/idl/IExpression_DDefineExpr.json5 b/xo-expression2/idl/IExpression_DDefineExpr.json5 index ff35d6d6..28940c7b 100644 --- a/xo-expression2/idl/IExpression_DDefineExpr.json5 +++ b/xo-expression2/idl/IExpression_DDefineExpr.json5 @@ -1,5 +1,6 @@ { mode: "implementation", + output_cpp_dir: "src/expression2", includes: [ "\"Expression.hpp\"" ], local_types: [ ], namespace1: "xo", diff --git a/xo-expression2/idl/IExpression_DIfElseExpr.json5 b/xo-expression2/idl/IExpression_DIfElseExpr.json5 index ed2fb1e8..39c6cd70 100644 --- a/xo-expression2/idl/IExpression_DIfElseExpr.json5 +++ b/xo-expression2/idl/IExpression_DIfElseExpr.json5 @@ -1,5 +1,6 @@ { mode: "implementation", + output_cpp_dir: "src/expression2", includes: [ "\"Expression.hpp\"" ], local_types: [ ], namespace1: "xo", diff --git a/xo-expression2/idl/IExpression_DLambdaExpr.json5 b/xo-expression2/idl/IExpression_DLambdaExpr.json5 index ef1b6704..675d6d9f 100644 --- a/xo-expression2/idl/IExpression_DLambdaExpr.json5 +++ b/xo-expression2/idl/IExpression_DLambdaExpr.json5 @@ -1,5 +1,6 @@ { mode: "implementation", + output_cpp_dir: "src/expression2", includes: [ "\"Expression.hpp\"" ], local_types: [ ], namespace1: "xo", diff --git a/xo-expression2/idl/IExpression_DSequenceExpr.json5 b/xo-expression2/idl/IExpression_DSequenceExpr.json5 index 451d39f1..5c5f1b9a 100644 --- a/xo-expression2/idl/IExpression_DSequenceExpr.json5 +++ b/xo-expression2/idl/IExpression_DSequenceExpr.json5 @@ -1,5 +1,6 @@ { mode: "implementation", + output_cpp_dir: "src/expression2", includes: [ "\"Expression.hpp\"" ], local_types: [ ], namespace1: "xo", diff --git a/xo-expression2/idl/IExpression_DVarRef.json5 b/xo-expression2/idl/IExpression_DVarRef.json5 index 8dea30e5..89ee50d8 100644 --- a/xo-expression2/idl/IExpression_DVarRef.json5 +++ b/xo-expression2/idl/IExpression_DVarRef.json5 @@ -1,5 +1,6 @@ { mode: "implementation", + output_cpp_dir: "src/expression2", includes: [ "\"Expression.hpp\"" ], local_types: [ ], namespace1: "xo", diff --git a/xo-expression2/idl/IExpression_DVariable.json5 b/xo-expression2/idl/IExpression_DVariable.json5 index 6e7993d3..f22f7d4b 100644 --- a/xo-expression2/idl/IExpression_DVariable.json5 +++ b/xo-expression2/idl/IExpression_DVariable.json5 @@ -1,5 +1,6 @@ { mode: "implementation", + output_cpp_dir: "src/expression2", includes: [ "\"Expression.hpp\"" ], local_types: [ ], namespace1: "xo", diff --git a/xo-expression2/idl/IGCObject_DApplyExpr.json5 b/xo-expression2/idl/IGCObject_DApplyExpr.json5 index 4bf4304b..9946116a 100644 --- a/xo-expression2/idl/IGCObject_DApplyExpr.json5 +++ b/xo-expression2/idl/IGCObject_DApplyExpr.json5 @@ -1,5 +1,6 @@ { mode: "implementation", + output_cpp_dir: "src/expression2", includes: [ "", "" diff --git a/xo-expression2/idl/IGCObject_DConstant.json5 b/xo-expression2/idl/IGCObject_DConstant.json5 index f67c5b52..1c97456e 100644 --- a/xo-expression2/idl/IGCObject_DConstant.json5 +++ b/xo-expression2/idl/IGCObject_DConstant.json5 @@ -1,5 +1,6 @@ { mode: "implementation", + output_cpp_dir: "src/expression2", includes: [ "", "" diff --git a/xo-expression2/idl/IGCObject_DIfElseExpr.json5 b/xo-expression2/idl/IGCObject_DIfElseExpr.json5 index 1c5d0661..751c0b9f 100644 --- a/xo-expression2/idl/IGCObject_DIfElseExpr.json5 +++ b/xo-expression2/idl/IGCObject_DIfElseExpr.json5 @@ -1,5 +1,6 @@ { mode: "implementation", + output_cpp_dir: "src/expression2", includes: [ "", "" diff --git a/xo-expression2/idl/IGCObject_DLambdaExpr.json5 b/xo-expression2/idl/IGCObject_DLambdaExpr.json5 index b35ad45e..506feb48 100644 --- a/xo-expression2/idl/IGCObject_DLambdaExpr.json5 +++ b/xo-expression2/idl/IGCObject_DLambdaExpr.json5 @@ -1,5 +1,6 @@ { mode: "implementation", + output_cpp_dir: "src/expression2", includes: [ "", "" diff --git a/xo-expression2/idl/IGCObject_DLocalSymtab.json5 b/xo-expression2/idl/IGCObject_DLocalSymtab.json5 index 03705f5e..ca815ee0 100644 --- a/xo-expression2/idl/IGCObject_DLocalSymtab.json5 +++ b/xo-expression2/idl/IGCObject_DLocalSymtab.json5 @@ -1,5 +1,6 @@ { mode: "implementation", + output_cpp_dir: "src/expression2", includes: [ "", "" diff --git a/xo-expression2/idl/IGCObject_DSequenceExpr.json5 b/xo-expression2/idl/IGCObject_DSequenceExpr.json5 index d3bf4aef..c3bd7458 100644 --- a/xo-expression2/idl/IGCObject_DSequenceExpr.json5 +++ b/xo-expression2/idl/IGCObject_DSequenceExpr.json5 @@ -1,5 +1,6 @@ { mode: "implementation", + output_cpp_dir: "src/expression2", includes: [ "", "" diff --git a/xo-expression2/idl/IGCObject_DUniqueString.json5 b/xo-expression2/idl/IGCObject_DUniqueString.json5 index 8cf516b2..cb16d6a2 100644 --- a/xo-expression2/idl/IGCObject_DUniqueString.json5 +++ b/xo-expression2/idl/IGCObject_DUniqueString.json5 @@ -1,5 +1,6 @@ { mode: "implementation", + output_cpp_dir: "src/expression2", includes: [ "", "" diff --git a/xo-expression2/idl/IGCObject_DVarRef.json5 b/xo-expression2/idl/IGCObject_DVarRef.json5 index 3101a035..1a46f47e 100644 --- a/xo-expression2/idl/IGCObject_DVarRef.json5 +++ b/xo-expression2/idl/IGCObject_DVarRef.json5 @@ -1,5 +1,6 @@ { mode: "implementation", + output_cpp_dir: "src/expression2", includes: [ "", "" diff --git a/xo-expression2/idl/IGCObject_DVariable.json5 b/xo-expression2/idl/IGCObject_DVariable.json5 index 7327507f..84a47d01 100644 --- a/xo-expression2/idl/IGCObject_DVariable.json5 +++ b/xo-expression2/idl/IGCObject_DVariable.json5 @@ -1,5 +1,6 @@ { mode: "implementation", + output_cpp_dir: "src/expression2", includes: [ "", "" diff --git a/xo-expression2/idl/IPrintable_DApplyExpr.json5 b/xo-expression2/idl/IPrintable_DApplyExpr.json5 index fe743b0b..88a3fef7 100644 --- a/xo-expression2/idl/IPrintable_DApplyExpr.json5 +++ b/xo-expression2/idl/IPrintable_DApplyExpr.json5 @@ -1,5 +1,6 @@ { mode: "implementation", + output_cpp_dir: "src/expression2", includes: [ "", "" ], local_types: [ ], diff --git a/xo-expression2/idl/IPrintable_DConstant.json5 b/xo-expression2/idl/IPrintable_DConstant.json5 index 1d955d79..9e4e1ad0 100644 --- a/xo-expression2/idl/IPrintable_DConstant.json5 +++ b/xo-expression2/idl/IPrintable_DConstant.json5 @@ -1,5 +1,6 @@ { mode: "implementation", + output_cpp_dir: "src/expression2", includes: [ "", "" ], local_types: [ ], diff --git a/xo-expression2/idl/IPrintable_DDefineExpr.json5 b/xo-expression2/idl/IPrintable_DDefineExpr.json5 index 351f8caf..89c2fdff 100644 --- a/xo-expression2/idl/IPrintable_DDefineExpr.json5 +++ b/xo-expression2/idl/IPrintable_DDefineExpr.json5 @@ -1,5 +1,6 @@ { mode: "implementation", + output_cpp_dir: "src/expression2", includes: [ "", "" ], local_types: [ ], diff --git a/xo-expression2/idl/IPrintable_DIfElseExpr.json5 b/xo-expression2/idl/IPrintable_DIfElseExpr.json5 index a8011385..90f02307 100644 --- a/xo-expression2/idl/IPrintable_DIfElseExpr.json5 +++ b/xo-expression2/idl/IPrintable_DIfElseExpr.json5 @@ -1,5 +1,6 @@ { mode: "implementation", + output_cpp_dir: "src/expression2", includes: [ "", "" ], local_types: [ ], diff --git a/xo-expression2/idl/IPrintable_DLambdaExpr.json5 b/xo-expression2/idl/IPrintable_DLambdaExpr.json5 index 02a09424..60e0397e 100644 --- a/xo-expression2/idl/IPrintable_DLambdaExpr.json5 +++ b/xo-expression2/idl/IPrintable_DLambdaExpr.json5 @@ -1,5 +1,6 @@ { mode: "implementation", + output_cpp_dir: "src/expression2", includes: [ "", "" ], local_types: [ ], diff --git a/xo-expression2/idl/IPrintable_DLocalSymtab.json5 b/xo-expression2/idl/IPrintable_DLocalSymtab.json5 index 3f17e64e..5d48e5f4 100644 --- a/xo-expression2/idl/IPrintable_DLocalSymtab.json5 +++ b/xo-expression2/idl/IPrintable_DLocalSymtab.json5 @@ -1,5 +1,6 @@ { mode: "implementation", + output_cpp_dir: "src/expression2", includes: [ "", "" ], local_types: [ ], diff --git a/xo-expression2/idl/IPrintable_DSequenceExpr.json5 b/xo-expression2/idl/IPrintable_DSequenceExpr.json5 index 34154a1e..1b45094f 100644 --- a/xo-expression2/idl/IPrintable_DSequenceExpr.json5 +++ b/xo-expression2/idl/IPrintable_DSequenceExpr.json5 @@ -1,5 +1,6 @@ { mode: "implementation", + output_cpp_dir: "src/expression2", includes: [ "", "" ], local_types: [ ], diff --git a/xo-expression2/idl/IPrintable_DUniqueString.json5 b/xo-expression2/idl/IPrintable_DUniqueString.json5 index 540f7b71..d640ce9c 100644 --- a/xo-expression2/idl/IPrintable_DUniqueString.json5 +++ b/xo-expression2/idl/IPrintable_DUniqueString.json5 @@ -1,5 +1,6 @@ { mode: "implementation", + output_cpp_dir: "src/expression2", includes: [ "", "" ], local_types: [ ], diff --git a/xo-expression2/idl/IPrintable_DVarRef.json5 b/xo-expression2/idl/IPrintable_DVarRef.json5 index d525886c..0d73c1d9 100644 --- a/xo-expression2/idl/IPrintable_DVarRef.json5 +++ b/xo-expression2/idl/IPrintable_DVarRef.json5 @@ -1,5 +1,6 @@ { mode: "implementation", + output_cpp_dir: "src/expression2", includes: [ "", "" ], local_types: [ ], diff --git a/xo-expression2/idl/IPrintable_DVariable.json5 b/xo-expression2/idl/IPrintable_DVariable.json5 index 52c301b2..8e88cde0 100644 --- a/xo-expression2/idl/IPrintable_DVariable.json5 +++ b/xo-expression2/idl/IPrintable_DVariable.json5 @@ -1,5 +1,6 @@ { mode: "implementation", + output_cpp_dir: "src/expression2", includes: [ "", "" ], local_types: [ ], diff --git a/xo-expression2/idl/ISymbolTable_DLocalSymtab.json5 b/xo-expression2/idl/ISymbolTable_DLocalSymtab.json5 index 026c0ed1..ff46c622 100644 --- a/xo-expression2/idl/ISymbolTable_DLocalSymtab.json5 +++ b/xo-expression2/idl/ISymbolTable_DLocalSymtab.json5 @@ -1,5 +1,6 @@ { mode: "implementation", + output_cpp_dir: "src/expression2", includes: [ ], local_types: [ ], namespace1: "xo", diff --git a/xo-expression2/idl/SymbolTable.json5 b/xo-expression2/idl/SymbolTable.json5 index 4d7dc2a4..9cd6e45b 100644 --- a/xo-expression2/idl/SymbolTable.json5 +++ b/xo-expression2/idl/SymbolTable.json5 @@ -1,5 +1,6 @@ { mode: "facet", + output_cpp_dir: "src/expression2", includes: [ "\"Binding.hpp\"", "\"DUniqueString.hpp\"" diff --git a/xo-gc/CMakeLists.txt b/xo-gc/CMakeLists.txt index c0bf8418..59f13d7e 100644 --- a/xo-gc/CMakeLists.txt +++ b/xo-gc/CMakeLists.txt @@ -25,7 +25,6 @@ xo_add_genfacet( INPUT idl/GCObject.json5 OUTPUT_HPP_DIR include/xo/gc OUTPUT_IMPL_SUBDIR detail - OUTPUT_CPP_DIR src/gc ) # ---------------------------------------------------------------- diff --git a/xo-gc/idl/GCObject.json5 b/xo-gc/idl/GCObject.json5 index 30fc0d3a..242bea1e 100644 --- a/xo-gc/idl/GCObject.json5 +++ b/xo-gc/idl/GCObject.json5 @@ -1,5 +1,6 @@ { mode: "facet", + output_cpp_dir: "src/gc", includes: [ "", "", diff --git a/xo-gc/include/xo/gc/GCObject.hpp b/xo-gc/include/xo/gc/GCObject.hpp index 970d2c31..c40ffb3a 100644 --- a/xo-gc/include/xo/gc/GCObject.hpp +++ b/xo-gc/include/xo/gc/GCObject.hpp @@ -2,7 +2,7 @@ * * Generated automagically from ingredients: * 1. code generator: - * [/Users/roland/proj/xo-umbrella2/xo-facet/codegen/genfacet] + * [xo-facet/codegen/genfacet] * arguments: * --input [idl/GCObject.json5] * 2. jinja2 template for facet .hpp file: @@ -45,4 +45,3 @@ namespace xo { } /* end GCObject.hpp */ - diff --git a/xo-gc/include/xo/gc/detail/AGCObject.hpp b/xo-gc/include/xo/gc/detail/AGCObject.hpp index ab6b4096..98f7e258 100644 --- a/xo-gc/include/xo/gc/detail/AGCObject.hpp +++ b/xo-gc/include/xo/gc/detail/AGCObject.hpp @@ -2,7 +2,7 @@ * * Generated automagically from ingredients: * 1. code generator: - * [/Users/roland/proj/xo-umbrella2/xo-facet/codegen/genfacet] + * [xo-facet/codegen/genfacet] * arguments: * --input [idl/GCObject.json5] * 2. jinja2 template for abstract facet .hpp file: @@ -55,6 +55,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; /** memory consumption for this instance **/ virtual size_type shallow_size(Copaque data) const noexcept = 0; /** copy instance using allocator **/ @@ -82,4 +84,4 @@ using IGCObject_ImplType = xo::facet::FacetImplType; } /*namespace mm*/ } /*namespace xo*/ -/* AGCObject.hpp */ \ No newline at end of file +/* AGCObject.hpp */ diff --git a/xo-gc/include/xo/gc/detail/IGCObject_Any.hpp b/xo-gc/include/xo/gc/detail/IGCObject_Any.hpp index e1b274a7..9ff7bb2e 100644 --- a/xo-gc/include/xo/gc/detail/IGCObject_Any.hpp +++ b/xo-gc/include/xo/gc/detail/IGCObject_Any.hpp @@ -2,7 +2,7 @@ * * Generated automagically from ingredients: * 1. code generator: - * [/Users/roland/proj/xo-umbrella2/xo-facet/codegen/genfacet] + * [xo-facet/codegen/genfacet] * arguments: * --input [idl/GCObject.json5] * 2. jinja2 template for abstract facet .hpp file: @@ -56,8 +56,11 @@ namespace mm { // from AGCObject - // const methods + // builtin methods typeseq _typeseq() const noexcept override { return s_typeseq; } + [[noreturn]] void _drop(Opaque) const noexcept override { _fatal(); } + + // const methods [[noreturn]] size_type shallow_size(Copaque) const noexcept override { _fatal(); } [[noreturn]] Opaque shallow_copy(Copaque, obj) const noexcept override { _fatal(); } @@ -87,4 +90,4 @@ namespace mm { } /*namespace mm */ } /*namespace xo */ -/* IGCObject_Any.hpp */ \ No newline at end of file +/* IGCObject_Any.hpp */ diff --git a/xo-gc/include/xo/gc/detail/IGCObject_Xfer.hpp b/xo-gc/include/xo/gc/detail/IGCObject_Xfer.hpp index d25eb81e..7f094ab7 100644 --- a/xo-gc/include/xo/gc/detail/IGCObject_Xfer.hpp +++ b/xo-gc/include/xo/gc/detail/IGCObject_Xfer.hpp @@ -2,7 +2,7 @@ * * Generated automagically from ingredients: * 1. code generator: - * [/Users/roland/proj/xo-umbrella2/xo-facet/codegen/genfacet] + * [xo-facet/codegen/genfacet] * arguments: * --input [idl/GCObject.json5] * 2. jinja2 template for abstract facet .hpp file: @@ -44,8 +44,11 @@ namespace mm { // from AGCObject - // const methods + // builtin methods typeseq _typeseq() const noexcept override { return s_typeseq; } + void _drop(Opaque d) const noexcept override { _dcast(d).~DRepr(); } + + // const methods size_type shallow_size(Copaque data) const noexcept override { return I::shallow_size(_dcast(data)); } @@ -89,4 +92,4 @@ namespace mm { } /*namespace mm */ } /*namespace xo*/ -/* end IGCObject_Xfer.hpp */ \ No newline at end of file +/* end IGCObject_Xfer.hpp */ diff --git a/xo-gc/include/xo/gc/detail/RGCObject.hpp b/xo-gc/include/xo/gc/detail/RGCObject.hpp index ab4bcc54..d24994a8 100644 --- a/xo-gc/include/xo/gc/detail/RGCObject.hpp +++ b/xo-gc/include/xo/gc/detail/RGCObject.hpp @@ -2,7 +2,7 @@ * * Generated automagically from ingredients: * 1. code generator: - * [/Users/roland/proj/xo-umbrella2/xo-facet/codegen/genfacet] + * [xo-facet/codegen/genfacet] * arguments: * --input [idl/GCObject.json5] * 2. jinja2 template for abstract facet .hpp file: @@ -48,8 +48,13 @@ public: /** @defgroup mm-gcobject-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 size_type shallow_size() const noexcept { return O::iface()->shallow_size(O::data()); } diff --git a/xo-gc/src/gc/IGCObject_Any.cpp b/xo-gc/src/gc/IGCObject_Any.cpp index ff6d395d..778760ad 100644 --- a/xo-gc/src/gc/IGCObject_Any.cpp +++ b/xo-gc/src/gc/IGCObject_Any.cpp @@ -44,4 +44,4 @@ IGCObject_Any::forward_children(Opaque, obj) const noexcept -> siz } /*namespace mm*/ } /*namespace xo*/ -/* end IGCObject_Any.cpp */ \ No newline at end of file +/* end IGCObject_Any.cpp */ diff --git a/xo-interpreter2/CMakeLists.txt b/xo-interpreter2/CMakeLists.txt index 0b5431ba..28debaa0 100644 --- a/xo-interpreter2/CMakeLists.txt +++ b/xo-interpreter2/CMakeLists.txt @@ -34,7 +34,6 @@ xo_add_genfacetimpl( INPUT idl/IGCObject_DVsmApplyFrame.json5 OUTPUT_HPP_DIR include/xo/interpreter2 OUTPUT_IMPL_SUBDIR detail - OUTPUT_CPP_DIR src/interpreter2 ) # note: manual target; generated code committed to git @@ -46,7 +45,6 @@ xo_add_genfacetimpl( INPUT idl/IPrintable_DVsmApplyFrame.json5 OUTPUT_HPP_DIR include/xo/interpreter2 OUTPUT_IMPL_SUBDIR detail - OUTPUT_CPP_DIR src/interpreter2 ) # ---------------------------------------------------------------- @@ -60,7 +58,6 @@ xo_add_genfacetimpl( INPUT idl/IGCObject_DVsmEvalArgsFrame.json5 OUTPUT_HPP_DIR include/xo/interpreter2 OUTPUT_IMPL_SUBDIR detail - OUTPUT_CPP_DIR src/interpreter2 ) # note: manual target; generated code committed to git @@ -72,7 +69,6 @@ xo_add_genfacetimpl( INPUT idl/IPrintable_DVsmEvalArgsFrame.json5 OUTPUT_HPP_DIR include/xo/interpreter2 OUTPUT_IMPL_SUBDIR detail - OUTPUT_CPP_DIR src/interpreter2 ) # ---------------------------------------------------------------- @@ -86,7 +82,6 @@ xo_add_genfacetimpl( INPUT idl/IGCObject_DVsmApplyClosureFrame.json5 OUTPUT_HPP_DIR include/xo/interpreter2 OUTPUT_IMPL_SUBDIR detail - OUTPUT_CPP_DIR src/interpreter2 ) # note: manual target; generated code committed to git @@ -98,7 +93,6 @@ xo_add_genfacetimpl( INPUT idl/IPrintable_DVsmApplyClosureFrame.json5 OUTPUT_HPP_DIR include/xo/interpreter2 OUTPUT_IMPL_SUBDIR detail - OUTPUT_CPP_DIR src/interpreter2 ) # ---------------------------------------------------------------- @@ -112,7 +106,6 @@ xo_add_genfacetimpl( INPUT idl/IGCObject_DVsmIfElseContFrame.json5 OUTPUT_HPP_DIR include/xo/interpreter2 OUTPUT_IMPL_SUBDIR ifelse - OUTPUT_CPP_DIR src/interpreter2 ) # note: manual target; generated code committed to git @@ -124,7 +117,6 @@ xo_add_genfacetimpl( INPUT idl/IPrintable_DVsmIfElseContFrame.json5 OUTPUT_HPP_DIR include/xo/interpreter2 OUTPUT_IMPL_SUBDIR ifelse - OUTPUT_CPP_DIR src/interpreter2 ) # ---------------------------------------------------------------- @@ -138,7 +130,6 @@ xo_add_genfacetimpl( INPUT idl/IGCObject_DVsmSeqContFrame.json5 OUTPUT_HPP_DIR include/xo/interpreter2 OUTPUT_IMPL_SUBDIR sequence - OUTPUT_CPP_DIR src/interpreter2 ) # note: manual target; generated code committed to git @@ -150,7 +141,6 @@ xo_add_genfacetimpl( INPUT idl/IPrintable_DVsmSeqContFrame.json5 OUTPUT_HPP_DIR include/xo/interpreter2 OUTPUT_IMPL_SUBDIR sequence - OUTPUT_CPP_DIR src/interpreter2 ) # ---------------------------------------------------------------- @@ -165,7 +155,6 @@ xo_add_genfacetimpl( # 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 @@ -177,7 +166,6 @@ xo_add_genfacetimpl( 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 @@ -189,7 +177,6 @@ xo_add_genfacetimpl( INPUT idl/IPrintable_DClosure.json5 OUTPUT_HPP_DIR include/xo/interpreter2 OUTPUT_IMPL_SUBDIR detail - OUTPUT_CPP_DIR src/interpreter2 ) # ---------------------------------------------------------------- @@ -203,7 +190,6 @@ xo_add_genfacetimpl( INPUT idl/IGCObject_DLocalEnv.json5 OUTPUT_HPP_DIR include/xo/interpreter2 OUTPUT_IMPL_SUBDIR detail - OUTPUT_CPP_DIR src/interpreter2 ) # note: manual target; generated code committed to git @@ -215,7 +201,6 @@ xo_add_genfacetimpl( INPUT idl/IPrintable_DLocalEnv.json5 OUTPUT_HPP_DIR include/xo/interpreter2 OUTPUT_IMPL_SUBDIR detail - OUTPUT_CPP_DIR src/interpreter2 ) # ---------------------------------------------------------------- @@ -228,7 +213,6 @@ xo_add_genfacetimpl( INPUT idl/IRuntimeContext_DVsmRcx.json5 OUTPUT_HPP_DIR include/xo/interpreter2 OUTPUT_IMPL_SUBDIR detail - OUTPUT_CPP_DIR src/interpreter2 ) # ---------------------------------------------------------------- diff --git a/xo-interpreter2/idl/IGCObject_DClosure.json5 b/xo-interpreter2/idl/IGCObject_DClosure.json5 index ec9f32fd..9e99a16b 100644 --- a/xo-interpreter2/idl/IGCObject_DClosure.json5 +++ b/xo-interpreter2/idl/IGCObject_DClosure.json5 @@ -1,5 +1,6 @@ { mode: "implementation", + output_cpp_dir: "src/interpreter2", includes: [ "", "" diff --git a/xo-interpreter2/idl/IGCObject_DLocalEnv.json5 b/xo-interpreter2/idl/IGCObject_DLocalEnv.json5 index 3c747621..fe8670f1 100644 --- a/xo-interpreter2/idl/IGCObject_DLocalEnv.json5 +++ b/xo-interpreter2/idl/IGCObject_DLocalEnv.json5 @@ -1,5 +1,6 @@ { mode: "implementation", + output_cpp_dir: "src/interpreter2", includes: [ "", "" diff --git a/xo-interpreter2/idl/IGCObject_DVsmApplyClosureFrame.json5 b/xo-interpreter2/idl/IGCObject_DVsmApplyClosureFrame.json5 index 398d53e9..4cced151 100644 --- a/xo-interpreter2/idl/IGCObject_DVsmApplyClosureFrame.json5 +++ b/xo-interpreter2/idl/IGCObject_DVsmApplyClosureFrame.json5 @@ -1,5 +1,6 @@ { mode: "implementation", + output_cpp_dir: "src/interpreter2", includes: [ "", "" diff --git a/xo-interpreter2/idl/IGCObject_DVsmApplyFrame.json5 b/xo-interpreter2/idl/IGCObject_DVsmApplyFrame.json5 index 979c14bf..175b229e 100644 --- a/xo-interpreter2/idl/IGCObject_DVsmApplyFrame.json5 +++ b/xo-interpreter2/idl/IGCObject_DVsmApplyFrame.json5 @@ -1,5 +1,6 @@ { mode: "implementation", + output_cpp_dir: "src/interpreter2", includes: [ "", "" diff --git a/xo-interpreter2/idl/IGCObject_DVsmEvalArgsFrame.json5 b/xo-interpreter2/idl/IGCObject_DVsmEvalArgsFrame.json5 index 8bebc6ec..7d89a5ed 100644 --- a/xo-interpreter2/idl/IGCObject_DVsmEvalArgsFrame.json5 +++ b/xo-interpreter2/idl/IGCObject_DVsmEvalArgsFrame.json5 @@ -1,5 +1,6 @@ { mode: "implementation", + output_cpp_dir: "src/interpreter2", includes: [ "", "" diff --git a/xo-interpreter2/idl/IGCObject_DVsmIfElseContFrame.json5 b/xo-interpreter2/idl/IGCObject_DVsmIfElseContFrame.json5 index 0f78bb6d..537c9860 100644 --- a/xo-interpreter2/idl/IGCObject_DVsmIfElseContFrame.json5 +++ b/xo-interpreter2/idl/IGCObject_DVsmIfElseContFrame.json5 @@ -1,5 +1,6 @@ { mode: "implementation", + output_cpp_dir: "src/interpreter2", includes: [ "", "" diff --git a/xo-interpreter2/idl/IGCObject_DVsmSeqContFrame.json5 b/xo-interpreter2/idl/IGCObject_DVsmSeqContFrame.json5 index cf7196c6..6945f3df 100644 --- a/xo-interpreter2/idl/IGCObject_DVsmSeqContFrame.json5 +++ b/xo-interpreter2/idl/IGCObject_DVsmSeqContFrame.json5 @@ -1,5 +1,6 @@ { mode: "implementation", + output_cpp_dir: "src/interpreter2", includes: [ "", "" diff --git a/xo-interpreter2/idl/IPrintable_DClosure.json5 b/xo-interpreter2/idl/IPrintable_DClosure.json5 index d4b16a69..2cfb3d33 100644 --- a/xo-interpreter2/idl/IPrintable_DClosure.json5 +++ b/xo-interpreter2/idl/IPrintable_DClosure.json5 @@ -1,5 +1,6 @@ { mode: "implementation", + output_cpp_dir: "src/interpreter2", includes: [ "", "" ], local_types: [ ], diff --git a/xo-interpreter2/idl/IPrintable_DLocalEnv.json5 b/xo-interpreter2/idl/IPrintable_DLocalEnv.json5 index 0302834d..0a1205f5 100644 --- a/xo-interpreter2/idl/IPrintable_DLocalEnv.json5 +++ b/xo-interpreter2/idl/IPrintable_DLocalEnv.json5 @@ -1,5 +1,6 @@ { mode: "implementation", + output_cpp_dir: "src/interpreter2", includes: [ "", "" ], local_types: [ ], diff --git a/xo-interpreter2/idl/IPrintable_DVsmApplyClosureFrame.json5 b/xo-interpreter2/idl/IPrintable_DVsmApplyClosureFrame.json5 index 717aa85f..ee4e8e64 100644 --- a/xo-interpreter2/idl/IPrintable_DVsmApplyClosureFrame.json5 +++ b/xo-interpreter2/idl/IPrintable_DVsmApplyClosureFrame.json5 @@ -1,5 +1,6 @@ { mode: "implementation", + output_cpp_dir: "src/interpreter2", includes: [ "", "" ], local_types: [ ], diff --git a/xo-interpreter2/idl/IPrintable_DVsmApplyFrame.json5 b/xo-interpreter2/idl/IPrintable_DVsmApplyFrame.json5 index f5957d7e..c78e0b88 100644 --- a/xo-interpreter2/idl/IPrintable_DVsmApplyFrame.json5 +++ b/xo-interpreter2/idl/IPrintable_DVsmApplyFrame.json5 @@ -1,5 +1,6 @@ { mode: "implementation", + output_cpp_dir: "src/interpreter2", includes: [ "", "" ], local_types: [ ], diff --git a/xo-interpreter2/idl/IPrintable_DVsmEvalArgsFrame.json5 b/xo-interpreter2/idl/IPrintable_DVsmEvalArgsFrame.json5 index 24df6cbd..1dd1672a 100644 --- a/xo-interpreter2/idl/IPrintable_DVsmEvalArgsFrame.json5 +++ b/xo-interpreter2/idl/IPrintable_DVsmEvalArgsFrame.json5 @@ -1,5 +1,6 @@ { mode: "implementation", + output_cpp_dir: "src/interpreter2", includes: [ "", "" ], local_types: [ ], diff --git a/xo-interpreter2/idl/IPrintable_DVsmIfElseContFrame.json5 b/xo-interpreter2/idl/IPrintable_DVsmIfElseContFrame.json5 index d3d63c4d..b9f70e6d 100644 --- a/xo-interpreter2/idl/IPrintable_DVsmIfElseContFrame.json5 +++ b/xo-interpreter2/idl/IPrintable_DVsmIfElseContFrame.json5 @@ -1,5 +1,6 @@ { mode: "implementation", + output_cpp_dir: "src/interpreter2", includes: [ "", "" ], local_types: [ ], diff --git a/xo-interpreter2/idl/IPrintable_DVsmSeqContFrame.json5 b/xo-interpreter2/idl/IPrintable_DVsmSeqContFrame.json5 index e9ec796e..96b9c071 100644 --- a/xo-interpreter2/idl/IPrintable_DVsmSeqContFrame.json5 +++ b/xo-interpreter2/idl/IPrintable_DVsmSeqContFrame.json5 @@ -1,5 +1,6 @@ { mode: "implementation", + output_cpp_dir: "src/interpreter2", includes: [ "", "" ], local_types: [ ], diff --git a/xo-interpreter2/idl/IRuntimeContext_DVsmRcx.json5 b/xo-interpreter2/idl/IRuntimeContext_DVsmRcx.json5 index 8659eb66..9fa3fe40 100644 --- a/xo-interpreter2/idl/IRuntimeContext_DVsmRcx.json5 +++ b/xo-interpreter2/idl/IRuntimeContext_DVsmRcx.json5 @@ -1,5 +1,6 @@ { mode: "implementation", + output_cpp_dir: "src/interpreter2", includes: [ //"", //"", diff --git a/xo-object2/CMakeLists.txt b/xo-object2/CMakeLists.txt index 2fc0ae29..09faf6b7 100644 --- a/xo-object2/CMakeLists.txt +++ b/xo-object2/CMakeLists.txt @@ -25,7 +25,6 @@ xo_add_genfacet( INPUT idl/Sequence.json5 OUTPUT_HPP_DIR include/xo/object2 OUTPUT_IMPL_SUBDIR sequence - OUTPUT_CPP_DIR src/object2 ) # ---------------------------------------------------------------- @@ -39,7 +38,6 @@ xo_add_genfacetimpl( INPUT idl/ISequence_DList.json5 OUTPUT_HPP_DIR include/xo/object2 OUTPUT_IMPL_SUBDIR list - OUTPUT_CPP_DIR src/object2 ) # note: manual target; generated code committed to git @@ -51,7 +49,6 @@ xo_add_genfacetimpl( INPUT idl/IPrintable_DList.json5 OUTPUT_HPP_DIR include/xo/object2 OUTPUT_IMPL_SUBDIR list - OUTPUT_CPP_DIR src/object2 ) # note: manual target; generated code committed to git @@ -63,7 +60,6 @@ xo_add_genfacetimpl( INPUT idl/IGCObject_DList.json5 OUTPUT_HPP_DIR include/xo/object2 OUTPUT_IMPL_SUBDIR list - OUTPUT_CPP_DIR src/object2 ) # ---------------------------------------------------------------- @@ -77,7 +73,6 @@ xo_add_genfacetimpl( INPUT idl/IPrintable_DBoolean.json5 OUTPUT_HPP_DIR include/xo/object2 OUTPUT_IMPL_SUBDIR boolean - OUTPUT_CPP_DIR src/object2 ) # note: manual target; generated code committed to git @@ -89,7 +84,6 @@ xo_add_genfacetimpl( INPUT idl/IGCObject_DBoolean.json5 OUTPUT_HPP_DIR include/xo/object2 OUTPUT_IMPL_SUBDIR boolean - OUTPUT_CPP_DIR src/object2 ) # ---------------------------------------------------------------- @@ -103,7 +97,6 @@ xo_add_genfacetimpl( INPUT idl/IPrintable_DFloat.json5 OUTPUT_HPP_DIR include/xo/object2 OUTPUT_IMPL_SUBDIR number - OUTPUT_CPP_DIR src/object2 ) # note: manual target; generated code committed to git @@ -115,7 +108,6 @@ xo_add_genfacetimpl( INPUT idl/IGCObject_DFloat.json5 OUTPUT_HPP_DIR include/xo/object2 OUTPUT_IMPL_SUBDIR number - OUTPUT_CPP_DIR src/object2 ) # ---------------------------------------------------------------- @@ -129,7 +121,6 @@ xo_add_genfacetimpl( INPUT idl/IPrintable_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 @@ -141,7 +132,6 @@ xo_add_genfacetimpl( INPUT idl/IGCObject_DInteger.json5 OUTPUT_HPP_DIR include/xo/object2 OUTPUT_IMPL_SUBDIR number - OUTPUT_CPP_DIR src/object2 ) # ---------------------------------------------------------------- @@ -155,7 +145,6 @@ xo_add_genfacetimpl( INPUT idl/IPrintable_DString.json5 OUTPUT_HPP_DIR include/xo/object2 OUTPUT_IMPL_SUBDIR string - OUTPUT_CPP_DIR src/object2 ) # note: manual target; generated code committed to git @@ -167,7 +156,6 @@ xo_add_genfacetimpl( INPUT idl/IGCObject_DString.json5 OUTPUT_HPP_DIR include/xo/object2 OUTPUT_IMPL_SUBDIR string - OUTPUT_CPP_DIR src/object2 ) # ---------------------------------------------------------------- @@ -181,7 +169,6 @@ xo_add_genfacetimpl( INPUT idl/ISequence_DArray.json5 OUTPUT_HPP_DIR include/xo/object2 OUTPUT_IMPL_SUBDIR array - OUTPUT_CPP_DIR src/object2 ) # note: manual target; generated code committed to git @@ -193,7 +180,6 @@ xo_add_genfacetimpl( INPUT idl/IPrintable_DArray.json5 OUTPUT_HPP_DIR include/xo/object2 OUTPUT_IMPL_SUBDIR array - OUTPUT_CPP_DIR src/object2 ) # note: manual target; generated code committed to git @@ -205,7 +191,6 @@ xo_add_genfacetimpl( INPUT idl/IGCObject_DArray.json5 OUTPUT_HPP_DIR include/xo/object2 OUTPUT_IMPL_SUBDIR array - OUTPUT_CPP_DIR src/object2 ) # ---------------------------------------------------------------- @@ -219,7 +204,6 @@ xo_add_genfacetimpl( INPUT idl/IPrintable_DRuntimeError.json5 OUTPUT_HPP_DIR include/xo/object2 OUTPUT_IMPL_SUBDIR error - OUTPUT_CPP_DIR src/object2 ) # note: manual target; generated code committed to git @@ -231,7 +215,6 @@ xo_add_genfacetimpl( INPUT idl/IGCObject_DRuntimeError.json5 OUTPUT_HPP_DIR include/xo/object2 OUTPUT_IMPL_SUBDIR error - OUTPUT_CPP_DIR src/object2 ) # ---------------------------------------------------------------- diff --git a/xo-object2/idl/IGCObject_DArray.json5 b/xo-object2/idl/IGCObject_DArray.json5 index e8aeed3b..3e1115e0 100644 --- a/xo-object2/idl/IGCObject_DArray.json5 +++ b/xo-object2/idl/IGCObject_DArray.json5 @@ -1,5 +1,6 @@ { mode: "implementation", + output_cpp_dir: "src/object2", includes: [ "", "" diff --git a/xo-object2/idl/IGCObject_DBoolean.json5 b/xo-object2/idl/IGCObject_DBoolean.json5 index de3663c4..be131a38 100644 --- a/xo-object2/idl/IGCObject_DBoolean.json5 +++ b/xo-object2/idl/IGCObject_DBoolean.json5 @@ -1,5 +1,6 @@ { mode: "implementation", + output_cpp_dir: "src/object2", includes: [ "", "" diff --git a/xo-object2/idl/IGCObject_DFloat.json5 b/xo-object2/idl/IGCObject_DFloat.json5 index 9aba2a34..2791de0b 100644 --- a/xo-object2/idl/IGCObject_DFloat.json5 +++ b/xo-object2/idl/IGCObject_DFloat.json5 @@ -1,5 +1,6 @@ { mode: "implementation", + output_cpp_dir: "src/object2", includes: [ "", "", diff --git a/xo-object2/idl/IGCObject_DInteger.json5 b/xo-object2/idl/IGCObject_DInteger.json5 index 65f24371..6b865a4c 100644 --- a/xo-object2/idl/IGCObject_DInteger.json5 +++ b/xo-object2/idl/IGCObject_DInteger.json5 @@ -1,5 +1,6 @@ { mode: "implementation", + output_cpp_dir: "src/object2", includes: [ "", "" diff --git a/xo-object2/idl/IGCObject_DList.json5 b/xo-object2/idl/IGCObject_DList.json5 index 342fc299..e660b0c1 100644 --- a/xo-object2/idl/IGCObject_DList.json5 +++ b/xo-object2/idl/IGCObject_DList.json5 @@ -1,5 +1,6 @@ { mode: "implementation", + output_cpp_dir: "src/object2", includes: [ // "", // "" diff --git a/xo-object2/idl/IGCObject_DRuntimeError.json5 b/xo-object2/idl/IGCObject_DRuntimeError.json5 index 9e416b24..60d30cc7 100644 --- a/xo-object2/idl/IGCObject_DRuntimeError.json5 +++ b/xo-object2/idl/IGCObject_DRuntimeError.json5 @@ -1,5 +1,6 @@ { mode: "implementation", + output_cpp_dir: "src/object2", includes: [ // "", // "" diff --git a/xo-object2/idl/IGCObject_DString.json5 b/xo-object2/idl/IGCObject_DString.json5 index 8d0e14e0..60c2165e 100644 --- a/xo-object2/idl/IGCObject_DString.json5 +++ b/xo-object2/idl/IGCObject_DString.json5 @@ -1,5 +1,6 @@ { mode: "implementation", + output_cpp_dir: "src/object2", includes: [ "", "" diff --git a/xo-object2/idl/IPrintable_DArray.json5 b/xo-object2/idl/IPrintable_DArray.json5 index df0ef171..eee19b52 100644 --- a/xo-object2/idl/IPrintable_DArray.json5 +++ b/xo-object2/idl/IPrintable_DArray.json5 @@ -1,5 +1,6 @@ { mode: "implementation", + output_cpp_dir: "src/object2", includes: [ "", "" ], local_types: [ ], diff --git a/xo-object2/idl/IPrintable_DBoolean.json5 b/xo-object2/idl/IPrintable_DBoolean.json5 index 599a1923..09245363 100644 --- a/xo-object2/idl/IPrintable_DBoolean.json5 +++ b/xo-object2/idl/IPrintable_DBoolean.json5 @@ -1,5 +1,6 @@ { mode: "implementation", + output_cpp_dir: "src/object2", includes: [ "", "" ], local_types: [ ], diff --git a/xo-object2/idl/IPrintable_DFloat.json5 b/xo-object2/idl/IPrintable_DFloat.json5 index 7351c1b2..427c5dce 100644 --- a/xo-object2/idl/IPrintable_DFloat.json5 +++ b/xo-object2/idl/IPrintable_DFloat.json5 @@ -1,5 +1,6 @@ { mode: "implementation", + output_cpp_dir: "src/object2", includes: [ "", "" ], local_types: [ ], diff --git a/xo-object2/idl/IPrintable_DInteger.json5 b/xo-object2/idl/IPrintable_DInteger.json5 index 1a2e5490..92c74376 100644 --- a/xo-object2/idl/IPrintable_DInteger.json5 +++ b/xo-object2/idl/IPrintable_DInteger.json5 @@ -1,5 +1,6 @@ { mode: "implementation", + output_cpp_dir: "src/object2", includes: [ "", "" ], local_types: [ ], diff --git a/xo-object2/idl/IPrintable_DList.json5 b/xo-object2/idl/IPrintable_DList.json5 index 640d7d1d..58b8ea82 100644 --- a/xo-object2/idl/IPrintable_DList.json5 +++ b/xo-object2/idl/IPrintable_DList.json5 @@ -1,5 +1,6 @@ { mode: "implementation", + output_cpp_dir: "src/object2", includes: [ "", "" ], local_types: [ ], diff --git a/xo-object2/idl/IPrintable_DRuntimeError.json5 b/xo-object2/idl/IPrintable_DRuntimeError.json5 index 2d0f3eff..b9e291e0 100644 --- a/xo-object2/idl/IPrintable_DRuntimeError.json5 +++ b/xo-object2/idl/IPrintable_DRuntimeError.json5 @@ -1,5 +1,6 @@ { mode: "implementation", + output_cpp_dir: "src/object2", includes: [ "", "" ], local_types: [ ], diff --git a/xo-object2/idl/IPrintable_DString.json5 b/xo-object2/idl/IPrintable_DString.json5 index f032ca46..8caffaab 100644 --- a/xo-object2/idl/IPrintable_DString.json5 +++ b/xo-object2/idl/IPrintable_DString.json5 @@ -1,5 +1,6 @@ { mode: "implementation", + output_cpp_dir: "src/object2", includes: [ "", "" ], local_types: [ ], diff --git a/xo-object2/idl/ISequence_DArray.json5 b/xo-object2/idl/ISequence_DArray.json5 index 198410da..1f09b0bb 100644 --- a/xo-object2/idl/ISequence_DArray.json5 +++ b/xo-object2/idl/ISequence_DArray.json5 @@ -1,5 +1,6 @@ { mode: "implementation", + output_cpp_dir: "src/object2", includes: [ ], local_types: [ ], namespace1: "xo", diff --git a/xo-object2/idl/ISequence_DList.json5 b/xo-object2/idl/ISequence_DList.json5 index 677285da..edf0e8dc 100644 --- a/xo-object2/idl/ISequence_DList.json5 +++ b/xo-object2/idl/ISequence_DList.json5 @@ -1,5 +1,6 @@ { mode: "implementation", + output_cpp_dir: "src/object2", includes: [ "" ], local_types: [ ], namespace1: "xo", diff --git a/xo-object2/idl/Sequence.json5 b/xo-object2/idl/Sequence.json5 index 9ceda9ea..5c5139da 100644 --- a/xo-object2/idl/Sequence.json5 +++ b/xo-object2/idl/Sequence.json5 @@ -1,5 +1,6 @@ { mode: "facet", + output_cpp_dir: "src/object2", includes: [""], // extra includes in Sequence.hpp, if any user_hpp_includes: [], @@ -67,4 +68,5 @@ ], nonconst_methods: [ ], + router_facet_explicit_content: [] } diff --git a/xo-object2/include/xo/object2/Sequence.hpp b/xo-object2/include/xo/object2/Sequence.hpp index 7866f91b..0478fa8b 100644 --- a/xo-object2/include/xo/object2/Sequence.hpp +++ b/xo-object2/include/xo/object2/Sequence.hpp @@ -2,7 +2,7 @@ * * Generated automagically from ingredients: * 1. code generator: - * [/home/roland/proj/xo-umbrella2-claude1/xo-facet/codegen/genfacet] + * [xo-facet/codegen/genfacet] * arguments: * --input [idl/Sequence.json5] * 2. jinja2 template for facet .hpp file: @@ -19,4 +19,4 @@ #include "sequence/RSequence.hpp" -/* end Sequence.hpp */ \ No newline at end of file +/* end Sequence.hpp */ diff --git a/xo-object2/include/xo/object2/array/IGCObject_DArray.hpp b/xo-object2/include/xo/object2/array/IGCObject_DArray.hpp index 0b2279f1..9af6d3c7 100644 --- a/xo-object2/include/xo/object2/array/IGCObject_DArray.hpp +++ b/xo-object2/include/xo/object2/array/IGCObject_DArray.hpp @@ -2,7 +2,7 @@ * * Generated automagically from ingredients: * 1. code generator: - * [/home/roland/proj/xo-umbrella2-claude1/xo-facet/codegen/genfacet] + * [xo-facet/codegen/genfacet] * arguments: * --input [idl/IGCObject_DArray.json5] * 2. jinja2 template for abstract facet .hpp file: diff --git a/xo-object2/include/xo/object2/array/IPrintable_DArray.hpp b/xo-object2/include/xo/object2/array/IPrintable_DArray.hpp index 1b3a4663..890cbab5 100644 --- a/xo-object2/include/xo/object2/array/IPrintable_DArray.hpp +++ b/xo-object2/include/xo/object2/array/IPrintable_DArray.hpp @@ -2,7 +2,7 @@ * * Generated automagically from ingredients: * 1. code generator: - * [/home/roland/proj/xo-umbrella2-claude1/xo-facet/codegen/genfacet] + * [xo-facet/codegen/genfacet] * arguments: * --input [idl/IPrintable_DArray.json5] * 2. jinja2 template for abstract facet .hpp file: diff --git a/xo-object2/include/xo/object2/array/ISequence_DArray.hpp b/xo-object2/include/xo/object2/array/ISequence_DArray.hpp index 27f47db3..3b756b94 100644 --- a/xo-object2/include/xo/object2/array/ISequence_DArray.hpp +++ b/xo-object2/include/xo/object2/array/ISequence_DArray.hpp @@ -2,7 +2,7 @@ * * Generated automagically from ingredients: * 1. code generator: - * [/home/roland/proj/xo-umbrella2-claude1/xo-facet/codegen/genfacet] + * [xo-facet/codegen/genfacet] * arguments: * --input [idl/ISequence_DArray.json5] * 2. jinja2 template for abstract facet .hpp file: diff --git a/xo-object2/include/xo/object2/boolean/IGCObject_DBoolean.hpp b/xo-object2/include/xo/object2/boolean/IGCObject_DBoolean.hpp index e075874c..1d90b60e 100644 --- a/xo-object2/include/xo/object2/boolean/IGCObject_DBoolean.hpp +++ b/xo-object2/include/xo/object2/boolean/IGCObject_DBoolean.hpp @@ -2,7 +2,7 @@ * * Generated automagically from ingredients: * 1. code generator: - * [/home/roland/proj/xo-umbrella2-claude1/xo-facet/codegen/genfacet] + * [xo-facet/codegen/genfacet] * arguments: * --input [idl/IGCObject_DBoolean.json5] * 2. jinja2 template for abstract facet .hpp file: diff --git a/xo-object2/include/xo/object2/boolean/IPrintable_DBoolean.hpp b/xo-object2/include/xo/object2/boolean/IPrintable_DBoolean.hpp index e17f169a..b650c435 100644 --- a/xo-object2/include/xo/object2/boolean/IPrintable_DBoolean.hpp +++ b/xo-object2/include/xo/object2/boolean/IPrintable_DBoolean.hpp @@ -2,7 +2,7 @@ * * Generated automagically from ingredients: * 1. code generator: - * [/home/roland/proj/xo-umbrella2-claude1/xo-facet/codegen/genfacet] + * [xo-facet/codegen/genfacet] * arguments: * --input [idl/IPrintable_DBoolean.json5] * 2. jinja2 template for abstract facet .hpp file: diff --git a/xo-object2/include/xo/object2/list/IGCObject_DList.hpp b/xo-object2/include/xo/object2/list/IGCObject_DList.hpp index 19000df6..7e1f1428 100644 --- a/xo-object2/include/xo/object2/list/IGCObject_DList.hpp +++ b/xo-object2/include/xo/object2/list/IGCObject_DList.hpp @@ -2,7 +2,7 @@ * * Generated automagically from ingredients: * 1. code generator: - * [/home/roland/proj/xo-umbrella2-claude1/xo-facet/codegen/genfacet] + * [xo-facet/codegen/genfacet] * arguments: * --input [idl/IGCObject_DList.json5] * 2. jinja2 template for abstract facet .hpp file: diff --git a/xo-object2/include/xo/object2/list/IPrintable_DList.hpp b/xo-object2/include/xo/object2/list/IPrintable_DList.hpp index d068bda1..77e7b1d3 100644 --- a/xo-object2/include/xo/object2/list/IPrintable_DList.hpp +++ b/xo-object2/include/xo/object2/list/IPrintable_DList.hpp @@ -2,7 +2,7 @@ * * Generated automagically from ingredients: * 1. code generator: - * [/home/roland/proj/xo-umbrella2-claude1/xo-facet/codegen/genfacet] + * [xo-facet/codegen/genfacet] * arguments: * --input [idl/IPrintable_DList.json5] * 2. jinja2 template for abstract facet .hpp file: diff --git a/xo-object2/include/xo/object2/list/ISequence_DList.hpp b/xo-object2/include/xo/object2/list/ISequence_DList.hpp index d7c44e3b..ac468764 100644 --- a/xo-object2/include/xo/object2/list/ISequence_DList.hpp +++ b/xo-object2/include/xo/object2/list/ISequence_DList.hpp @@ -2,7 +2,7 @@ * * Generated automagically from ingredients: * 1. code generator: - * [/home/roland/proj/xo-umbrella2-claude1/xo-facet/codegen/genfacet] + * [xo-facet/codegen/genfacet] * arguments: * --input [idl/ISequence_DList.json5] * 2. jinja2 template for abstract facet .hpp file: diff --git a/xo-object2/include/xo/object2/number/IGCObject_DFloat.hpp b/xo-object2/include/xo/object2/number/IGCObject_DFloat.hpp index a5a01fff..9a1dcbdc 100644 --- a/xo-object2/include/xo/object2/number/IGCObject_DFloat.hpp +++ b/xo-object2/include/xo/object2/number/IGCObject_DFloat.hpp @@ -2,7 +2,7 @@ * * Generated automagically from ingredients: * 1. code generator: - * [/home/roland/proj/xo-umbrella2-claude1/xo-facet/codegen/genfacet] + * [xo-facet/codegen/genfacet] * arguments: * --input [idl/IGCObject_DFloat.json5] * 2. jinja2 template for abstract facet .hpp file: diff --git a/xo-object2/include/xo/object2/number/IGCObject_DInteger.hpp b/xo-object2/include/xo/object2/number/IGCObject_DInteger.hpp index 6aa3c9fc..1136b577 100644 --- a/xo-object2/include/xo/object2/number/IGCObject_DInteger.hpp +++ b/xo-object2/include/xo/object2/number/IGCObject_DInteger.hpp @@ -2,7 +2,7 @@ * * Generated automagically from ingredients: * 1. code generator: - * [/home/roland/proj/xo-umbrella2-claude1/xo-facet/codegen/genfacet] + * [xo-facet/codegen/genfacet] * arguments: * --input [idl/IGCObject_DInteger.json5] * 2. jinja2 template for abstract facet .hpp file: diff --git a/xo-object2/include/xo/object2/number/IPrintable_DFloat.hpp b/xo-object2/include/xo/object2/number/IPrintable_DFloat.hpp index 2bcaf1d2..9506055a 100644 --- a/xo-object2/include/xo/object2/number/IPrintable_DFloat.hpp +++ b/xo-object2/include/xo/object2/number/IPrintable_DFloat.hpp @@ -2,7 +2,7 @@ * * Generated automagically from ingredients: * 1. code generator: - * [/home/roland/proj/xo-umbrella2-claude1/xo-facet/codegen/genfacet] + * [xo-facet/codegen/genfacet] * arguments: * --input [idl/IPrintable_DFloat.json5] * 2. jinja2 template for abstract facet .hpp file: diff --git a/xo-object2/include/xo/object2/number/IPrintable_DInteger.hpp b/xo-object2/include/xo/object2/number/IPrintable_DInteger.hpp index a13334d6..1b5df6c4 100644 --- a/xo-object2/include/xo/object2/number/IPrintable_DInteger.hpp +++ b/xo-object2/include/xo/object2/number/IPrintable_DInteger.hpp @@ -2,7 +2,7 @@ * * Generated automagically from ingredients: * 1. code generator: - * [/home/roland/proj/xo-umbrella2-claude1/xo-facet/codegen/genfacet] + * [xo-facet/codegen/genfacet] * arguments: * --input [idl/IPrintable_DInteger.json5] * 2. jinja2 template for abstract facet .hpp file: diff --git a/xo-object2/include/xo/object2/sequence/ASequence.hpp b/xo-object2/include/xo/object2/sequence/ASequence.hpp index 5281e0ea..53d112e7 100644 --- a/xo-object2/include/xo/object2/sequence/ASequence.hpp +++ b/xo-object2/include/xo/object2/sequence/ASequence.hpp @@ -2,7 +2,7 @@ * * Generated automagically from ingredients: * 1. code generator: - * [/home/roland/proj/xo-umbrella2-claude1/xo-facet/codegen/genfacet] + * [xo-facet/codegen/genfacet] * arguments: * --input [idl/Sequence.json5] * 2. jinja2 template for abstract facet .hpp file: @@ -51,6 +51,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 sequence is empty **/ virtual bool is_empty(Copaque data) const noexcept = 0; /** true iff sequence is finite **/ @@ -78,4 +80,4 @@ using ISequence_ImplType = xo::facet::FacetImplType; } /*namespace scm*/ } /*namespace xo*/ -/* ASequence.hpp */ \ No newline at end of file +/* ASequence.hpp */ diff --git a/xo-object2/include/xo/object2/sequence/ISequence_Any.hpp b/xo-object2/include/xo/object2/sequence/ISequence_Any.hpp index 0e7c5c10..e878f729 100644 --- a/xo-object2/include/xo/object2/sequence/ISequence_Any.hpp +++ b/xo-object2/include/xo/object2/sequence/ISequence_Any.hpp @@ -2,7 +2,7 @@ * * Generated automagically from ingredients: * 1. code generator: - * [/home/roland/proj/xo-umbrella2-claude1/xo-facet/codegen/genfacet] + * [xo-facet/codegen/genfacet] * arguments: * --input [idl/Sequence.json5] * 2. jinja2 template for abstract facet .hpp file: @@ -55,8 +55,11 @@ namespace scm { // from ASequence - // 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_empty(Copaque) const noexcept override { _fatal(); } [[noreturn]] bool is_finite(Copaque) const noexcept override { _fatal(); } [[noreturn]] obj at(Copaque, size_type) const override { _fatal(); } @@ -86,4 +89,4 @@ namespace scm { } /*namespace scm */ } /*namespace xo */ -/* ISequence_Any.hpp */ \ No newline at end of file +/* ISequence_Any.hpp */ diff --git a/xo-object2/include/xo/object2/sequence/ISequence_Xfer.hpp b/xo-object2/include/xo/object2/sequence/ISequence_Xfer.hpp index f3dc8b35..42d6cb1b 100644 --- a/xo-object2/include/xo/object2/sequence/ISequence_Xfer.hpp +++ b/xo-object2/include/xo/object2/sequence/ISequence_Xfer.hpp @@ -2,7 +2,7 @@ * * Generated automagically from ingredients: * 1. code generator: - * [/home/roland/proj/xo-umbrella2-claude1/xo-facet/codegen/genfacet] + * [xo-facet/codegen/genfacet] * arguments: * --input [idl/Sequence.json5] * 2. jinja2 template for abstract facet .hpp file: @@ -40,8 +40,11 @@ namespace scm { // from ASequence - // 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_empty(Copaque data) const noexcept override { return I::is_empty(_dcast(data)); } @@ -85,4 +88,4 @@ namespace scm { } /*namespace scm */ } /*namespace xo*/ -/* end ISequence_Xfer.hpp */ \ No newline at end of file +/* end ISequence_Xfer.hpp */ diff --git a/xo-object2/include/xo/object2/sequence/RSequence.hpp b/xo-object2/include/xo/object2/sequence/RSequence.hpp index be4fafb0..76f60059 100644 --- a/xo-object2/include/xo/object2/sequence/RSequence.hpp +++ b/xo-object2/include/xo/object2/sequence/RSequence.hpp @@ -2,7 +2,7 @@ * * Generated automagically from ingredients: * 1. code generator: - * [/home/roland/proj/xo-umbrella2-claude1/xo-facet/codegen/genfacet] + * [xo-facet/codegen/genfacet] * arguments: * --input [idl/Sequence.json5] * 2. jinja2 template for abstract facet .hpp file: @@ -47,8 +47,13 @@ public: /** @defgroup scm-sequence-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_empty() const noexcept { return O::iface()->is_empty(O::data()); } @@ -84,4 +89,4 @@ namespace xo { namespace facet { }; } } -/* end RSequence.hpp */ \ No newline at end of file +/* end RSequence.hpp */ diff --git a/xo-object2/include/xo/object2/string/IGCObject_DString.hpp b/xo-object2/include/xo/object2/string/IGCObject_DString.hpp index 95a19483..159b9e49 100644 --- a/xo-object2/include/xo/object2/string/IGCObject_DString.hpp +++ b/xo-object2/include/xo/object2/string/IGCObject_DString.hpp @@ -2,7 +2,7 @@ * * Generated automagically from ingredients: * 1. code generator: - * [/home/roland/proj/xo-umbrella2-claude1/xo-facet/codegen/genfacet] + * [xo-facet/codegen/genfacet] * arguments: * --input [idl/IGCObject_DString.json5] * 2. jinja2 template for abstract facet .hpp file: diff --git a/xo-object2/include/xo/object2/string/IPrintable_DString.hpp b/xo-object2/include/xo/object2/string/IPrintable_DString.hpp index f1be1374..f898a17c 100644 --- a/xo-object2/include/xo/object2/string/IPrintable_DString.hpp +++ b/xo-object2/include/xo/object2/string/IPrintable_DString.hpp @@ -2,7 +2,7 @@ * * Generated automagically from ingredients: * 1. code generator: - * [/home/roland/proj/xo-umbrella2-claude1/xo-facet/codegen/genfacet] + * [xo-facet/codegen/genfacet] * arguments: * --input [idl/IPrintable_DString.json5] * 2. jinja2 template for abstract facet .hpp file: diff --git a/xo-object2/src/object2/IGCObject_DArray.cpp b/xo-object2/src/object2/IGCObject_DArray.cpp index a2ee4bc1..1063bd45 100644 --- a/xo-object2/src/object2/IGCObject_DArray.cpp +++ b/xo-object2/src/object2/IGCObject_DArray.cpp @@ -2,7 +2,7 @@ * * Generated automagically from ingredients: * 1. code generator: - * [/home/roland/proj/xo-umbrella2-claude1/xo-facet/codegen/genfacet] + * [xo-facet/codegen/genfacet] * arguments: * --input [idl/IGCObject_DArray.json5] * 2. jinja2 template for abstract facet .hpp file: @@ -36,4 +36,4 @@ namespace xo { } /*namespace scm*/ } /*namespace xo*/ -/* end IGCObject_DArray.cpp */ \ No newline at end of file +/* end IGCObject_DArray.cpp */ diff --git a/xo-object2/src/object2/IGCObject_DBoolean.cpp b/xo-object2/src/object2/IGCObject_DBoolean.cpp index 72aa0b1b..3ef60aea 100644 --- a/xo-object2/src/object2/IGCObject_DBoolean.cpp +++ b/xo-object2/src/object2/IGCObject_DBoolean.cpp @@ -2,7 +2,7 @@ * * Generated automagically from ingredients: * 1. code generator: - * [/home/roland/proj/xo-umbrella2-claude1/xo-facet/codegen/genfacet] + * [xo-facet/codegen/genfacet] * arguments: * --input [idl/IGCObject_DBoolean.json5] * 2. jinja2 template for abstract facet .hpp file: @@ -36,4 +36,4 @@ namespace xo { } /*namespace scm*/ } /*namespace xo*/ -/* end IGCObject_DBoolean.cpp */ \ No newline at end of file +/* end IGCObject_DBoolean.cpp */ diff --git a/xo-object2/src/object2/IGCObject_DFloat.cpp b/xo-object2/src/object2/IGCObject_DFloat.cpp index 3c44db5d..9e31cf68 100644 --- a/xo-object2/src/object2/IGCObject_DFloat.cpp +++ b/xo-object2/src/object2/IGCObject_DFloat.cpp @@ -2,7 +2,7 @@ * * Generated automagically from ingredients: * 1. code generator: - * [/home/roland/proj/xo-umbrella2-claude1/xo-facet/codegen/genfacet] + * [xo-facet/codegen/genfacet] * arguments: * --input [idl/IGCObject_DFloat.json5] * 2. jinja2 template for abstract facet .hpp file: @@ -36,4 +36,4 @@ namespace xo { } /*namespace scm*/ } /*namespace xo*/ -/* end IGCObject_DFloat.cpp */ \ No newline at end of file +/* end IGCObject_DFloat.cpp */ diff --git a/xo-object2/src/object2/IGCObject_DInteger.cpp b/xo-object2/src/object2/IGCObject_DInteger.cpp index 91d8e4a1..55e1fae7 100644 --- a/xo-object2/src/object2/IGCObject_DInteger.cpp +++ b/xo-object2/src/object2/IGCObject_DInteger.cpp @@ -2,7 +2,7 @@ * * Generated automagically from ingredients: * 1. code generator: - * [/home/roland/proj/xo-umbrella2-claude1/xo-facet/codegen/genfacet] + * [xo-facet/codegen/genfacet] * arguments: * --input [idl/IGCObject_DInteger.json5] * 2. jinja2 template for abstract facet .hpp file: @@ -36,4 +36,4 @@ namespace xo { } /*namespace scm*/ } /*namespace xo*/ -/* end IGCObject_DInteger.cpp */ \ No newline at end of file +/* end IGCObject_DInteger.cpp */ diff --git a/xo-object2/src/object2/IGCObject_DList.cpp b/xo-object2/src/object2/IGCObject_DList.cpp index b9d36cc5..f4e9472b 100644 --- a/xo-object2/src/object2/IGCObject_DList.cpp +++ b/xo-object2/src/object2/IGCObject_DList.cpp @@ -2,7 +2,7 @@ * * Generated automagically from ingredients: * 1. code generator: - * [/home/roland/proj/xo-umbrella2-claude1/xo-facet/codegen/genfacet] + * [xo-facet/codegen/genfacet] * arguments: * --input [idl/IGCObject_DList.json5] * 2. jinja2 template for abstract facet .hpp file: @@ -36,4 +36,4 @@ namespace xo { } /*namespace scm*/ } /*namespace xo*/ -/* end IGCObject_DList.cpp */ \ No newline at end of file +/* end IGCObject_DList.cpp */ diff --git a/xo-object2/src/object2/IGCObject_DString.cpp b/xo-object2/src/object2/IGCObject_DString.cpp index 1eff4da5..d34f0eaf 100644 --- a/xo-object2/src/object2/IGCObject_DString.cpp +++ b/xo-object2/src/object2/IGCObject_DString.cpp @@ -2,7 +2,7 @@ * * Generated automagically from ingredients: * 1. code generator: - * [/home/roland/proj/xo-umbrella2-claude1/xo-facet/codegen/genfacet] + * [xo-facet/codegen/genfacet] * arguments: * --input [idl/IGCObject_DString.json5] * 2. jinja2 template for abstract facet .hpp file: @@ -36,4 +36,4 @@ namespace xo { } /*namespace scm*/ } /*namespace xo*/ -/* end IGCObject_DString.cpp */ \ No newline at end of file +/* end IGCObject_DString.cpp */ diff --git a/xo-object2/src/object2/IPrintable_DArray.cpp b/xo-object2/src/object2/IPrintable_DArray.cpp index d444800b..b9248516 100644 --- a/xo-object2/src/object2/IPrintable_DArray.cpp +++ b/xo-object2/src/object2/IPrintable_DArray.cpp @@ -2,7 +2,7 @@ * * Generated automagically from ingredients: * 1. code generator: - * [/home/roland/proj/xo-umbrella2-claude1/xo-facet/codegen/genfacet] + * [xo-facet/codegen/genfacet] * arguments: * --input [idl/IPrintable_DArray.json5] * 2. jinja2 template for abstract facet .hpp file: @@ -25,4 +25,4 @@ namespace xo { } /*namespace scm*/ } /*namespace xo*/ -/* end IPrintable_DArray.cpp */ \ No newline at end of file +/* end IPrintable_DArray.cpp */ diff --git a/xo-object2/src/object2/IPrintable_DBoolean.cpp b/xo-object2/src/object2/IPrintable_DBoolean.cpp index d8fddd87..3b85aa27 100644 --- a/xo-object2/src/object2/IPrintable_DBoolean.cpp +++ b/xo-object2/src/object2/IPrintable_DBoolean.cpp @@ -2,7 +2,7 @@ * * Generated automagically from ingredients: * 1. code generator: - * [/home/roland/proj/xo-umbrella2-claude1/xo-facet/codegen/genfacet] + * [xo-facet/codegen/genfacet] * arguments: * --input [idl/IPrintable_DBoolean.json5] * 2. jinja2 template for abstract facet .hpp file: @@ -25,4 +25,4 @@ namespace xo { } /*namespace scm*/ } /*namespace xo*/ -/* end IPrintable_DBoolean.cpp */ \ No newline at end of file +/* end IPrintable_DBoolean.cpp */ diff --git a/xo-object2/src/object2/IPrintable_DFloat.cpp b/xo-object2/src/object2/IPrintable_DFloat.cpp index 0c0a6789..f1e8be6d 100644 --- a/xo-object2/src/object2/IPrintable_DFloat.cpp +++ b/xo-object2/src/object2/IPrintable_DFloat.cpp @@ -2,7 +2,7 @@ * * Generated automagically from ingredients: * 1. code generator: - * [/home/roland/proj/xo-umbrella2-claude1/xo-facet/codegen/genfacet] + * [xo-facet/codegen/genfacet] * arguments: * --input [idl/IPrintable_DFloat.json5] * 2. jinja2 template for abstract facet .hpp file: @@ -25,4 +25,4 @@ namespace xo { } /*namespace scm*/ } /*namespace xo*/ -/* end IPrintable_DFloat.cpp */ \ No newline at end of file +/* end IPrintable_DFloat.cpp */ diff --git a/xo-object2/src/object2/IPrintable_DInteger.cpp b/xo-object2/src/object2/IPrintable_DInteger.cpp index 8924a72c..7a9bbdaa 100644 --- a/xo-object2/src/object2/IPrintable_DInteger.cpp +++ b/xo-object2/src/object2/IPrintable_DInteger.cpp @@ -2,7 +2,7 @@ * * Generated automagically from ingredients: * 1. code generator: - * [/home/roland/proj/xo-umbrella2-claude1/xo-facet/codegen/genfacet] + * [xo-facet/codegen/genfacet] * arguments: * --input [idl/IPrintable_DInteger.json5] * 2. jinja2 template for abstract facet .hpp file: @@ -25,4 +25,4 @@ namespace xo { } /*namespace scm*/ } /*namespace xo*/ -/* end IPrintable_DInteger.cpp */ \ No newline at end of file +/* end IPrintable_DInteger.cpp */ diff --git a/xo-object2/src/object2/IPrintable_DList.cpp b/xo-object2/src/object2/IPrintable_DList.cpp index 095b323d..a8f9b657 100644 --- a/xo-object2/src/object2/IPrintable_DList.cpp +++ b/xo-object2/src/object2/IPrintable_DList.cpp @@ -2,7 +2,7 @@ * * Generated automagically from ingredients: * 1. code generator: - * [/home/roland/proj/xo-umbrella2-claude1/xo-facet/codegen/genfacet] + * [xo-facet/codegen/genfacet] * arguments: * --input [idl/IPrintable_DList.json5] * 2. jinja2 template for abstract facet .hpp file: @@ -25,4 +25,4 @@ namespace xo { } /*namespace scm*/ } /*namespace xo*/ -/* end IPrintable_DList.cpp */ \ No newline at end of file +/* end IPrintable_DList.cpp */ diff --git a/xo-object2/src/object2/IPrintable_DString.cpp b/xo-object2/src/object2/IPrintable_DString.cpp index 86d4565e..f5ec4967 100644 --- a/xo-object2/src/object2/IPrintable_DString.cpp +++ b/xo-object2/src/object2/IPrintable_DString.cpp @@ -2,7 +2,7 @@ * * Generated automagically from ingredients: * 1. code generator: - * [/home/roland/proj/xo-umbrella2-claude1/xo-facet/codegen/genfacet] + * [xo-facet/codegen/genfacet] * arguments: * --input [idl/IPrintable_DString.json5] * 2. jinja2 template for abstract facet .hpp file: @@ -25,4 +25,4 @@ namespace xo { } /*namespace scm*/ } /*namespace xo*/ -/* end IPrintable_DString.cpp */ \ No newline at end of file +/* end IPrintable_DString.cpp */ diff --git a/xo-object2/src/object2/ISequence_Any.cpp b/xo-object2/src/object2/ISequence_Any.cpp index 8461d750..372571f7 100644 --- a/xo-object2/src/object2/ISequence_Any.cpp +++ b/xo-object2/src/object2/ISequence_Any.cpp @@ -38,4 +38,4 @@ ISequence_Any::_valid } /*namespace scm*/ } /*namespace xo*/ -/* end ISequence_Any.cpp */ \ No newline at end of file +/* end ISequence_Any.cpp */ diff --git a/xo-object2/src/object2/ISequence_DArray.cpp b/xo-object2/src/object2/ISequence_DArray.cpp index 40ffe36a..abeeaeee 100644 --- a/xo-object2/src/object2/ISequence_DArray.cpp +++ b/xo-object2/src/object2/ISequence_DArray.cpp @@ -2,7 +2,7 @@ * * Generated automagically from ingredients: * 1. code generator: - * [/home/roland/proj/xo-umbrella2-claude1/xo-facet/codegen/genfacet] + * [xo-facet/codegen/genfacet] * arguments: * --input [idl/ISequence_DArray.json5] * 2. jinja2 template for abstract facet .hpp file: @@ -37,4 +37,4 @@ namespace xo { } /*namespace scm*/ } /*namespace xo*/ -/* end ISequence_DArray.cpp */ \ No newline at end of file +/* end ISequence_DArray.cpp */ diff --git a/xo-object2/src/object2/ISequence_DList.cpp b/xo-object2/src/object2/ISequence_DList.cpp index 3c9c2437..2bc21862 100644 --- a/xo-object2/src/object2/ISequence_DList.cpp +++ b/xo-object2/src/object2/ISequence_DList.cpp @@ -2,7 +2,7 @@ * * Generated automagically from ingredients: * 1. code generator: - * [/home/roland/proj/xo-umbrella2-claude1/xo-facet/codegen/genfacet] + * [xo-facet/codegen/genfacet] * arguments: * --input [idl/ISequence_DList.json5] * 2. jinja2 template for abstract facet .hpp file: @@ -37,4 +37,4 @@ namespace xo { } /*namespace scm*/ } /*namespace xo*/ -/* end ISequence_DList.cpp */ \ No newline at end of file +/* end ISequence_DList.cpp */ diff --git a/xo-printable2/CMakeLists.txt b/xo-printable2/CMakeLists.txt index 32034af1..7d3990be 100644 --- a/xo-printable2/CMakeLists.txt +++ b/xo-printable2/CMakeLists.txt @@ -24,7 +24,6 @@ xo_add_genfacet( INPUT idl/Printable.json5 OUTPUT_HPP_DIR include/xo/printable2 OUTPUT_IMPL_SUBDIR detail - OUTPUT_CPP_DIR src/printable2 ) # ---------------------------------------------------------------- diff --git a/xo-printable2/idl/Printable.json5 b/xo-printable2/idl/Printable.json5 index 12925bbc..41799c43 100644 --- a/xo-printable2/idl/Printable.json5 +++ b/xo-printable2/idl/Printable.json5 @@ -1,5 +1,6 @@ { mode: "facet", + output_cpp_dir: "src/printable2", includes: [""], // extra includes in Printable.hpp user_hpp_includes: ["\"detail/ppdetail_Printable.hpp\""], diff --git a/xo-reader2/CMakeLists.txt b/xo-reader2/CMakeLists.txt index b2153df4..f098bd5e 100644 --- a/xo-reader2/CMakeLists.txt +++ b/xo-reader2/CMakeLists.txt @@ -31,7 +31,6 @@ xo_add_genfacet( INPUT idl/SyntaxStateMachine.json5 OUTPUT_HPP_DIR include/xo/reader2 OUTPUT_IMPL_SUBDIR ssm - OUTPUT_CPP_DIR src/reader2 ) # ---------------------------------------------------------------- @@ -45,7 +44,6 @@ xo_add_genfacetimpl( INPUT idl/ISyntaxStateMachine_DToplevelSeqSsm.json5 OUTPUT_HPP_DIR include/xo/reader2 OUTPUT_IMPL_SUBDIR ssm - OUTPUT_CPP_DIR src/reader2 ) # note: manual target; generated code committed to git @@ -57,7 +55,6 @@ xo_add_genfacetimpl( INPUT idl/IPrintable_DToplevelSeqSsm.json5 OUTPUT_HPP_DIR include/xo/reader2 OUTPUT_IMPL_SUBDIR ssm - OUTPUT_CPP_DIR src/reader2 ) # ---------------------------------------------------------------- @@ -71,7 +68,6 @@ xo_add_genfacetimpl( INPUT idl/ISyntaxStateMachine_DDefineSsm.json5 OUTPUT_HPP_DIR include/xo/reader2 OUTPUT_IMPL_SUBDIR ssm - OUTPUT_CPP_DIR src/reader2 ) # note: manual target; generated code committed to git @@ -83,7 +79,6 @@ xo_add_genfacetimpl( INPUT idl/IPrintable_DDefineSsm.json5 OUTPUT_HPP_DIR include/xo/reader2 OUTPUT_IMPL_SUBDIR ssm - OUTPUT_CPP_DIR src/reader2 ) # ---------------------------------------------------------------- @@ -97,7 +92,6 @@ xo_add_genfacetimpl( INPUT idl/ISyntaxStateMachine_DLambdaSsm.json5 OUTPUT_HPP_DIR include/xo/reader2 OUTPUT_IMPL_SUBDIR ssm - OUTPUT_CPP_DIR src/reader2 ) # note: manual target; generated code committed to git @@ -109,7 +103,6 @@ xo_add_genfacetimpl( INPUT idl/IPrintable_DLambdaSsm.json5 OUTPUT_HPP_DIR include/xo/reader2 OUTPUT_IMPL_SUBDIR ssm - OUTPUT_CPP_DIR src/reader2 ) # ---------------------------------------------------------------- @@ -123,7 +116,6 @@ xo_add_genfacetimpl( INPUT idl/ISyntaxStateMachine_DParenSsm.json5 OUTPUT_HPP_DIR include/xo/reader2 OUTPUT_IMPL_SUBDIR ssm - OUTPUT_CPP_DIR src/reader2 ) # note: manual target; generated code committed to git @@ -135,7 +127,6 @@ xo_add_genfacetimpl( INPUT idl/IPrintable_DParenSsm.json5 OUTPUT_HPP_DIR include/xo/reader2 OUTPUT_IMPL_SUBDIR ssm - OUTPUT_CPP_DIR src/reader2 ) # ---------------------------------------------------------------- @@ -149,7 +140,6 @@ xo_add_genfacetimpl( INPUT idl/ISyntaxStateMachine_DExpectFormalArglistSsm.json5 OUTPUT_HPP_DIR include/xo/reader2 OUTPUT_IMPL_SUBDIR ssm - OUTPUT_CPP_DIR src/reader2 ) # note: manual target; generated code committed to git @@ -161,7 +151,6 @@ xo_add_genfacetimpl( INPUT idl/IPrintable_DExpectFormalArglistSsm.json5 OUTPUT_HPP_DIR include/xo/reader2 OUTPUT_IMPL_SUBDIR ssm - OUTPUT_CPP_DIR src/reader2 ) # ---------------------------------------------------------------- @@ -175,7 +164,6 @@ xo_add_genfacetimpl( INPUT idl/ISyntaxStateMachine_DExpectFormalArgSsm.json5 OUTPUT_HPP_DIR include/xo/reader2 OUTPUT_IMPL_SUBDIR ssm - OUTPUT_CPP_DIR src/reader2 ) # note: manual target; generated code committed to git @@ -187,7 +175,6 @@ xo_add_genfacetimpl( INPUT idl/IPrintable_DExpectFormalArgSsm.json5 OUTPUT_HPP_DIR include/xo/reader2 OUTPUT_IMPL_SUBDIR ssm - OUTPUT_CPP_DIR src/reader2 ) # ---------------------------------------------------------------- @@ -201,7 +188,6 @@ xo_add_genfacetimpl( INPUT idl/ISyntaxStateMachine_DIfElseSsm.json5 OUTPUT_HPP_DIR include/xo/reader2 OUTPUT_IMPL_SUBDIR ssm - OUTPUT_CPP_DIR src/reader2 ) # note: manual target; generated code committed to git @@ -213,7 +199,6 @@ xo_add_genfacetimpl( INPUT idl/IPrintable_DIfElseSsm.json5 OUTPUT_HPP_DIR include/xo/reader2 OUTPUT_IMPL_SUBDIR ssm - OUTPUT_CPP_DIR src/reader2 ) # ---------------------------------------------------------------- @@ -227,7 +212,6 @@ xo_add_genfacetimpl( INPUT idl/ISyntaxStateMachine_DSequenceSsm.json5 OUTPUT_HPP_DIR include/xo/reader2 OUTPUT_IMPL_SUBDIR ssm - OUTPUT_CPP_DIR src/reader2 ) # note: manual target; generated code committed to git @@ -239,7 +223,6 @@ xo_add_genfacetimpl( INPUT idl/IPrintable_DSequenceSsm.json5 OUTPUT_HPP_DIR include/xo/reader2 OUTPUT_IMPL_SUBDIR ssm - OUTPUT_CPP_DIR src/reader2 ) # ---------------------------------------------------------------- @@ -253,7 +236,6 @@ xo_add_genfacetimpl( INPUT idl/ISyntaxStateMachine_DApplySsm.json5 OUTPUT_HPP_DIR include/xo/reader2 OUTPUT_IMPL_SUBDIR ssm - OUTPUT_CPP_DIR src/reader2 ) # note: manual target; generated code committed to git @@ -265,7 +247,6 @@ xo_add_genfacetimpl( INPUT idl/IPrintable_DApplySsm.json5 OUTPUT_HPP_DIR include/xo/reader2 OUTPUT_IMPL_SUBDIR ssm - OUTPUT_CPP_DIR src/reader2 ) # ---------------------------------------------------------------- @@ -279,7 +260,6 @@ xo_add_genfacetimpl( INPUT idl/ISyntaxStateMachine_DExpectSymbolSsm.json5 OUTPUT_HPP_DIR include/xo/reader2 OUTPUT_IMPL_SUBDIR ssm - OUTPUT_CPP_DIR src/reader2 ) # note: manual target; generated code committed to git @@ -291,7 +271,6 @@ xo_add_genfacetimpl( INPUT idl/IPrintable_DExpectSymbolSsm.json5 OUTPUT_HPP_DIR include/xo/reader2 OUTPUT_IMPL_SUBDIR ssm - OUTPUT_CPP_DIR src/reader2 ) # ---------------------------------------------------------------- @@ -305,7 +284,6 @@ xo_add_genfacetimpl( INPUT idl/ISyntaxStateMachine_DExpectTypeSsm.json5 OUTPUT_HPP_DIR include/xo/reader2 OUTPUT_IMPL_SUBDIR ssm - OUTPUT_CPP_DIR src/reader2 ) # note: manual target; generated code committed to git @@ -317,7 +295,6 @@ xo_add_genfacetimpl( INPUT idl/IPrintable_DExpectTypeSsm.json5 OUTPUT_HPP_DIR include/xo/reader2 OUTPUT_IMPL_SUBDIR ssm - OUTPUT_CPP_DIR src/reader2 ) # ---------------------------------------------------------------- @@ -331,7 +308,6 @@ xo_add_genfacetimpl( INPUT idl/ISyntaxStateMachine_DExpectExprSsm.json5 OUTPUT_HPP_DIR include/xo/reader2 OUTPUT_IMPL_SUBDIR ssm - OUTPUT_CPP_DIR src/reader2 ) # note: manual target; generated code committed to git @@ -343,7 +319,6 @@ xo_add_genfacetimpl( INPUT idl/IPrintable_DExpectExprSsm.json5 OUTPUT_HPP_DIR include/xo/reader2 OUTPUT_IMPL_SUBDIR ssm - OUTPUT_CPP_DIR src/reader2 ) # ---------------------------------------------------------------- @@ -357,7 +332,6 @@ xo_add_genfacetimpl( INPUT idl/ISyntaxStateMachine_DProgressSsm.json5 OUTPUT_HPP_DIR include/xo/reader2 OUTPUT_IMPL_SUBDIR ssm - OUTPUT_CPP_DIR src/reader2 ) # note: manual target; generated code committed to git @@ -369,7 +343,6 @@ xo_add_genfacetimpl( INPUT idl/IPrintable_DProgressSsm.json5 OUTPUT_HPP_DIR include/xo/reader2 OUTPUT_IMPL_SUBDIR ssm - OUTPUT_CPP_DIR src/reader2 ) # ---------------------------------------------------------------- diff --git a/xo-reader2/idl/IPrintable_DApplySsm.json5 b/xo-reader2/idl/IPrintable_DApplySsm.json5 index cdcd32ca..5895578d 100644 --- a/xo-reader2/idl/IPrintable_DApplySsm.json5 +++ b/xo-reader2/idl/IPrintable_DApplySsm.json5 @@ -1,5 +1,6 @@ { mode: "implementation", + output_cpp_dir: "src/reader2", includes: [ "", "" ], local_types: [], diff --git a/xo-reader2/idl/IPrintable_DDefineSsm.json5 b/xo-reader2/idl/IPrintable_DDefineSsm.json5 index e79017f8..3975396e 100644 --- a/xo-reader2/idl/IPrintable_DDefineSsm.json5 +++ b/xo-reader2/idl/IPrintable_DDefineSsm.json5 @@ -1,5 +1,6 @@ { mode: "implementation", + output_cpp_dir: "src/reader2", includes: [ "", "" ], local_types: [], diff --git a/xo-reader2/idl/IPrintable_DExpectExprSsm.json5 b/xo-reader2/idl/IPrintable_DExpectExprSsm.json5 index 72d19cd7..b6b0caa1 100644 --- a/xo-reader2/idl/IPrintable_DExpectExprSsm.json5 +++ b/xo-reader2/idl/IPrintable_DExpectExprSsm.json5 @@ -1,5 +1,6 @@ { mode: "implementation", + output_cpp_dir: "src/reader2", includes: [ "", "" ], local_types: [], diff --git a/xo-reader2/idl/IPrintable_DExpectFormalArgSsm.json5 b/xo-reader2/idl/IPrintable_DExpectFormalArgSsm.json5 index 854a458e..6b1bf863 100644 --- a/xo-reader2/idl/IPrintable_DExpectFormalArgSsm.json5 +++ b/xo-reader2/idl/IPrintable_DExpectFormalArgSsm.json5 @@ -1,5 +1,6 @@ { mode: "implementation", + output_cpp_dir: "src/reader2", includes: [ "", "" ], local_types: [], diff --git a/xo-reader2/idl/IPrintable_DExpectFormalArglistSsm.json5 b/xo-reader2/idl/IPrintable_DExpectFormalArglistSsm.json5 index 44f474dd..7f566150 100644 --- a/xo-reader2/idl/IPrintable_DExpectFormalArglistSsm.json5 +++ b/xo-reader2/idl/IPrintable_DExpectFormalArglistSsm.json5 @@ -1,5 +1,6 @@ { mode: "implementation", + output_cpp_dir: "src/reader2", includes: [ "", "" ], local_types: [], diff --git a/xo-reader2/idl/IPrintable_DExpectSymbolSsm.json5 b/xo-reader2/idl/IPrintable_DExpectSymbolSsm.json5 index 1d662986..1d003791 100644 --- a/xo-reader2/idl/IPrintable_DExpectSymbolSsm.json5 +++ b/xo-reader2/idl/IPrintable_DExpectSymbolSsm.json5 @@ -1,5 +1,6 @@ { mode: "implementation", + output_cpp_dir: "src/reader2", includes: [ "", "" ], local_types: [], diff --git a/xo-reader2/idl/IPrintable_DExpectTypeSsm.json5 b/xo-reader2/idl/IPrintable_DExpectTypeSsm.json5 index 1a4ddca2..4c3b8964 100644 --- a/xo-reader2/idl/IPrintable_DExpectTypeSsm.json5 +++ b/xo-reader2/idl/IPrintable_DExpectTypeSsm.json5 @@ -1,5 +1,6 @@ { mode: "implementation", + output_cpp_dir: "src/reader2", includes: [ "", "" ], local_types: [], diff --git a/xo-reader2/idl/IPrintable_DIfElseSsm.json5 b/xo-reader2/idl/IPrintable_DIfElseSsm.json5 index 28fab147..9c54fc71 100644 --- a/xo-reader2/idl/IPrintable_DIfElseSsm.json5 +++ b/xo-reader2/idl/IPrintable_DIfElseSsm.json5 @@ -1,5 +1,6 @@ { mode: "implementation", + output_cpp_dir: "src/reader2", includes: [ "", "" ], local_types: [], diff --git a/xo-reader2/idl/IPrintable_DLambdaSsm.json5 b/xo-reader2/idl/IPrintable_DLambdaSsm.json5 index 63fad901..9f2187df 100644 --- a/xo-reader2/idl/IPrintable_DLambdaSsm.json5 +++ b/xo-reader2/idl/IPrintable_DLambdaSsm.json5 @@ -1,5 +1,6 @@ { mode: "implementation", + output_cpp_dir: "src/reader2", includes: [ "", "" ], local_types: [], diff --git a/xo-reader2/idl/IPrintable_DParenSsm.json5 b/xo-reader2/idl/IPrintable_DParenSsm.json5 index 495729b5..9af85828 100644 --- a/xo-reader2/idl/IPrintable_DParenSsm.json5 +++ b/xo-reader2/idl/IPrintable_DParenSsm.json5 @@ -1,5 +1,6 @@ { mode: "implementation", + output_cpp_dir: "src/reader2", includes: [ "", "" ], local_types: [], diff --git a/xo-reader2/idl/IPrintable_DProgressSsm.json5 b/xo-reader2/idl/IPrintable_DProgressSsm.json5 index cc5a8dda..eb420da3 100644 --- a/xo-reader2/idl/IPrintable_DProgressSsm.json5 +++ b/xo-reader2/idl/IPrintable_DProgressSsm.json5 @@ -1,5 +1,6 @@ { mode: "implementation", + output_cpp_dir: "src/reader2", includes: [ "", "" ], local_types: [], diff --git a/xo-reader2/idl/IPrintable_DSequenceSsm.json5 b/xo-reader2/idl/IPrintable_DSequenceSsm.json5 index a217b24c..929060b0 100644 --- a/xo-reader2/idl/IPrintable_DSequenceSsm.json5 +++ b/xo-reader2/idl/IPrintable_DSequenceSsm.json5 @@ -1,5 +1,6 @@ { mode: "implementation", + output_cpp_dir: "src/reader2", includes: [ "", "" ], local_types: [], diff --git a/xo-reader2/idl/IPrintable_DToplevelSeqSsm.json5 b/xo-reader2/idl/IPrintable_DToplevelSeqSsm.json5 index 0c0f0200..8349bb04 100644 --- a/xo-reader2/idl/IPrintable_DToplevelSeqSsm.json5 +++ b/xo-reader2/idl/IPrintable_DToplevelSeqSsm.json5 @@ -1,5 +1,6 @@ { mode: "implementation", + output_cpp_dir: "src/reader2", includes: [ "", "" ], local_types: [], diff --git a/xo-reader2/idl/ISyntaxStateMachine_DApplySsm.json5 b/xo-reader2/idl/ISyntaxStateMachine_DApplySsm.json5 index 7806d2cb..2f08ccc5 100644 --- a/xo-reader2/idl/ISyntaxStateMachine_DApplySsm.json5 +++ b/xo-reader2/idl/ISyntaxStateMachine_DApplySsm.json5 @@ -1,5 +1,6 @@ { mode: "implementation", + output_cpp_dir: "src/reader2", includes: [ "\"SyntaxStateMachine.hpp\"", "\"ssm/ISyntaxStateMachine_Xfer.hpp\"" ], local_types: [ ], diff --git a/xo-reader2/idl/ISyntaxStateMachine_DDefineSsm.json5 b/xo-reader2/idl/ISyntaxStateMachine_DDefineSsm.json5 index 11d2c5f7..7aef2f5a 100644 --- a/xo-reader2/idl/ISyntaxStateMachine_DDefineSsm.json5 +++ b/xo-reader2/idl/ISyntaxStateMachine_DDefineSsm.json5 @@ -1,5 +1,6 @@ { mode: "implementation", + output_cpp_dir: "src/reader2", includes: [ "\"SyntaxStateMachine.hpp\"", "\"ssm/ISyntaxStateMachine_Xfer.hpp\"" ], local_types: [ ], diff --git a/xo-reader2/idl/ISyntaxStateMachine_DExpectExprSsm.json5 b/xo-reader2/idl/ISyntaxStateMachine_DExpectExprSsm.json5 index 068ac481..0b04e3d6 100644 --- a/xo-reader2/idl/ISyntaxStateMachine_DExpectExprSsm.json5 +++ b/xo-reader2/idl/ISyntaxStateMachine_DExpectExprSsm.json5 @@ -1,5 +1,6 @@ { mode: "implementation", + output_cpp_dir: "src/reader2", includes: [ "\"SyntaxStateMachine.hpp\"", "\"ssm/ISyntaxStateMachine_Xfer.hpp\"" ], local_types: [ ], diff --git a/xo-reader2/idl/ISyntaxStateMachine_DExpectFormalArgSsm.json5 b/xo-reader2/idl/ISyntaxStateMachine_DExpectFormalArgSsm.json5 index 4b83866e..83627a07 100644 --- a/xo-reader2/idl/ISyntaxStateMachine_DExpectFormalArgSsm.json5 +++ b/xo-reader2/idl/ISyntaxStateMachine_DExpectFormalArgSsm.json5 @@ -1,5 +1,6 @@ { mode: "implementation", + output_cpp_dir: "src/reader2", includes: [ "\"SyntaxStateMachine.hpp\"", "\"ssm/ISyntaxStateMachine_Xfer.hpp\"" ], local_types: [ ], diff --git a/xo-reader2/idl/ISyntaxStateMachine_DExpectFormalArglistSsm.json5 b/xo-reader2/idl/ISyntaxStateMachine_DExpectFormalArglistSsm.json5 index d3e16953..535e713f 100644 --- a/xo-reader2/idl/ISyntaxStateMachine_DExpectFormalArglistSsm.json5 +++ b/xo-reader2/idl/ISyntaxStateMachine_DExpectFormalArglistSsm.json5 @@ -1,5 +1,6 @@ { mode: "implementation", + output_cpp_dir: "src/reader2", includes: [ "\"SyntaxStateMachine.hpp\"", "\"ssm/ISyntaxStateMachine_Xfer.hpp\"" ], local_types: [ ], diff --git a/xo-reader2/idl/ISyntaxStateMachine_DExpectSymbolSsm.json5 b/xo-reader2/idl/ISyntaxStateMachine_DExpectSymbolSsm.json5 index 24b754e4..288b8256 100644 --- a/xo-reader2/idl/ISyntaxStateMachine_DExpectSymbolSsm.json5 +++ b/xo-reader2/idl/ISyntaxStateMachine_DExpectSymbolSsm.json5 @@ -1,5 +1,6 @@ { mode: "implementation", + output_cpp_dir: "src/reader2", includes: [ "\"SyntaxStateMachine.hpp\"", "\"ssm/ISyntaxStateMachine_Xfer.hpp\"" ], local_types: [ ], diff --git a/xo-reader2/idl/ISyntaxStateMachine_DExpectTypeSsm.json5 b/xo-reader2/idl/ISyntaxStateMachine_DExpectTypeSsm.json5 index d46aaff4..04617d60 100644 --- a/xo-reader2/idl/ISyntaxStateMachine_DExpectTypeSsm.json5 +++ b/xo-reader2/idl/ISyntaxStateMachine_DExpectTypeSsm.json5 @@ -1,5 +1,6 @@ { mode: "implementation", + output_cpp_dir: "src/reader2", includes: [ "\"SyntaxStateMachine.hpp\"", "\"ssm/ISyntaxStateMachine_Xfer.hpp\"" ], local_types: [ ], diff --git a/xo-reader2/idl/ISyntaxStateMachine_DIfElseSsm.json5 b/xo-reader2/idl/ISyntaxStateMachine_DIfElseSsm.json5 index 5e7e828b..23a4e35d 100644 --- a/xo-reader2/idl/ISyntaxStateMachine_DIfElseSsm.json5 +++ b/xo-reader2/idl/ISyntaxStateMachine_DIfElseSsm.json5 @@ -1,5 +1,6 @@ { mode: "implementation", + output_cpp_dir: "src/reader2", includes: [ "\"SyntaxStateMachine.hpp\"", "\"ssm/ISyntaxStateMachine_Xfer.hpp\"" ], local_types: [ ], diff --git a/xo-reader2/idl/ISyntaxStateMachine_DLambdaSsm.json5 b/xo-reader2/idl/ISyntaxStateMachine_DLambdaSsm.json5 index a24f0147..bd32a95b 100644 --- a/xo-reader2/idl/ISyntaxStateMachine_DLambdaSsm.json5 +++ b/xo-reader2/idl/ISyntaxStateMachine_DLambdaSsm.json5 @@ -1,5 +1,6 @@ { mode: "implementation", + output_cpp_dir: "src/reader2", includes: [ "\"SyntaxStateMachine.hpp\"", "\"ssm/ISyntaxStateMachine_Xfer.hpp\"" ], local_types: [ ], diff --git a/xo-reader2/idl/ISyntaxStateMachine_DParenSsm.json5 b/xo-reader2/idl/ISyntaxStateMachine_DParenSsm.json5 index 521e7ba8..9d24338d 100644 --- a/xo-reader2/idl/ISyntaxStateMachine_DParenSsm.json5 +++ b/xo-reader2/idl/ISyntaxStateMachine_DParenSsm.json5 @@ -1,5 +1,6 @@ { mode: "implementation", + output_cpp_dir: "src/reader2", includes: [ "\"SyntaxStateMachine.hpp\"", "\"ssm/ISyntaxStateMachine_Xfer.hpp\"" ], local_types: [ ], diff --git a/xo-reader2/idl/ISyntaxStateMachine_DProgressSsm.json5 b/xo-reader2/idl/ISyntaxStateMachine_DProgressSsm.json5 index 807e5ec3..9a141775 100644 --- a/xo-reader2/idl/ISyntaxStateMachine_DProgressSsm.json5 +++ b/xo-reader2/idl/ISyntaxStateMachine_DProgressSsm.json5 @@ -1,5 +1,6 @@ { mode: "implementation", + output_cpp_dir: "src/reader2", includes: [ "\"SyntaxStateMachine.hpp\"", "\"ssm/ISyntaxStateMachine_Xfer.hpp\"" ], local_types: [ ], diff --git a/xo-reader2/idl/ISyntaxStateMachine_DSequenceSsm.json5 b/xo-reader2/idl/ISyntaxStateMachine_DSequenceSsm.json5 index 7538c09b..c9319948 100644 --- a/xo-reader2/idl/ISyntaxStateMachine_DSequenceSsm.json5 +++ b/xo-reader2/idl/ISyntaxStateMachine_DSequenceSsm.json5 @@ -1,5 +1,6 @@ { mode: "implementation", + output_cpp_dir: "src/reader2", includes: [ "\"SyntaxStateMachine.hpp\"", "\"ssm/ISyntaxStateMachine_Xfer.hpp\"" ], local_types: [ ], diff --git a/xo-reader2/idl/ISyntaxStateMachine_DToplevelSeqSsm.json5 b/xo-reader2/idl/ISyntaxStateMachine_DToplevelSeqSsm.json5 index f13b3137..e94779f5 100644 --- a/xo-reader2/idl/ISyntaxStateMachine_DToplevelSeqSsm.json5 +++ b/xo-reader2/idl/ISyntaxStateMachine_DToplevelSeqSsm.json5 @@ -1,5 +1,6 @@ { mode: "implementation", + output_cpp_dir: "src/reader2", includes: [ "\"SyntaxStateMachine.hpp\"", "\"ssm/ISyntaxStateMachine_Xfer.hpp\"" ], local_types: [ ], diff --git a/xo-reader2/idl/SyntaxStateMachine.json5 b/xo-reader2/idl/SyntaxStateMachine.json5 index 4e33e468..d204a265 100644 --- a/xo-reader2/idl/SyntaxStateMachine.json5 +++ b/xo-reader2/idl/SyntaxStateMachine.json5 @@ -1,5 +1,6 @@ { mode: "facet", + output_cpp_dir: "src/reader2", // includes in ASyntaxStateMachine.hpp includes: [ "\"ParserStateMachine.hpp\"", diff --git a/xo-reader2/include/xo/reader2/ssm/IPrintable_DToplevelSeqSsm.hpp b/xo-reader2/include/xo/reader2/ssm/IPrintable_DToplevelSeqSsm.hpp index d411a87e..b219b589 100644 --- a/xo-reader2/include/xo/reader2/ssm/IPrintable_DToplevelSeqSsm.hpp +++ b/xo-reader2/include/xo/reader2/ssm/IPrintable_DToplevelSeqSsm.hpp @@ -39,13 +39,13 @@ namespace xo { **/ class IPrintable_DToplevelSeqSsm { public: - /** @defgroup scm-printable-dexprseqstate-type-traits **/ + /** @defgroup scm-printable-dtoplevelseqssm-type-traits **/ ///@{ using ppindentinfo = xo::print::APrintable::ppindentinfo; using Copaque = xo::print::APrintable::Copaque; using Opaque = xo::print::APrintable::Opaque; ///@} - /** @defgroup scm-printable-dexprseqstate-methods **/ + /** @defgroup scm-printable-dtoplevelseqssm-methods **/ ///@{ // const methods /** Pretty-printing support for this object. diff --git a/xo-reader2/include/xo/reader2/ssm/ISyntaxStateMachine_DToplevelSeqSsm.hpp b/xo-reader2/include/xo/reader2/ssm/ISyntaxStateMachine_DToplevelSeqSsm.hpp index 3bf58e17..1d91c13d 100644 --- a/xo-reader2/include/xo/reader2/ssm/ISyntaxStateMachine_DToplevelSeqSsm.hpp +++ b/xo-reader2/include/xo/reader2/ssm/ISyntaxStateMachine_DToplevelSeqSsm.hpp @@ -39,13 +39,13 @@ namespace xo { **/ class ISyntaxStateMachine_DToplevelSeqSsm { public: - /** @defgroup scm-syntaxstatemachine-dexprseqstate-type-traits **/ + /** @defgroup scm-syntaxstatemachine-dtoplevelseqssm-type-traits **/ ///@{ using TypeDescr = xo::scm::ASyntaxStateMachine::TypeDescr; using Copaque = xo::scm::ASyntaxStateMachine::Copaque; using Opaque = xo::scm::ASyntaxStateMachine::Opaque; ///@} - /** @defgroup scm-syntaxstatemachine-dexprseqstate-methods **/ + /** @defgroup scm-syntaxstatemachine-dtoplevelseqssm-methods **/ ///@{ // const methods /** identify a type of syntax state machine **/