From bc5d96223d0297d2cd4ebcb4bf2e70e74926b7f3 Mon Sep 17 00:00:00 2001 From: Roland Conybeare Date: Tue, 17 Mar 2026 12:57:41 -0400 Subject: [PATCH] xo-reader2: refactor: move ExpectFormalArgSsm support -> subdir --- xo-reader2/idl/IPrintable_DExpectFormalArgSsm.json5 | 4 ++-- .../ISyntaxStateMachine_DExpectFormalArgSsm.json5 | 4 ++-- .../include/xo/reader2/ExpectFormalArgSsm.hpp | 6 +++--- .../{ => expect_formal_arg}/DExpectFormalArgSsm.hpp | 0 .../IPrintable_DExpectFormalArgSsm.hpp | 0 .../ISyntaxStateMachine_DExpectFormalArgSsm.hpp | 0 xo-reader2/src/reader2/CMakeLists.txt | 4 ++-- xo-reader2/src/reader2/DExpectFormalArgSsm.cpp | 13 +++---------- xo-reader2/src/reader2/DExpectFormalArglistSsm.cpp | 8 ++++---- .../{ => facet}/IPrintable_DExpectFormalArgSsm.cpp | 2 +- .../ISyntaxStateMachine_DExpectFormalArgSsm.cpp | 2 +- 11 files changed, 18 insertions(+), 25 deletions(-) rename xo-reader2/include/xo/reader2/{ => expect_formal_arg}/DExpectFormalArgSsm.hpp (100%) rename xo-reader2/include/xo/reader2/{ssm => expect_formal_arg}/IPrintable_DExpectFormalArgSsm.hpp (100%) rename xo-reader2/include/xo/reader2/{ssm => expect_formal_arg}/ISyntaxStateMachine_DExpectFormalArgSsm.hpp (100%) rename xo-reader2/src/reader2/{ => facet}/IPrintable_DExpectFormalArgSsm.cpp (91%) rename xo-reader2/src/reader2/{ => facet}/ISyntaxStateMachine_DExpectFormalArgSsm.cpp (97%) diff --git a/xo-reader2/idl/IPrintable_DExpectFormalArgSsm.json5 b/xo-reader2/idl/IPrintable_DExpectFormalArgSsm.json5 index 73389166..2c2dbaab 100644 --- a/xo-reader2/idl/IPrintable_DExpectFormalArgSsm.json5 +++ b/xo-reader2/idl/IPrintable_DExpectFormalArgSsm.json5 @@ -1,8 +1,8 @@ { mode: "implementation", - output_cpp_dir: "src/reader2", + output_cpp_dir: "src/reader2/facet", output_hpp_dir: "include/xo/reader2", - output_impl_subdir: "ssm", + output_impl_subdir: "expect_formal_arg", includes: [ "", "" ], local_types: [], diff --git a/xo-reader2/idl/ISyntaxStateMachine_DExpectFormalArgSsm.json5 b/xo-reader2/idl/ISyntaxStateMachine_DExpectFormalArgSsm.json5 index e3486759..e3ae1ac5 100644 --- a/xo-reader2/idl/ISyntaxStateMachine_DExpectFormalArgSsm.json5 +++ b/xo-reader2/idl/ISyntaxStateMachine_DExpectFormalArgSsm.json5 @@ -1,8 +1,8 @@ { mode: "implementation", - output_cpp_dir: "src/reader2", + output_cpp_dir: "src/reader2/facet", output_hpp_dir: "include/xo/reader2", - output_impl_subdir: "ssm", + output_impl_subdir: "expect_formal_arg", includes: [ "\"SyntaxStateMachine.hpp\"", "\"ssm/ISyntaxStateMachine_Xfer.hpp\"" ], local_types: [ ], diff --git a/xo-reader2/include/xo/reader2/ExpectFormalArgSsm.hpp b/xo-reader2/include/xo/reader2/ExpectFormalArgSsm.hpp index f0aaa9ed..fc3dbe52 100644 --- a/xo-reader2/include/xo/reader2/ExpectFormalArgSsm.hpp +++ b/xo-reader2/include/xo/reader2/ExpectFormalArgSsm.hpp @@ -5,8 +5,8 @@ #pragma once -#include "DExpectFormalArgSsm.hpp" -#include "ssm/ISyntaxStateMachine_DExpectFormalArgSsm.hpp" -#include "ssm/IPrintable_DExpectFormalArgSsm.hpp" +#include "expect_formal_arg/DExpectFormalArgSsm.hpp" +#include "expect_formal_arg/ISyntaxStateMachine_DExpectFormalArgSsm.hpp" +#include "expect_formal_arg/IPrintable_DExpectFormalArgSsm.hpp" /* end ExpectFormalArgSsm.hpp */ diff --git a/xo-reader2/include/xo/reader2/DExpectFormalArgSsm.hpp b/xo-reader2/include/xo/reader2/expect_formal_arg/DExpectFormalArgSsm.hpp similarity index 100% rename from xo-reader2/include/xo/reader2/DExpectFormalArgSsm.hpp rename to xo-reader2/include/xo/reader2/expect_formal_arg/DExpectFormalArgSsm.hpp diff --git a/xo-reader2/include/xo/reader2/ssm/IPrintable_DExpectFormalArgSsm.hpp b/xo-reader2/include/xo/reader2/expect_formal_arg/IPrintable_DExpectFormalArgSsm.hpp similarity index 100% rename from xo-reader2/include/xo/reader2/ssm/IPrintable_DExpectFormalArgSsm.hpp rename to xo-reader2/include/xo/reader2/expect_formal_arg/IPrintable_DExpectFormalArgSsm.hpp diff --git a/xo-reader2/include/xo/reader2/ssm/ISyntaxStateMachine_DExpectFormalArgSsm.hpp b/xo-reader2/include/xo/reader2/expect_formal_arg/ISyntaxStateMachine_DExpectFormalArgSsm.hpp similarity index 100% rename from xo-reader2/include/xo/reader2/ssm/ISyntaxStateMachine_DExpectFormalArgSsm.hpp rename to xo-reader2/include/xo/reader2/expect_formal_arg/ISyntaxStateMachine_DExpectFormalArgSsm.hpp diff --git a/xo-reader2/src/reader2/CMakeLists.txt b/xo-reader2/src/reader2/CMakeLists.txt index 3cbe3984..dd88bbd6 100644 --- a/xo-reader2/src/reader2/CMakeLists.txt +++ b/xo-reader2/src/reader2/CMakeLists.txt @@ -57,8 +57,8 @@ set(SELF_SRCS IPrintable_DExpectFormalArglistSsm.cpp DExpectFormalArgSsm.cpp - ISyntaxStateMachine_DExpectFormalArgSsm.cpp - IPrintable_DExpectFormalArgSsm.cpp + facet/ISyntaxStateMachine_DExpectFormalArgSsm.cpp + facet/IPrintable_DExpectFormalArgSsm.cpp DExpectSymbolSsm.cpp ISyntaxStateMachine_DExpectSymbolSsm.cpp diff --git a/xo-reader2/src/reader2/DExpectFormalArgSsm.cpp b/xo-reader2/src/reader2/DExpectFormalArgSsm.cpp index b8c5f425..eeecdc54 100644 --- a/xo-reader2/src/reader2/DExpectFormalArgSsm.cpp +++ b/xo-reader2/src/reader2/DExpectFormalArgSsm.cpp @@ -3,16 +3,9 @@ * @author Roland Conybeare, Jan 2026 **/ -#include "DExpectFormalArgSsm.hpp" -#include "ssm/ISyntaxStateMachine_DExpectFormalArgSsm.hpp" -#include "DExpectSymbolSsm.hpp" -#include "ssm/ISyntaxStateMachine_DExpectSymbolSsm.hpp" -#include "DExpectTypeSsm.hpp" -#include "ssm/ISyntaxStateMachine_DExpectTypeSsm.hpp" - -#ifdef NOT_YET -#include "xo/expression/Variable.hpp" -#endif +#include "ExpectFormalArgSsm.hpp" +#include "ExpectSymbolSsm.hpp" +#include "ExpectTypeSsm.hpp" namespace xo { using xo::scm::DVariable; diff --git a/xo-reader2/src/reader2/DExpectFormalArglistSsm.cpp b/xo-reader2/src/reader2/DExpectFormalArglistSsm.cpp index d68beef5..0c367547 100644 --- a/xo-reader2/src/reader2/DExpectFormalArglistSsm.cpp +++ b/xo-reader2/src/reader2/DExpectFormalArglistSsm.cpp @@ -3,10 +3,10 @@ * @author Roland Conybeare, Jan 2026 */ -#include "DExpectFormalArglistSsm.hpp" -#include "ssm/ISyntaxStateMachine_DExpectFormalArglistSsm.hpp" -#include "DExpectFormalArgSsm.hpp" -#include "ssm/ISyntaxStateMachine_DExpectFormalArgSsm.hpp" +#include "ExpectFormalArglistSsm.hpp" +//#include "ssm/ISyntaxStateMachine_DExpectFormalArglistSsm.hpp" +#include "ExpectFormalArgSsm.hpp" +//#include "ssm/ISyntaxStateMachine_DExpectFormalArgSsm.hpp" #include #include #include diff --git a/xo-reader2/src/reader2/IPrintable_DExpectFormalArgSsm.cpp b/xo-reader2/src/reader2/facet/IPrintable_DExpectFormalArgSsm.cpp similarity index 91% rename from xo-reader2/src/reader2/IPrintable_DExpectFormalArgSsm.cpp rename to xo-reader2/src/reader2/facet/IPrintable_DExpectFormalArgSsm.cpp index 13164b15..bdcf6a61 100644 --- a/xo-reader2/src/reader2/IPrintable_DExpectFormalArgSsm.cpp +++ b/xo-reader2/src/reader2/facet/IPrintable_DExpectFormalArgSsm.cpp @@ -11,7 +11,7 @@ * [idl/IPrintable_DExpectFormalArgSsm.json5] **/ -#include "ssm/IPrintable_DExpectFormalArgSsm.hpp" +#include "expect_formal_arg/IPrintable_DExpectFormalArgSsm.hpp" namespace xo { namespace scm { diff --git a/xo-reader2/src/reader2/ISyntaxStateMachine_DExpectFormalArgSsm.cpp b/xo-reader2/src/reader2/facet/ISyntaxStateMachine_DExpectFormalArgSsm.cpp similarity index 97% rename from xo-reader2/src/reader2/ISyntaxStateMachine_DExpectFormalArgSsm.cpp rename to xo-reader2/src/reader2/facet/ISyntaxStateMachine_DExpectFormalArgSsm.cpp index 1089d5ee..96a7fb29 100644 --- a/xo-reader2/src/reader2/ISyntaxStateMachine_DExpectFormalArgSsm.cpp +++ b/xo-reader2/src/reader2/facet/ISyntaxStateMachine_DExpectFormalArgSsm.cpp @@ -11,7 +11,7 @@ * [idl/ISyntaxStateMachine_DExpectFormalArgSsm.json5] **/ -#include "ssm/ISyntaxStateMachine_DExpectFormalArgSsm.hpp" +#include "expect_formal_arg/ISyntaxStateMachine_DExpectFormalArgSsm.hpp" namespace xo { namespace scm {