From 1cab3657704ba52ab085681016d2dd07c6c1a29e Mon Sep 17 00:00:00 2001
From: Roland Conybeare <rconybeare@gmail.com>
Date: Mon, 16 Feb 2026 09:45:36 -0500
Subject: [PATCH] xo-reader2: + convenience headers

---
 include/xo/reader2/DefineSsm.hpp              | 12 ++++++
 include/xo/reader2/ExpectFormalArgSsm.hpp     | 12 ++++++
 include/xo/reader2/ExpectFormalArglistSsm.hpp | 12 ++++++
 include/xo/reader2/ExpectSymbolSsm.hpp        | 12 ++++++
 include/xo/reader2/ExpectTypeSsm.hpp          | 12 ++++++
 include/xo/reader2/ExprSeqState.hpp           | 12 ++++++
 include/xo/reader2/IfElseSsm.hpp              | 12 ++++++
 src/reader2/reader2_register_facets.cpp       | 42 ++++---------------
 8 files changed, 91 insertions(+), 35 deletions(-)
 create mode 100644 include/xo/reader2/DefineSsm.hpp
 create mode 100644 include/xo/reader2/ExpectFormalArgSsm.hpp
 create mode 100644 include/xo/reader2/ExpectFormalArglistSsm.hpp
 create mode 100644 include/xo/reader2/ExpectSymbolSsm.hpp
 create mode 100644 include/xo/reader2/ExpectTypeSsm.hpp
 create mode 100644 include/xo/reader2/ExprSeqState.hpp
 create mode 100644 include/xo/reader2/IfElseSsm.hpp

diff --git a/include/xo/reader2/DefineSsm.hpp b/include/xo/reader2/DefineSsm.hpp
new file mode 100644
index 00000000..4a4489a0
--- /dev/null
+++ b/include/xo/reader2/DefineSsm.hpp
@@ -0,0 +1,12 @@
+/** @file DefineSsm.hpp
+ *
+ *  @author Roland Conybeare, Feb 2026
+ **/
+
+#pragma once
+
+#include "DDefineSsm.hpp"
+#include "ssm/ISyntaxStateMachine_DDefineSsm.hpp"
+#include "ssm/IPrintable_DDefineSsm.hpp"
+
+/* end DefineSsm.hpp */
diff --git a/include/xo/reader2/ExpectFormalArgSsm.hpp b/include/xo/reader2/ExpectFormalArgSsm.hpp
new file mode 100644
index 00000000..f0aaa9ed
--- /dev/null
+++ b/include/xo/reader2/ExpectFormalArgSsm.hpp
@@ -0,0 +1,12 @@
+/** @file ExpectFormalArgSsm.hpp
+ *
+ *  @author Roland Conybeare, Feb 2026
+ **/
+
+#pragma once
+
+#include "DExpectFormalArgSsm.hpp"
+#include "ssm/ISyntaxStateMachine_DExpectFormalArgSsm.hpp"
+#include "ssm/IPrintable_DExpectFormalArgSsm.hpp"
+
+/* end ExpectFormalArgSsm.hpp */
diff --git a/include/xo/reader2/ExpectFormalArglistSsm.hpp b/include/xo/reader2/ExpectFormalArglistSsm.hpp
new file mode 100644
index 00000000..35ffcf04
--- /dev/null
+++ b/include/xo/reader2/ExpectFormalArglistSsm.hpp
@@ -0,0 +1,12 @@
+/** @file ExpectFormalArglistSsm.hpp
+ *
+ *  @author Roland Conybeare, Feb 2026
+ **/
+
+#pragma once
+
+#include "DExpectFormalArglistSsm.hpp"
+#include "ssm/ISyntaxStateMachine_DExpectFormalArglistSsm.hpp"
+#include "ssm/IPrintable_DExpectFormalArglistSsm.hpp"
+
+/* end ExpectFormalArglistSsm.hpp */
diff --git a/include/xo/reader2/ExpectSymbolSsm.hpp b/include/xo/reader2/ExpectSymbolSsm.hpp
new file mode 100644
index 00000000..66e44aef
--- /dev/null
+++ b/include/xo/reader2/ExpectSymbolSsm.hpp
@@ -0,0 +1,12 @@
+/** @file ExpectSymbolSsm.hpp
+ *
+ *  @author Roland Conybeare, Feb 2026
+ **/
+
+#pragma once
+
+#include "DExpectSymbolSsm.hpp"
+#include "ssm/ISyntaxStateMachine_DExpectSymbolSsm.hpp"
+#include "ssm/IPrintable_DExpectSymbolSsm.hpp"
+
+/* end ExpectSymbolSsm.hpp */
diff --git a/include/xo/reader2/ExpectTypeSsm.hpp b/include/xo/reader2/ExpectTypeSsm.hpp
new file mode 100644
index 00000000..2c189551
--- /dev/null
+++ b/include/xo/reader2/ExpectTypeSsm.hpp
@@ -0,0 +1,12 @@
+/** @file ExpectTypeSsm.hpp
+ *
+ *  @author Roland Conybeare, Feb 2026
+ **/
+
+#pragma once
+
+#include "DExpectTypeSsm.hpp"
+#include "ssm/ISyntaxStateMachine_DExpectTypeSsm.hpp"
+#include "ssm/IPrintable_DExpectTypeSsm.hpp"
+
+/* end ExpectTypeSsm.hpp */
diff --git a/include/xo/reader2/ExprSeqState.hpp b/include/xo/reader2/ExprSeqState.hpp
new file mode 100644
index 00000000..912650b9
--- /dev/null
+++ b/include/xo/reader2/ExprSeqState.hpp
@@ -0,0 +1,12 @@
+/** @file ExprSeqState.hpp
+ *
+ *  @author Roland Conybeare, Feb 2026
+ **/
+
+#pragma once
+
+#include "DExprSeqState.hpp"
+#include "ssm/ISyntaxStateMachine_DExprSeqState.hpp"
+#include "ssm/IPrintable_DExprSeqState.hpp"
+
+/* end ExprSeqState.hpp */
diff --git a/include/xo/reader2/IfElseSsm.hpp b/include/xo/reader2/IfElseSsm.hpp
new file mode 100644
index 00000000..eaa6948d
--- /dev/null
+++ b/include/xo/reader2/IfElseSsm.hpp
@@ -0,0 +1,12 @@
+/** @file IfElseSsm.hpp
+ *
+ *  @author Roland Conybeare, Feb 2026
+ **/
+
+#pragma once
+
+#include "DIfElseSsm.hpp"
+#include "ssm/ISyntaxStateMachine_DIfElseSsm.hpp"
+#include "ssm/IPrintable_DIfElseSsm.hpp"
+
+/* end IfElseSsm.hpp */
diff --git a/src/reader2/reader2_register_facets.cpp b/src/reader2/reader2_register_facets.cpp
index ab279f56..4f5784e5 100644
--- a/src/reader2/reader2_register_facets.cpp
+++ b/src/reader2/reader2_register_facets.cpp
@@ -7,49 +7,21 @@
 
 #include <xo/reader2/SchematikaParser.hpp>
 
-//#include <xo/reader2/ExprSeqState.hpp>
-#include <xo/reader2/ssm/ISyntaxStateMachine_DExprSeqState.hpp>
-#include <xo/reader2/ssm/IPrintable_DExprSeqState.hpp>
-
-//#include <xo/reader2/DefineSsm.hpp>
-#include <xo/reader2/ssm/ISyntaxStateMachine_DDefineSsm.hpp>
-#include <xo/reader2/ssm/IPrintable_DDefineSsm.hpp>
-
+#include <xo/reader2/ExprSeqState.hpp>
+#include <xo/reader2/DefineSsm.hpp>
 #include <xo/reader2/LambdaSsm.hpp>
-//#include <xo/reader2/ssm/ISyntaxStateMachine_DLambdaSsm.hpp>
-//#include <xo/reader2/ssm/IPrintable_DLambdaSsm.hpp>
-
-//#include <xo/reader2/IfElseSsm.hpp>
-#include <xo/reader2/ssm/ISyntaxStateMachine_DIfElseSsm.hpp>
-#include <xo/reader2/ssm/IPrintable_DIfElseSsm.hpp>
+#include <xo/reader2/IfElseSsm.hpp>
 
 #include "ApplySsm.hpp"
 #include "SequenceSsm.hpp"
 #include "ParenSsm.hpp"
 
-//#include <xo/reader2/ExpectFormalArglistSsm.hpp>
-#include <xo/reader2/ssm/ISyntaxStateMachine_DExpectFormalArglistSsm.hpp>
-#include <xo/reader2/ssm/IPrintable_DExpectFormalArglistSsm.hpp>
-
-//#include <xo/reader2/ExpectFormalArgSsm.hpp>
-#include <xo/reader2/ssm/ISyntaxStateMachine_DExpectFormalArgSsm.hpp>
-#include <xo/reader2/ssm/IPrintable_DExpectFormalArgSsm.hpp>
-
-//#include <xo/reader2/ExpectSymbolSsm.hpp>
-#include <xo/reader2/ssm/ISyntaxStateMachine_DExpectSymbolSsm.hpp>
-#include <xo/reader2/ssm/IPrintable_DExpectSymbolSsm.hpp>
-
-//#include <xo/reader2/ExpectTypeSsm.hpp>
-#include <xo/reader2/ssm/ISyntaxStateMachine_DExpectTypeSsm.hpp>
-#include <xo/reader2/ssm/IPrintable_DExpectTypeSsm.hpp>
-
+#include <xo/reader2/ExpectFormalArglistSsm.hpp>
+#include <xo/reader2/ExpectFormalArgSsm.hpp>
+#include <xo/reader2/ExpectSymbolSsm.hpp>
+#include <xo/reader2/ExpectTypeSsm.hpp>
 #include <xo/reader2/ExpectExprSsm.hpp>
-//#include <xo/reader2/ssm/ISyntaxStateMachine_DExpectExprSsm.hpp>
-//#include <xo/reader2/ssm/IPrintable_DExpectExprSsm.hpp>
-
 #include <xo/reader2/ProgressSsm.hpp>
-//#include <xo/reader2/ssm/ISyntaxStateMachine_DProgressSsm.hpp>
-//#include <xo/reader2/ssm/IPrintable_DProgressSsm.hpp>
 
 #include <xo/reader2/ssm/ASyntaxStateMachine.hpp>
 #include <xo/printable2/detail/APrintable.hpp>