From c38ab90cddf32f183137e265446baea45546d32e Mon Sep 17 00:00:00 2001 From: Roland Conybeare Date: Thu, 19 Mar 2026 11:34:07 -0400 Subject: [PATCH] xo-expression2: refactor: layout Variable support file locn --- idl/IExpression_DVariable.json5 | 4 ++-- idl/IGCObject_DVariable.json5 | 4 ++-- idl/IPrintable_DVariable.json5 | 4 ++-- include/xo/expression2/Variable.hpp | 6 +++--- .../{detail => variable}/IExpression_DVariable.hpp | 0 .../{detail => variable}/IGCObject_DVariable.hpp | 0 .../{detail => variable}/IPrintable_DVariable.hpp | 0 src/expression2/CMakeLists.txt | 8 ++++---- src/expression2/{ => facet}/IExpression_DVariable.cpp | 2 +- src/expression2/{ => facet}/IGCObject_DVariable.cpp | 2 +- src/expression2/{ => facet}/IPrintable_DVariable.cpp | 2 +- 11 files changed, 16 insertions(+), 16 deletions(-) rename include/xo/expression2/{detail => variable}/IExpression_DVariable.hpp (100%) rename include/xo/expression2/{detail => variable}/IGCObject_DVariable.hpp (100%) rename include/xo/expression2/{detail => variable}/IPrintable_DVariable.hpp (100%) rename src/expression2/{ => facet}/IExpression_DVariable.cpp (96%) rename src/expression2/{ => facet}/IGCObject_DVariable.cpp (95%) rename src/expression2/{ => facet}/IPrintable_DVariable.cpp (93%) diff --git a/idl/IExpression_DVariable.json5 b/idl/IExpression_DVariable.json5 index c68a9609..cfc0b599 100644 --- a/idl/IExpression_DVariable.json5 +++ b/idl/IExpression_DVariable.json5 @@ -1,8 +1,8 @@ { mode: "implementation", - output_cpp_dir: "src/expression2", + output_cpp_dir: "src/expression2/facet", output_hpp_dir: "include/xo/expression2", - output_impl_subdir: "detail", + output_impl_subdir: "variable", includes: [ "\"Expression.hpp\"" ], local_types: [ ], namespace1: "xo", diff --git a/idl/IGCObject_DVariable.json5 b/idl/IGCObject_DVariable.json5 index b9f27623..f589430f 100644 --- a/idl/IGCObject_DVariable.json5 +++ b/idl/IGCObject_DVariable.json5 @@ -1,8 +1,8 @@ { mode: "implementation", - output_cpp_dir: "src/expression2", + output_cpp_dir: "src/expression2/facet", output_hpp_dir: "include/xo/expression2", - output_impl_subdir: "detail", + output_impl_subdir: "variable", includes: [ "", "" diff --git a/idl/IPrintable_DVariable.json5 b/idl/IPrintable_DVariable.json5 index 779afd25..b300b7be 100644 --- a/idl/IPrintable_DVariable.json5 +++ b/idl/IPrintable_DVariable.json5 @@ -1,8 +1,8 @@ { mode: "implementation", - output_cpp_dir: "src/expression2", + output_cpp_dir: "src/expression2/facet", output_hpp_dir: "include/xo/expression2", - output_impl_subdir: "detail", + output_impl_subdir: "variable", includes: [ "", "" ], local_types: [ ], diff --git a/include/xo/expression2/Variable.hpp b/include/xo/expression2/Variable.hpp index 26ef649b..43141578 100644 --- a/include/xo/expression2/Variable.hpp +++ b/include/xo/expression2/Variable.hpp @@ -6,8 +6,8 @@ #pragma once #include "DVariable.hpp" -#include "detail/IExpression_DVariable.hpp" -#include "detail/IGCObject_DVariable.hpp" -#include "detail/IPrintable_DVariable.hpp" +#include "variable/IExpression_DVariable.hpp" +#include "variable/IGCObject_DVariable.hpp" +#include "variable/IPrintable_DVariable.hpp" /* end Variable.hpp */ diff --git a/include/xo/expression2/detail/IExpression_DVariable.hpp b/include/xo/expression2/variable/IExpression_DVariable.hpp similarity index 100% rename from include/xo/expression2/detail/IExpression_DVariable.hpp rename to include/xo/expression2/variable/IExpression_DVariable.hpp diff --git a/include/xo/expression2/detail/IGCObject_DVariable.hpp b/include/xo/expression2/variable/IGCObject_DVariable.hpp similarity index 100% rename from include/xo/expression2/detail/IGCObject_DVariable.hpp rename to include/xo/expression2/variable/IGCObject_DVariable.hpp diff --git a/include/xo/expression2/detail/IPrintable_DVariable.hpp b/include/xo/expression2/variable/IPrintable_DVariable.hpp similarity index 100% rename from include/xo/expression2/detail/IPrintable_DVariable.hpp rename to include/xo/expression2/variable/IPrintable_DVariable.hpp diff --git a/src/expression2/CMakeLists.txt b/src/expression2/CMakeLists.txt index 574b9526..6372ca28 100644 --- a/src/expression2/CMakeLists.txt +++ b/src/expression2/CMakeLists.txt @@ -6,7 +6,6 @@ set(SELF_SRCS SetupExpression2.cpp DConstant.cpp - DVariable.cpp DVarRef.cpp DApplyExpr.cpp @@ -20,9 +19,10 @@ set(SELF_SRCS IGCObject_DConstant.cpp IPrintable_DConstant.cpp - IExpression_DVariable.cpp - IGCObject_DVariable.cpp - IPrintable_DVariable.cpp + DVariable.cpp + facet/IExpression_DVariable.cpp + facet/IGCObject_DVariable.cpp + facet/IPrintable_DVariable.cpp IExpression_DVarRef.cpp IGCObject_DVarRef.cpp diff --git a/src/expression2/IExpression_DVariable.cpp b/src/expression2/facet/IExpression_DVariable.cpp similarity index 96% rename from src/expression2/IExpression_DVariable.cpp rename to src/expression2/facet/IExpression_DVariable.cpp index bea2a24e..49b9cfbc 100644 --- a/src/expression2/IExpression_DVariable.cpp +++ b/src/expression2/facet/IExpression_DVariable.cpp @@ -11,7 +11,7 @@ * [idl/IExpression_DVariable.json5] **/ -#include "detail/IExpression_DVariable.hpp" +#include "variable/IExpression_DVariable.hpp" namespace xo { namespace scm { diff --git a/src/expression2/IGCObject_DVariable.cpp b/src/expression2/facet/IGCObject_DVariable.cpp similarity index 95% rename from src/expression2/IGCObject_DVariable.cpp rename to src/expression2/facet/IGCObject_DVariable.cpp index ecc403ef..e0dc04f7 100644 --- a/src/expression2/IGCObject_DVariable.cpp +++ b/src/expression2/facet/IGCObject_DVariable.cpp @@ -11,7 +11,7 @@ * [idl/IGCObject_DVariable.json5] **/ -#include "detail/IGCObject_DVariable.hpp" +#include "variable/IGCObject_DVariable.hpp" namespace xo { namespace scm { diff --git a/src/expression2/IPrintable_DVariable.cpp b/src/expression2/facet/IPrintable_DVariable.cpp similarity index 93% rename from src/expression2/IPrintable_DVariable.cpp rename to src/expression2/facet/IPrintable_DVariable.cpp index 53364de5..e7dc3d07 100644 --- a/src/expression2/IPrintable_DVariable.cpp +++ b/src/expression2/facet/IPrintable_DVariable.cpp @@ -11,7 +11,7 @@ * [idl/IPrintable_DVariable.json5] **/ -#include "detail/IPrintable_DVariable.hpp" +#include "variable/IPrintable_DVariable.hpp" namespace xo { namespace scm {