From 36cf40266cc898ac0ceb1ff9b3e49c32c7245068 Mon Sep 17 00:00:00 2001 From: Edward Nolan Date: Fri, 18 Sep 2026 17:35:05 -0400 Subject: [PATCH] Rename base_ to exposition_only_base_ This ensures that it's properly italicized. --- include/beman/utf_view/to_utf_view.hpp | 50 ++++++++++++++++---------- 1 file changed, 32 insertions(+), 18 deletions(-) diff --git a/include/beman/utf_view/to_utf_view.hpp b/include/beman/utf_view/to_utf_view.hpp index 156541a..deaad99 100644 --- a/include/beman/utf_view/to_utf_view.hpp +++ b/include/beman/utf_view/to_utf_view.hpp @@ -136,7 +136,7 @@ class to_utf_view : public std::ranges::view_interface template struct exposition_only_iterator; // @*exposition only*@ template struct exposition_only_sentinel; // @*exposition only*@ - V base_ = V(); // @*exposition only*@ + V exposition_only_base_ = V(); // @*exposition only*@ public: constexpr to_utf_view() @@ -149,16 +149,16 @@ class to_utf_view : public std::ranges::view_interface template constexpr explicit to_utf_view(V base, detail::constant_wrapper, to_utf_tag_t) requires (detail::constant_wrapper::value == E) - : base_(std::move(base)) { } + : exposition_only_base_(std::move(base)) { } /* PAPER */ constexpr V base() const& requires std::copy_constructible { - return base_; + return exposition_only_base_; } constexpr V base() && { - return std::move(base_); + return std::move(exposition_only_base_); } /* !PAPER */ @@ -166,10 +166,13 @@ class to_utf_view : public std::ranges::view_interface constexpr exposition_only_iterator begin() { if constexpr (std::ranges::bidirectional_range) { return exposition_only_iterator( - std::ranges::begin(base_), std::ranges::begin(base_), std::ranges::end(base_)); + std::ranges::begin(exposition_only_base_), + std::ranges::begin(exposition_only_base_), + std::ranges::end(exposition_only_base_)); } else { return exposition_only_iterator( - std::ranges::begin(base_), std::ranges::end(base_)); + std::ranges::begin(exposition_only_base_), + std::ranges::end(exposition_only_base_)); } } /* PAPER */ @@ -179,58 +182,69 @@ class to_utf_view : public std::ranges::view_interface (!std::ranges::forward_range)) { if constexpr (std::ranges::bidirectional_range) { return exposition_only_iterator( - std::ranges::begin(base_), std::ranges::begin(base_), std::ranges::end(base_)); + std::ranges::begin(exposition_only_base_), + std::ranges::begin(exposition_only_base_), + std::ranges::end(exposition_only_base_)); } else { return exposition_only_iterator( - std::ranges::begin(base_), std::ranges::end(base_)); + std::ranges::begin(exposition_only_base_), + std::ranges::end(exposition_only_base_)); } } constexpr exposition_only_sentinel end() { - return exposition_only_sentinel(std::ranges::end(base_)); + return exposition_only_sentinel(std::ranges::end(exposition_only_base_)); } constexpr exposition_only_iterator end() requires std::ranges::common_range { if constexpr (std::ranges::bidirectional_range) { return exposition_only_iterator( - std::ranges::begin(base_), std::ranges::end(base_), std::ranges::end(base_)); + std::ranges::begin(exposition_only_base_), + std::ranges::end(exposition_only_base_), + std::ranges::end(exposition_only_base_)); } else { - return exposition_only_iterator(std::ranges::end(base_), std::ranges::end(base_)); + return exposition_only_iterator( + std::ranges::end(exposition_only_base_), + std::ranges::end(exposition_only_base_)); } } constexpr exposition_only_sentinel end() const requires std::ranges::range { - return exposition_only_sentinel(std::ranges::end(base_)); + return exposition_only_sentinel(std::ranges::end(exposition_only_base_)); } constexpr exposition_only_iterator end() const requires std::ranges::common_range { if constexpr (std::ranges::bidirectional_range) { return exposition_only_iterator( - std::ranges::begin(base_), std::ranges::end(base_), std::ranges::end(base_)); + std::ranges::begin(exposition_only_base_), + std::ranges::end(exposition_only_base_), + std::ranges::end(exposition_only_base_)); } else { - return exposition_only_iterator(std::ranges::end(base_), std::ranges::end(base_)); + return exposition_only_iterator( + std::ranges::end(exposition_only_base_), + std::ranges::end(exposition_only_base_)); } } constexpr bool empty() const { - return std::ranges::empty(base_); + return std::ranges::empty(exposition_only_base_); } constexpr std::size_t size() requires std::ranges::sized_range && std::same_as> && std::same_as { - return std::ranges::size(base_); + return std::ranges::size(exposition_only_base_); } /* !PAPER */ #if defined(__cpp_lib_ranges_reserve_hint) /* PAPER: constexpr auto reserve_hint() requires approximately_sized_range; */ constexpr auto reserve_hint() requires std::ranges::approximately_sized_range { - return std::ranges::reserve_hint(base_); + return std::ranges::reserve_hint(exposition_only_base_); } /* PAPER: constexpr auto reserve_hint() const requires approximately_sized_range; */ constexpr auto reserve_hint() const requires std::ranges::approximately_sized_range; { - return std::ranges::reserve_hint(base_); + return std::ranges::reserve_hint(exposition_only_base_); } #endif /* PAPER */