diff --git a/xo-object2/CMakeLists.txt b/xo-object2/CMakeLists.txt index b0141c62..81000f8d 100644 --- a/xo-object2/CMakeLists.txt +++ b/xo-object2/CMakeLists.txt @@ -40,18 +40,6 @@ xo_add_genfacetimpl( OUTPUT_CPP_DIR src/object2 ) -# note: manual target; generated code committed to git -xo_add_genfacetimpl( - TARGET xo-object2-facetimpl-printable-float - FACET_PKG xo_printable2 - FACET Printable - REPR Float - INPUT idl/IPrintable_DFloat.json5 - OUTPUT_HPP_DIR include/xo/object2 - OUTPUT_IMPL_SUBDIR . - OUTPUT_CPP_DIR src/object2 -) - # note: manual target; generated code committed to git xo_add_genfacetimpl( TARGET xo-object2-facetimpl-printable-list @@ -60,6 +48,18 @@ xo_add_genfacetimpl( REPR List 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 +xo_add_genfacetimpl( + TARGET xo-object2-facetimpl-printable-float + FACET_PKG xo_printable2 + FACET Printable + REPR Float + INPUT idl/IPrintable_DFloat.json5 + OUTPUT_HPP_DIR include/xo/object2 OUTPUT_IMPL_SUBDIR . OUTPUT_CPP_DIR src/object2 ) diff --git a/xo-object2/idl/IPrintable_DList.json5 b/xo-object2/idl/IPrintable_DList.json5 index 478ce7c2..640d7d1d 100644 --- a/xo-object2/idl/IPrintable_DList.json5 +++ b/xo-object2/idl/IPrintable_DList.json5 @@ -2,6 +2,7 @@ mode: "implementation", includes: [ "", "" ], + local_types: [ ], namespace1: "xo", namespace2: "scm", facet_idl: "idl/Printable.json5", diff --git a/xo-object2/idl/ISequence_DList.json5 b/xo-object2/idl/ISequence_DList.json5 index 8edbd16a..677285da 100644 --- a/xo-object2/idl/ISequence_DList.json5 +++ b/xo-object2/idl/ISequence_DList.json5 @@ -8,6 +8,5 @@ brief: "provide ASequence interface for DList state", using_doxygen: true, repr: "DList", - doc: [ "doc for something or other" - ], + doc: [ "implement ASequence for DList" ], } \ No newline at end of file diff --git a/xo-object2/include/xo/object2/IPrintable_DList.hpp b/xo-object2/include/xo/object2/list/IPrintable_DList.hpp similarity index 81% rename from xo-object2/include/xo/object2/IPrintable_DList.hpp rename to xo-object2/include/xo/object2/list/IPrintable_DList.hpp index ac4c5315..4371fdfb 100644 --- a/xo-object2/include/xo/object2/IPrintable_DList.hpp +++ b/xo-object2/include/xo/object2/list/IPrintable_DList.hpp @@ -2,17 +2,18 @@ * * Generated automagically from ingredients: * 1. code generator: - * [/home/roland/proj/xo-umbrella2/xo-facet/codegen/genfacet] + * [/Users/roland/proj/xo-umbrella2/xo-facet/codegen/genfacet] * arguments: * --input [idl/IPrintable_DList.json5] * 2. jinja2 template for abstract facet .hpp file: - * [iface_facet_any.hpp.j2] + * [iface_facet_repr.hpp.j2] * 3. idl for facet methods * [idl/IPrintable_DList.json5] **/ #pragma once +#include "Printable.hpp" #include #include #include "DList.hpp" @@ -41,17 +42,21 @@ namespace xo { /** @defgroup scm-printable-dlist-type-traits **/ ///@{ using ppindentinfo = xo::print::APrintable::ppindentinfo; + using Copaque = xo::print::APrintable::Copaque; + using Opaque = xo::print::APrintable::Opaque; ///@} /** @defgroup scm-printable-dlist-methods **/ ///@{ + // const methods /** Pretty-printing support for this object. See [xo-indentlog/xo/indentlog/pretty.hpp] **/ static bool pretty(const DList & self, const ppindentinfo & ppii); + // non-const methods ///@} }; } /*namespace scm*/ } /*namespace xo*/ -/* end */ +/* end */ \ No newline at end of file diff --git a/xo-object2/src/object2/DList.cpp b/xo-object2/src/object2/DList.cpp index 19e09e11..ccd5193c 100644 --- a/xo-object2/src/object2/DList.cpp +++ b/xo-object2/src/object2/DList.cpp @@ -4,7 +4,7 @@ **/ #include "DList.hpp" -#include "IPrintable_DList.hpp" +#include "list/IPrintable_DList.hpp" #include #include #include diff --git a/xo-object2/src/object2/IPrintable_DList.cpp b/xo-object2/src/object2/IPrintable_DList.cpp index bdcf6694..384d8b60 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/xo-facet/codegen/genfacet] + * [/Users/roland/proj/xo-umbrella2/xo-facet/codegen/genfacet] * arguments: * --input [idl/IPrintable_DList.json5] * 2. jinja2 template for abstract facet .hpp file: @@ -11,8 +11,7 @@ * [idl/IPrintable_DList.json5] **/ -#include "IPrintable_DList.hpp" -#include +#include "list/IPrintable_DList.hpp" namespace xo { namespace scm { @@ -26,4 +25,4 @@ namespace xo { } /*namespace scm*/ } /*namespace xo*/ -/* end IPrintable_DList.cpp */ +/* end IPrintable_DList.cpp */ \ No newline at end of file diff --git a/xo-object2/src/object2/object2_register_facets.cpp b/xo-object2/src/object2/object2_register_facets.cpp index 9cf67988..704af85f 100644 --- a/xo-object2/src/object2/object2_register_facets.cpp +++ b/xo-object2/src/object2/object2_register_facets.cpp @@ -10,7 +10,7 @@ #include #include -#include +#include #include #include #include diff --git a/xo-object2/src/object2/object2_register_types.cpp b/xo-object2/src/object2/object2_register_types.cpp index b8b68756..ff2c6eb9 100644 --- a/xo-object2/src/object2/object2_register_types.cpp +++ b/xo-object2/src/object2/object2_register_types.cpp @@ -10,7 +10,7 @@ #include "IGCObject_DInteger.hpp" #include "string/IGCObject_DString.hpp" -#include "IPrintable_DList.hpp" +#include "list/IPrintable_DList.hpp" //#include "IPrintable_DFloat.hpp" #include "IPrintable_DInteger.hpp" diff --git a/xo-object2/utest/Printable.test.cpp b/xo-object2/utest/Printable.test.cpp index f61e06aa..45e824e0 100644 --- a/xo-object2/utest/Printable.test.cpp +++ b/xo-object2/utest/Printable.test.cpp @@ -10,7 +10,7 @@ #include #include -#include +#include #include #include