iris-cpp · saki7 · Feb 7, 2026 · Feb 7, 2026
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -22,7 +22,11 @@ if(PROJECT_IS_TOP_LEVEL)
     include(CTest) # sets BUILD_TESTING
 endif()
 
-add_subdirectory(modules/iris)
+if(NOT DEFINED IRIS_ROOT)
+    set(IRIS_ROOT "${CMAKE_CURRENT_LIST_DIR}/modules/iris")
+endif()
+
+add_subdirectory("${IRIS_ROOT}")
 
 
 # -----------------------------------------------------------------
@@ -97,6 +101,9 @@ foreach(dep IN LISTS iris_x4_boost_deps)
     add_subdirectory(../${dep} build_deps/${dep})
 endforeach()
 
+set_target_properties(boost_assert PROPERTIES FOLDER "_deps")
+set_target_properties(boost_core PROPERTIES FOLDER "_deps")
+
 foreach(dep IN LISTS iris_x4_boost_deps)
     target_link_libraries(iris_x4 INTERFACE Boost::${dep})
 endforeach()

diff --git a/modules/iris b/modules/iris
diff --git a/test/x4/CMakeLists.txt b/test/x4/CMakeLists.txt
@@ -10,6 +10,7 @@ endfunction()
 
 function(x4_define_test test_name)
     iris_define_test(x4_${test_name} ${ARGN})
+    iris_define_test_headers(x4_${test_name} iris_x4_test.hpp)
     target_link_libraries(x4_${test_name}_test PRIVATE Iris::X4)
 
     if(MSVC)
@@ -27,6 +28,7 @@ endfunction()
 function(x4_define_tests)
     foreach(test_name IN LISTS ARGV)
         x4_define_test(${test_name} ${test_name}.cpp)
+        set_target_properties(x4_${test_name}_test PROPERTIES FOLDER "test/x4")
     endforeach()
 endfunction()
 

diff --git a/test/x4/actions.cpp b/test/x4/actions.cpp
@@ -7,7 +7,7 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
 
-#include "test.hpp"
+#include "iris_x4_test.hpp"
 
 #include <iris/x4/numeric/int.hpp>
 #include <iris/x4/char/char_class.hpp>

diff --git a/test/x4/alternative.cpp b/test/x4/alternative.cpp
@@ -8,7 +8,7 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
 
-#include "test.hpp"
+#include "iris_x4_test.hpp"
 
 #include <iris/x4/rule.hpp>
 #include <iris/x4/auxiliary/attr.hpp>

diff --git a/test/x4/and_predicate.cpp b/test/x4/and_predicate.cpp
@@ -7,7 +7,7 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
 
-#include "test.hpp"
+#include "iris_x4_test.hpp"
 
 #include <iris/x4/numeric/int.hpp>
 #include <iris/x4/operator/and_predicate.hpp>

diff --git a/test/x4/as.cpp b/test/x4/as.cpp
@@ -6,7 +6,7 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
 
-#include "test.hpp"
+#include "iris_x4_test.hpp"
 
 #include <iris/x4/auxiliary/attr.hpp>
 #include <iris/x4/auxiliary/eps.hpp>

diff --git a/test/x4/attr.cpp b/test/x4/attr.cpp
@@ -7,7 +7,7 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
 
-#include "test.hpp"
+#include "iris_x4_test.hpp"
 
 #include <iris/x4/auxiliary/attr.hpp>
 #include <iris/x4/numeric/int.hpp>

diff --git a/test/x4/attribute.cpp b/test/x4/attribute.cpp
@@ -6,7 +6,7 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
 
-#include "test.hpp"
+#include "iris_x4_test.hpp"
 
 #include <iris/x4/auxiliary/attr.hpp>
 #include <iris/x4/auxiliary/eps.hpp>

diff --git a/test/x4/attribute_type_check.cpp b/test/x4/attribute_type_check.cpp
@@ -7,7 +7,7 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
 
-#include "test.hpp"
+#include "iris_x4_test.hpp"
 
 #include <iris/x4/auxiliary/attr.hpp>
 #include <iris/x4/auxiliary/eps.hpp>

diff --git a/test/x4/bool.cpp b/test/x4/bool.cpp
@@ -10,7 +10,7 @@
 
 #define IRIS_X4_UNICODE
 
-#include "test.hpp"
+#include "iris_x4_test.hpp"
 
 #include <iris/x4/directive/no_case.hpp>
 #include <iris/x4/numeric/bool.hpp>

diff --git a/test/x4/char.cpp b/test/x4/char.cpp
@@ -11,7 +11,7 @@
 
 #define IRIS_X4_UNICODE
 
-#include "test.hpp"
+#include "iris_x4_test.hpp"
 
 #include <iris/x4/char/char.hpp>
 #include <iris/x4/char/char_class.hpp>

diff --git a/test/x4/char_class.cpp b/test/x4/char_class.cpp
@@ -10,7 +10,7 @@
 
 #define IRIS_X4_UNICODE
 
-#include "test.hpp"
+#include "iris_x4_test.hpp"
 
 #include <iris/x4/char/char.hpp>
 #include <iris/x4/char/char_class.hpp>

diff --git a/test/x4/container_support.cpp b/test/x4/container_support.cpp
@@ -8,7 +8,7 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
 
-#include "test.hpp"
+#include "iris_x4_test.hpp"
 
 #include <iris/x4/rule.hpp>
 #include <iris/x4/char/char.hpp>

diff --git a/test/x4/context.cpp b/test/x4/context.cpp
@@ -6,7 +6,7 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
 
-#include "test.hpp"
+#include "iris_x4_test.hpp"
 
 #include <iris/x4/core/context.hpp>
 

diff --git a/test/x4/debug.cpp b/test/x4/debug.cpp
@@ -9,7 +9,7 @@
 
 #define IRIS_X4_DEBUG
 
-#include "test.hpp"
+#include "iris_x4_test.hpp"
 
 #include <iris/x4/rule.hpp>
 #include <iris/x4/debug/error_reporting.hpp>

diff --git a/test/x4/difference.cpp b/test/x4/difference.cpp
@@ -7,7 +7,7 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
 
-#include "test.hpp"
+#include "iris_x4_test.hpp"
 
 #include <iris/x4/char/char.hpp>
 #include <iris/x4/char/char_class.hpp>

diff --git a/test/x4/eoi.cpp b/test/x4/eoi.cpp
@@ -7,7 +7,7 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
 
-#include "test.hpp"
+#include "iris_x4_test.hpp"
 
 #include <iris/x4/auxiliary/eoi.hpp>
 

diff --git a/test/x4/eol.cpp b/test/x4/eol.cpp
@@ -7,7 +7,7 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
 
-#include "test.hpp"
+#include "iris_x4_test.hpp"
 
 #include <iris/x4/auxiliary/eol.hpp>
 

diff --git a/test/x4/eps.cpp b/test/x4/eps.cpp
@@ -7,7 +7,7 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
 
-#include "test.hpp"
+#include "iris_x4_test.hpp"
 
 #include <iris/x4/auxiliary/eps.hpp>
 #include <iris/x4/operator/not_predicate.hpp>

diff --git a/test/x4/error_handler.cpp b/test/x4/error_handler.cpp
@@ -7,7 +7,7 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
 
-#include "test.hpp"
+#include "iris_x4_test.hpp"
 
 #include <iris/x4/rule.hpp>
 #include <iris/x4/char/char.hpp>

diff --git a/test/x4/expect.cpp b/test/x4/expect.cpp
@@ -13,7 +13,7 @@
 # pragma warning(disable: 6262) // Function uses 'XXXXX' bytes of stack
 #endif
 
-#include "test.hpp"
+#include "iris_x4_test.hpp"
 
 #include <iris/x4/char/char.hpp>
 #include <iris/x4/char/negated_char.hpp>

diff --git a/test/x4/extract_int.cpp b/test/x4/extract_int.cpp
@@ -7,7 +7,7 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
 
-#include "test.hpp"
+#include "iris_x4_test.hpp"
 
 #include <iris/x4/numeric/utils/extract_int.hpp>
 

diff --git a/test/x4/grammar.hpp b/test/x4/grammar.hpp
@@ -11,7 +11,7 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
 
-#include "test.hpp"
+#include "iris_x4_test.hpp"
 
 #include <iris/x4/rule.hpp>
 

diff --git a/test/x4/grammar_linker.cpp b/test/x4/grammar_linker.cpp
@@ -8,7 +8,7 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
 
-#include "test.hpp"
+#include "iris_x4_test.hpp"
 #include "grammar.hpp"
 
 TEST_CASE("grammar")

diff --git a/test/x4/int.cpp b/test/x4/int.cpp
@@ -9,7 +9,7 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
 
-#include "test.hpp"
+#include "iris_x4_test.hpp"
 
 #include <iris/x4/char/char_class.hpp>
 #include <iris/x4/numeric/int.hpp>

diff --git a/test/x4/test.hpp → test/x4/iris_x4_test.hpp b/test/x4/test.hpp → test/x4/iris_x4_test.hpp
@@ -1,5 +1,5 @@
-#ifndef IRIS_X4_TEST_X4_TEST_HPP
-#define IRIS_X4_TEST_X4_TEST_HPP
+#ifndef IRIS_X4_TEST_IRIS_X4_TEST_HPP
+#define IRIS_X4_TEST_IRIS_X4_TEST_HPP
 
 /*=============================================================================
     Copyright (c) 2001-2013 Joel de Guzman
@@ -11,13 +11,12 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
 
-#include <iris/config.hpp>
+#include "iris_test.hpp"
+
 #include <iris/x4/core/parser.hpp>
 #include <iris/x4/core/move_to.hpp>
 #include <iris/x4/parse.hpp>
 
-#include <catch2/catch_test_macros.hpp>
-
 #include <iterator>
 #include <string_view>
 #include <type_traits>

diff --git a/test/x4/iterator.cpp b/test/x4/iterator.cpp
@@ -10,7 +10,7 @@
 
 #define IRIS_X4_UNICODE
 
-#include "test.hpp"
+#include "iris_x4_test.hpp"
 
 #include <iris/x4/char/char.hpp>
 #include <iris/x4/char/negated_char.hpp>

diff --git a/test/x4/kleene.cpp b/test/x4/kleene.cpp
@@ -7,7 +7,7 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
 
-#include "test.hpp"
+#include "iris_x4_test.hpp"
 
 #include <iris/x4/char/char.hpp>
 #include <iris/x4/char/char_class.hpp>

diff --git a/test/x4/lexeme.cpp b/test/x4/lexeme.cpp
@@ -7,7 +7,7 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
 
-#include "test.hpp"
+#include "iris_x4_test.hpp"
 
 #include <iris/x4/rule.hpp>
 #include <iris/x4/char/char_class.hpp>

diff --git a/test/x4/list.cpp b/test/x4/list.cpp
@@ -7,7 +7,7 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
 
-#include "test.hpp"
+#include "iris_x4_test.hpp"
 
 #include <iris/x4/char/char.hpp>
 #include <iris/x4/char/char_class.hpp>

diff --git a/test/x4/lit.cpp b/test/x4/lit.cpp
@@ -10,7 +10,7 @@
 
 #define IRIS_X4_UNICODE
 
-#include "test.hpp"
+#include "iris_x4_test.hpp"
 
 #include <iris/x4/char/char.hpp>
 #include <iris/x4/string/string.hpp>

diff --git a/test/x4/matches.cpp b/test/x4/matches.cpp
@@ -8,7 +8,7 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
 
-#include "test.hpp"
+#include "iris_x4_test.hpp"
 
 #include <iris/x4/char/char.hpp>
 #include <iris/x4/directive/matches.hpp>

diff --git a/test/x4/no_case.cpp b/test/x4/no_case.cpp
@@ -7,7 +7,7 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
 
-#include "test.hpp"
+#include "iris_x4_test.hpp"
 
 #include <iris/x4/directive/no_case.hpp>
 #include <iris/x4/char/char.hpp>

diff --git a/test/x4/no_skip.cpp b/test/x4/no_skip.cpp
@@ -8,7 +8,7 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
 
-#include "test.hpp"
+#include "iris_x4_test.hpp"
 
 #include <iris/x4/char/char.hpp>
 #include <iris/x4/char/char_class.hpp>

diff --git a/test/x4/not_predicate.cpp b/test/x4/not_predicate.cpp
@@ -7,7 +7,7 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
 
-#include "test.hpp"
+#include "iris_x4_test.hpp"
 
 #include <iris/x4/numeric/int.hpp>
 #include <iris/x4/operator/not_predicate.hpp>

diff --git a/test/x4/omit.cpp b/test/x4/omit.cpp
@@ -7,7 +7,7 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
 
-#include "test.hpp"
+#include "iris_x4_test.hpp"
 
 #include <iris/x4/rule.hpp>
 #include <iris/x4/directive/omit.hpp>

diff --git a/test/x4/optional.cpp b/test/x4/optional.cpp
@@ -7,7 +7,7 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
 
-#include "test.hpp"
+#include "iris_x4_test.hpp"
 
 #include <iris/x4/char/char.hpp>
 #include <iris/x4/string/string.hpp>

diff --git a/test/x4/parser.cpp b/test/x4/parser.cpp
@@ -6,7 +6,7 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
 
-#include "test.hpp"
+#include "iris_x4_test.hpp"
 
 #include <iris/x4/core/parser.hpp>
 #include <iris/x4/operator/sequence.hpp>

diff --git a/test/x4/plus.cpp b/test/x4/plus.cpp
@@ -7,7 +7,7 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
 
-#include "test.hpp"
+#include "iris_x4_test.hpp"
 
 #include <iris/x4/char/char.hpp>
 #include <iris/x4/char/char_class.hpp>

diff --git a/test/x4/raw.cpp b/test/x4/raw.cpp
@@ -7,7 +7,7 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
 
-#include "test.hpp"
+#include "iris_x4_test.hpp"
 
 #include <iris/x4/rule.hpp>
 #include <iris/x4/auxiliary/eps.hpp>
+5 −2		CMakeLists.txt
+2 −2		iris.natvis
+67 −9		test/CMakeLists.txt
+2 −2		test/core.cpp
+2 −2		test/indirect.cpp
+2 −2		test/iris_test.hpp
+13 −72		test/rvariant/CMakeLists.txt
+2 −2		test/rvariant/flexible.cpp
+4 −7		test/rvariant/get_visit.cpp
+7 −9		test/rvariant/io.cpp
+5 −5		test/rvariant/iris_rvariant_test.hpp
+2 −2		test/rvariant/many_alternatives_32.cpp
+3 −3		test/rvariant/recursive_wrapper.cpp
+5 −8		test/rvariant/rvariant.cpp
+2 −2		test/rvariant/truly_recursive.cpp
+1 −1		test/type_traits.cpp