From 93ae4ad6fedfcb5eafbf62ff20e7f18231d7258b Mon Sep 17 00:00:00 2001
From: Nana Sakisaka <1901813+saki7@users.noreply.github.com>
Date: Sun, 9 Aug 2026 14:32:06 +0900
Subject: [PATCH] Make Unicode skippers builtin

---
 include/iris/x4/directive/skip.hpp | 28 ++++++++++++++++++++++++++++
 modules/iris                       |  2 +-
 2 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/include/iris/x4/directive/skip.hpp b/include/iris/x4/directive/skip.hpp
index 6b8b343a0..fede93a71 100644
--- a/include/iris/x4/directive/skip.hpp
+++ b/include/iris/x4/directive/skip.hpp
@@ -27,6 +27,10 @@ namespace iris::x4 {
 template<class Encoding, class Tag>
 struct char_class_parser;
 
+#ifdef IRIS_X4_UNICODE
+template<class Tag>
+struct unicode_char_class;
+#endif
 
 template<class Subject, class Skipper>
 struct skip_directive : proxy_parser<Subject, skip_directive<Subject, Skipper>>
@@ -220,6 +224,30 @@ struct skip_gen
         return skip_gen::operator()(char_class_parser<Encoding, Tag>{});
     }
 
+#ifdef IRIS_X4_UNICODE
+    [[nodiscard]]
+    static constexpr builtin_skip_gen_impl<builtin_skipper_kind::blank>
+    operator()(unicode_char_class<char_classes::blank_tag> const&) noexcept
+    {
+        return {};
+    }
+
+    [[nodiscard]]
+    static constexpr builtin_skip_gen_impl<builtin_skipper_kind::space>
+    operator()(unicode_char_class<char_classes::space_tag> const&) noexcept
+    {
+        return {};
+    }
+
+    template<class Tag>
+    [[nodiscard]] static constexpr auto
+    operator()(no_builtin_t<unicode_char_class<Tag>> const&)
+        noexcept(noexcept(skip_gen::operator()(unicode_char_class<Tag>{})))
+    {
+        return skip_gen::operator()(unicode_char_class<Tag>{});
+    }
+#endif
+
     template<X4Subject Skipper>
     [[nodiscard]]
     static constexpr skip_gen_impl<as_parser_t<Skipper>>
diff --git a/modules/iris b/modules/iris
index 3ee6f465b..b8c748815 160000
--- a/modules/iris
+++ b/modules/iris
@@ -1 +1 @@
-Subproject commit 3ee6f465b747694547cd1c71f295430858e0eb7b
+Subproject commit b8c74881531bbf0c0af2d9f4e89f3995c8951ca8