xo-expression2: refactor: layout Variable support file locn

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",

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: [
         "<xo/alloc2/GCObject.hpp>",
         "<xo/alloc2/Allocator.hpp>"

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: [ "<xo/printable2/Printable.hpp>",
                 "<xo/printable2/detail/IPrintable_Xfer.hpp>" ],
     local_types: [ ],

include/xo/expression2/Variable.hpp

@@ -6,8 +6,8 @@
 #pragma once
 
 #include "DVariable.hpp"
-#include "detail/IExpression_DVariable.hpp"
+#include "variable/IExpression_DVariable.hpp"
-#include "detail/IGCObject_DVariable.hpp"
+#include "variable/IGCObject_DVariable.hpp"
-#include "detail/IPrintable_DVariable.hpp"
+#include "variable/IPrintable_DVariable.hpp"
 
 /* end Variable.hpp */

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
+    DVariable.cpp
-    IGCObject_DVariable.cpp
+    facet/IExpression_DVariable.cpp
-    IPrintable_DVariable.cpp
+    facet/IGCObject_DVariable.cpp
+    facet/IPrintable_DVariable.cpp
 
     IExpression_DVarRef.cpp
     IGCObject_DVarRef.cpp

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 {

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 {

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 {