Making the hole bigger; #576

the-moisrex · Dec 30, 2024 · d77214a · d77214a
1 parent 9d3c324
commit d77214a
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/webpp/unicode/normalization.hpp b/webpp/unicode/normalization.hpp
@@ -617,7 +617,7 @@ namespace webpp::unicode {
                 if (prev_ccc < ccc && replaced_cp != replacement_char<char32_t>) {
                     // found a composition of cp1 and cp2
                     cp1 = replaced_cp;
-                    hole.mark_code_point(cp2_pin.iter(), reducer.end());
+                    hole.append_code_point(cp2_pin.iter(), reducer.end(), reducer.all_pins());
                     continue;
                 }
                 if (ccc == 0) [[likely]] {

diff --git a/webpp/unicode/utf_reducer.hpp b/webpp/unicode/utf_reducer.hpp
@@ -324,6 +324,14 @@ namespace webpp::unicode {
             this->append(other, iters);
         }
 
+        template <typename IterableT>
+        constexpr void append_code_point(IterT start, IterT str_end, IterableT& iters) noexcept {
+            auto const end =
+              stl::next(start, checked::code_point_length<IterT, difference_type>(start, str_end));
+            utf_range_marker other(start, end);
+            this->append(other, iters);
+        }
+
         constexpr void clear() noexcept {
             beginp = endp = IterT{};
         }
@@ -351,6 +359,10 @@ namespace webpp::unicode {
             // do nothing
         }
 
+        constexpr void append_code_point([[maybe_unused]] auto&&... args) noexcept {
+            // do nothing
+        }
+
         [[nodiscard]] constexpr bool empty() const noexcept {
             return true;
         }