Skip to content

Move two exposition-only functions to private section #116

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ednolan merged 1 commit into from
Oct 26, 2025
Merged

Move two exposition-only functions to private section #116

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 25 additions & 25 deletions include/beman/utf_view/to_utf_view.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,17 +178,6 @@ class exposition_only_to_utf_view_impl {
return std::move(base_);
}

/* PAPER: constexpr expected<void, utf_transcoding_error> @*success*@() const noexcept requires(OrError); // @*exposition only*@ */
/* !PAPER */

constexpr bool exposition_only_success() const noexcept // @*exposition only*@
requires(OrError)
{
return !!success_;
}

/* PAPER */

/* PAPER: constexpr value_type operator*() const; */
/* !PAPER */
constexpr value_type operator*() const {
Expand All @@ -201,20 +190,6 @@ class exposition_only_to_utf_view_impl {
}
/* PAPER */

constexpr void exposition_only_advance_one() // @*exposition only*@
{
++buf_index_;
if (buf_index_ == buf_.size()) {
if constexpr (std::forward_iterator<exposition_only_iter>) {
buf_index_ = 0;
std::advance(base(), to_increment_);
}
if (base() != end()) {
read();
}
}
}

constexpr exposition_only_utf_iterator& operator++() requires(OrError)
{
if (!exposition_only_success()) {
Expand Down Expand Up @@ -326,6 +301,31 @@ class exposition_only_to_utf_view_impl {
return std::ranges::end(backptr_->base_);
}

/* PAPER: constexpr expected<void, utf_transcoding_error> @*success*@() const noexcept requires(OrError); // @*exposition only*@ */
/* !PAPER */

constexpr bool exposition_only_success() const noexcept // @*exposition only*@
requires(OrError)
{
return !!success_;
}

/* PAPER */

constexpr void exposition_only_advance_one() // @*exposition only*@
{
++buf_index_;
if (buf_index_ == buf_.size()) {
if constexpr (std::forward_iterator<exposition_only_iter>) {
buf_index_ = 0;
std::advance(base(), to_increment_);
}
if (base() != end()) {
read();
}
}
}

/* !PAPER */

static constexpr decode_code_point_result decode_code_point_utf8_impl(
Expand Down
32 changes: 16 additions & 16 deletions paper/P2728.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -560,22 +560,6 @@ namespace std::ranges {

constexpr @*iter*@ base() && { return move(base_); }

constexpr expected<void, utf_transcoding_error> @*success*@() const noexcept requires(OrError); // @*exposition only*@

constexpr void @*advance-one*@() // @*exposition only*@
{
++buf_index_;
if (buf_index_ == buf_.size()) {
if constexpr (forward_iterator<@*iter*@>) {
buf_index_ = 0;
advance(base(), to_increment_);
}
if (base() != end()) {
read();
}
}
}

constexpr @*utf-iterator*@& operator++() requires (OrError)
{
if (!@*success*@()) {
Expand Down Expand Up @@ -650,6 +634,22 @@ namespace std::ranges {
return ranges::end(backptr_->base_);
}

constexpr expected<void, utf_transcoding_error> @*success*@() const noexcept requires(OrError); // @*exposition only*@

constexpr void @*advance-one*@() // @*exposition only*@
{
++buf_index_;
if (buf_index_ == buf_.size()) {
if constexpr (forward_iterator<@*iter*@>) {
buf_index_ = 0;
advance(base(), to_increment_);
}
if (base() != end()) {
read();
}
}
}

constexpr void read(); // @*exposition only*@

constexpr void read_reverse(); // @*exposition only*@
Expand Down