From afe34f1d8a34b8d247ba6c66eae4798a329f19bd Mon Sep 17 00:00:00 2001 From: Roland Conybeare Date: Wed, 11 Mar 2026 10:21:17 -0500 Subject: [PATCH] xo-reader2: refactor: generated file locn for IfElseSsm --- idl/IPrintable_DIfElseSsm.json5 | 4 ++-- idl/ISyntaxStateMachine_DIfElseSsm.json5 | 4 ++-- include/xo/reader2/IfElseSsm.hpp | 6 +++--- include/xo/reader2/{ => ifelse}/DIfElseSsm.hpp | 0 .../reader2/{ssm => ifelse}/IPrintable_DIfElseSsm.hpp | 0 .../{ssm => ifelse}/ISyntaxStateMachine_DIfElseSsm.hpp | 0 src/reader2/CMakeLists.txt | 4 ++-- src/reader2/DIfElseSsm.cpp | 10 +++------- src/reader2/DToplevelSeqSsm.cpp | 3 ++- src/reader2/{ => facet}/IPrintable_DIfElseSsm.cpp | 2 +- .../{ => facet}/ISyntaxStateMachine_DIfElseSsm.cpp | 2 +- 11 files changed, 16 insertions(+), 19 deletions(-) rename include/xo/reader2/{ => ifelse}/DIfElseSsm.hpp (100%) rename include/xo/reader2/{ssm => ifelse}/IPrintable_DIfElseSsm.hpp (100%) rename include/xo/reader2/{ssm => ifelse}/ISyntaxStateMachine_DIfElseSsm.hpp (100%) rename src/reader2/{ => facet}/IPrintable_DIfElseSsm.cpp (93%) rename src/reader2/{ => facet}/ISyntaxStateMachine_DIfElseSsm.cpp (98%) diff --git a/idl/IPrintable_DIfElseSsm.json5 b/idl/IPrintable_DIfElseSsm.json5 index dbcdbb0a..7c57eb7a 100644 --- a/idl/IPrintable_DIfElseSsm.json5 +++ b/idl/IPrintable_DIfElseSsm.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: "ifelse", includes: [ "", "" ], local_types: [], diff --git a/idl/ISyntaxStateMachine_DIfElseSsm.json5 b/idl/ISyntaxStateMachine_DIfElseSsm.json5 index 25feadde..eb2ea371 100644 --- a/idl/ISyntaxStateMachine_DIfElseSsm.json5 +++ b/idl/ISyntaxStateMachine_DIfElseSsm.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: "ifelse", includes: [ "\"SyntaxStateMachine.hpp\"", "\"ssm/ISyntaxStateMachine_Xfer.hpp\"" ], local_types: [ ], diff --git a/include/xo/reader2/IfElseSsm.hpp b/include/xo/reader2/IfElseSsm.hpp index eaa6948d..7fa7fcc5 100644 --- a/include/xo/reader2/IfElseSsm.hpp +++ b/include/xo/reader2/IfElseSsm.hpp @@ -5,8 +5,8 @@ #pragma once -#include "DIfElseSsm.hpp" -#include "ssm/ISyntaxStateMachine_DIfElseSsm.hpp" -#include "ssm/IPrintable_DIfElseSsm.hpp" +#include "ifelse/DIfElseSsm.hpp" +#include "ifelse/ISyntaxStateMachine_DIfElseSsm.hpp" +#include "ifelse/IPrintable_DIfElseSsm.hpp" /* end IfElseSsm.hpp */ diff --git a/include/xo/reader2/DIfElseSsm.hpp b/include/xo/reader2/ifelse/DIfElseSsm.hpp similarity index 100% rename from include/xo/reader2/DIfElseSsm.hpp rename to include/xo/reader2/ifelse/DIfElseSsm.hpp diff --git a/include/xo/reader2/ssm/IPrintable_DIfElseSsm.hpp b/include/xo/reader2/ifelse/IPrintable_DIfElseSsm.hpp similarity index 100% rename from include/xo/reader2/ssm/IPrintable_DIfElseSsm.hpp rename to include/xo/reader2/ifelse/IPrintable_DIfElseSsm.hpp diff --git a/include/xo/reader2/ssm/ISyntaxStateMachine_DIfElseSsm.hpp b/include/xo/reader2/ifelse/ISyntaxStateMachine_DIfElseSsm.hpp similarity index 100% rename from include/xo/reader2/ssm/ISyntaxStateMachine_DIfElseSsm.hpp rename to include/xo/reader2/ifelse/ISyntaxStateMachine_DIfElseSsm.hpp diff --git a/src/reader2/CMakeLists.txt b/src/reader2/CMakeLists.txt index 53c69bc6..66a5e8f8 100644 --- a/src/reader2/CMakeLists.txt +++ b/src/reader2/CMakeLists.txt @@ -30,8 +30,8 @@ set(SELF_SRCS IPrintable_DDeftypeSsm.cpp DIfElseSsm.cpp - ISyntaxStateMachine_DIfElseSsm.cpp - IPrintable_DIfElseSsm.cpp + facet/ISyntaxStateMachine_DIfElseSsm.cpp + facet/IPrintable_DIfElseSsm.cpp DSequenceSsm.cpp ISyntaxStateMachine_DSequenceSsm.cpp diff --git a/src/reader2/DIfElseSsm.cpp b/src/reader2/DIfElseSsm.cpp index 00a41750..5752dbdc 100644 --- a/src/reader2/DIfElseSsm.cpp +++ b/src/reader2/DIfElseSsm.cpp @@ -3,22 +3,18 @@ * @author Roland Conybeare, Jul 2025 **/ -#include "DIfElseSsm.hpp" -#include "ssm/ISyntaxStateMachine_DIfElseSsm.hpp" +#include "ifelse/DIfElseSsm.hpp" +#include "ifelse/ISyntaxStateMachine_DIfElseSsm.hpp" #include "ssm/IPrintable_DDefineSsm.hpp" #include "DExpectExprSsm.hpp" #include #include #include -//#include "exprstatestack.hpp" -//#include "parserstatemachine.hpp" -//#include "expect_expr_xs.hpp" -//#include "xo/indentlog/print/ppdetail_atomic.hpp" namespace xo { using xo::print::APrintable; using xo::facet::FacetRegistry; - using xo::facet::with_facet; +// using xo::facet::with_facet; using xo::reflect::typeseq; namespace scm { diff --git a/src/reader2/DToplevelSeqSsm.cpp b/src/reader2/DToplevelSeqSsm.cpp index 45a91a90..f43d1a62 100644 --- a/src/reader2/DToplevelSeqSsm.cpp +++ b/src/reader2/DToplevelSeqSsm.cpp @@ -9,7 +9,8 @@ #include "DDeftypeSsm.hpp" #include "DLambdaSsm.hpp" #include "ProgressSsm.hpp" -#include "DIfElseSsm.hpp" +#include "IfElseSsm.hpp" +//#include "ifelse/DIfElseSsm.hpp" #include "QuoteSsm.hpp" #include "ParenSsm.hpp" #include "ExpectExprSsm.hpp" diff --git a/src/reader2/IPrintable_DIfElseSsm.cpp b/src/reader2/facet/IPrintable_DIfElseSsm.cpp similarity index 93% rename from src/reader2/IPrintable_DIfElseSsm.cpp rename to src/reader2/facet/IPrintable_DIfElseSsm.cpp index d0ef4bb3..50a98996 100644 --- a/src/reader2/IPrintable_DIfElseSsm.cpp +++ b/src/reader2/facet/IPrintable_DIfElseSsm.cpp @@ -11,7 +11,7 @@ * [idl/IPrintable_DIfElseSsm.json5] **/ -#include "ssm/IPrintable_DIfElseSsm.hpp" +#include "ifelse/IPrintable_DIfElseSsm.hpp" namespace xo { namespace scm { diff --git a/src/reader2/ISyntaxStateMachine_DIfElseSsm.cpp b/src/reader2/facet/ISyntaxStateMachine_DIfElseSsm.cpp similarity index 98% rename from src/reader2/ISyntaxStateMachine_DIfElseSsm.cpp rename to src/reader2/facet/ISyntaxStateMachine_DIfElseSsm.cpp index fef959ca..7ebfbeca 100644 --- a/src/reader2/ISyntaxStateMachine_DIfElseSsm.cpp +++ b/src/reader2/facet/ISyntaxStateMachine_DIfElseSsm.cpp @@ -11,7 +11,7 @@ * [idl/ISyntaxStateMachine_DIfElseSsm.json5] **/ -#include "ssm/ISyntaxStateMachine_DIfElseSsm.hpp" +#include "ifelse/ISyntaxStateMachine_DIfElseSsm.hpp" namespace xo { namespace scm {