Skip to content

Replace bool OrError CTP with enum class like ranges::subrange_kind #166

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
Nov 17, 2025
Merged

Replace bool OrError CTP with enum class like ranges::subrange_kind #166

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
77 changes: 41 additions & 36 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 @@ -92,8 +92,13 @@ enum class utf_transcoding_error {
invalid_utf8_leading_byte
};

template <std::ranges::input_range V, bool OrError, exposition_only_code_unit ToType>
requires std::ranges::view<V> && exposition_only_code_unit<std::ranges::range_value_t<V>>
enum class to_utf_view_error_kind : bool {
replacement,
expected
};

template <std::ranges::input_range V, to_utf_view_error_kind E, exposition_only_code_unit ToType>
requires std::ranges::view<V> && exposition_only_code_unit<std::ranges::range_value_t<V>>
/* !PAPER */
class exposition_only_to_utf_view_impl {
/* PAPER */
Expand Down Expand Up @@ -206,12 +211,12 @@ class exposition_only_to_utf_view_impl {
/* PAPER */
};

template <std::ranges::input_range V, bool OrError, exposition_only_code_unit ToType>
template <std::ranges::input_range V, to_utf_view_error_kind E, exposition_only_code_unit ToType>
requires std::ranges::view<V> && exposition_only_code_unit<std::ranges::range_value_t<V>>
template <bool Const>
/* PAPER: class @*to-utf-view-impl*@<V, OrError, ToType>::@*iterator*@ { */
/* PAPER: class @*to-utf-view-impl*@<V, E, ToType>::@*iterator*@ { */
/* !PAPER */
struct exposition_only_to_utf_view_impl<V, OrError, ToType>::exposition_only_iterator : detail::iter_category_impl<V> {
struct exposition_only_to_utf_view_impl<V, E, ToType>::exposition_only_iterator : detail::iter_category_impl<V> {
/* PAPER */
private:
using exposition_only_Parent = exposition_only_maybe_const<Const, exposition_only_to_utf_view_impl>; // @*exposition only*@
Expand All @@ -238,7 +243,7 @@ struct exposition_only_to_utf_view_impl<V, OrError, ToType>::exposition_only_ite
using iterator_concept = decltype(iter_concept_impl());
/* PAPER */
using value_type =
std::conditional_t<OrError, std::expected<ToType, utf_transcoding_error>, ToType>;
std::conditional_t<E == to_utf_view_error_kind::expected, std::expected<ToType, utf_transcoding_error>, ToType>;
using reference_type = value_type;
using difference_type = ptrdiff_t;

Expand All @@ -261,7 +266,7 @@ struct exposition_only_to_utf_view_impl<V, OrError, ToType>::exposition_only_ite

/* PAPER */

template <std::ranges::input_range V2, bool OrError2, exposition_only_code_unit ToType2>
template <std::ranges::input_range V2, to_utf_view_error_kind E2, exposition_only_code_unit ToType2>
requires std::ranges::view<V2> && exposition_only_code_unit<std::ranges::range_value_t<V2>>
friend class exposition_only_to_utf_view_impl; // @*exposition only*@

Expand Down Expand Up @@ -294,7 +299,7 @@ struct exposition_only_to_utf_view_impl<V, OrError, ToType>::exposition_only_ite
/* PAPER: constexpr value_type operator*() const; */
/* !PAPER */
constexpr value_type operator*() const {
if constexpr (OrError) {
if constexpr (E == to_utf_view_error_kind::expected) {
if (!success_.has_value()) {
return std::unexpected{success_.error()};
}
Expand All @@ -303,7 +308,7 @@ struct exposition_only_to_utf_view_impl<V, OrError, ToType>::exposition_only_ite
}
/* PAPER */

constexpr exposition_only_iterator& operator++() requires(OrError)
constexpr exposition_only_iterator& operator++() requires(E == to_utf_view_error_kind::expected)
{
if (!exposition_only_success()) {
/* !PAPER */
Expand All @@ -318,7 +323,7 @@ struct exposition_only_to_utf_view_impl<V, OrError, ToType>::exposition_only_ite
return *this;
}

constexpr exposition_only_iterator& operator++() requires(!OrError)
constexpr exposition_only_iterator& operator++() requires(E == to_utf_view_error_kind::replacement)
{
exposition_only_advance_one();
return *this;
Expand Down Expand Up @@ -395,11 +400,11 @@ struct exposition_only_to_utf_view_impl<V, OrError, ToType>::exposition_only_ite
return std::ranges::end(parent_->base_);
}

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

constexpr bool exposition_only_success() const noexcept // @*exposition only*@
requires(OrError)
requires(E == to_utf_view_error_kind::expected)
{
return !!success_;
}
Expand Down Expand Up @@ -808,7 +813,7 @@ struct exposition_only_to_utf_view_impl<V, OrError, ToType>::exposition_only_ite
current_ = read_reverse_impl_result.new_curr;
assert(buf_.size());
buf_index_ = buf_.size() - 1;
if constexpr (OrError) {
if constexpr (E == to_utf_view_error_kind::expected) {
if (!success_.has_value()) {
buf_index_ = 0;
}
Expand All @@ -818,12 +823,12 @@ struct exposition_only_to_utf_view_impl<V, OrError, ToType>::exposition_only_ite
/* PAPER */
};

template <std::ranges::input_range V, bool OrError, exposition_only_code_unit ToType>
template <std::ranges::input_range V, to_utf_view_error_kind E, exposition_only_code_unit ToType>
requires std::ranges::view<V> && exposition_only_code_unit<std::ranges::range_value_t<V>>
template <bool Const>
/* PAPER: class @*to-utf-view-impl*@<V, OrError, ToType>::@*sentinel*@ { */
/* PAPER: class @*to-utf-view-impl*@<V, E, ToType>::@*sentinel*@ { */
/* !PAPER */
struct exposition_only_to_utf_view_impl<V, OrError, ToType>::exposition_only_sentinel {
struct exposition_only_to_utf_view_impl<V, E, ToType>::exposition_only_sentinel {
/* PAPER */
private:
using exposition_only_Parent = exposition_only_maybe_const<Const, exposition_only_to_utf_view_impl>; // @*exposition only*@
Expand Down Expand Up @@ -909,7 +914,7 @@ class to_utf8_view : public std::ranges::view_interface<to_utf8_view<V>> {
/* PAPER */

private:
exposition_only_to_utf_view_impl<V, false, char8_t> impl_; // @*exposition only*@
exposition_only_to_utf_view_impl<V, to_utf_view_error_kind::replacement, char8_t> impl_; // @*exposition only*@
};

template <class R>
Expand Down Expand Up @@ -972,7 +977,7 @@ class to_utf8_or_error_view
/* PAPER */

private:
exposition_only_to_utf_view_impl<V, true, char8_t> impl_; // @*exposition only*@
exposition_only_to_utf_view_impl<V, to_utf_view_error_kind::expected, char8_t> impl_; // @*exposition only*@
};

template <class R>
Expand Down Expand Up @@ -1034,7 +1039,7 @@ class to_utf16_view : public std::ranges::view_interface<to_utf16_view<V>> {
/* PAPER */

private:
exposition_only_to_utf_view_impl<V, false, char16_t> impl_; // @*exposition only*@
exposition_only_to_utf_view_impl<V, to_utf_view_error_kind::replacement, char16_t> impl_; // @*exposition only*@
};

template <class R>
Expand Down Expand Up @@ -1097,7 +1102,7 @@ class to_utf16_or_error_view
/* PAPER */

private:
exposition_only_to_utf_view_impl<V, true, char16_t> impl_; // @*exposition only*@
exposition_only_to_utf_view_impl<V, to_utf_view_error_kind::expected, char16_t> impl_; // @*exposition only*@
};

template <class R>
Expand Down Expand Up @@ -1165,7 +1170,7 @@ class to_utf32_view : public std::ranges::view_interface<to_utf32_view<V>> {
/* PAPER */

private:
exposition_only_to_utf_view_impl<V, false, char32_t> impl_; // @*exposition only*@
exposition_only_to_utf_view_impl<V, to_utf_view_error_kind::replacement, char32_t> impl_; // @*exposition only*@
};

template <class R>
Expand Down Expand Up @@ -1234,7 +1239,7 @@ class to_utf32_or_error_view
/* PAPER */

private:
exposition_only_to_utf_view_impl<V, true, char32_t> impl_; // @*exposition only*@
exposition_only_to_utf_view_impl<V, to_utf_view_error_kind::expected, char32_t> impl_; // @*exposition only*@
};

template <class R>
Expand All @@ -1244,9 +1249,9 @@ to_utf32_or_error_view(R&&) -> to_utf32_or_error_view<std::views::all_t<R>>;

namespace detail {

template <class V, bool OrError, exposition_only_code_unit ToType>
template <class V, to_utf_view_error_kind E, exposition_only_code_unit ToType>
using to_utf_view = std::conditional_t<
OrError,
E == to_utf_view_error_kind::expected,
std::conditional_t<
std::is_same_v<ToType, char8_t>, to_utf8_or_error_view<V>,
std::conditional_t<std::is_same_v<ToType, char16_t>, to_utf16_or_error_view<V>,
Expand All @@ -1258,8 +1263,8 @@ namespace detail {
std::conditional_t<std::is_same_v<ToType, char32_t>,
to_utf32_view<V>, void>>>>;

template <bool OrError, exposition_only_code_unit ToType>
struct to_utf_impl : std::ranges::range_adaptor_closure<to_utf_impl<OrError, ToType>> {
template <to_utf_view_error_kind E, exposition_only_code_unit ToType>
struct to_utf_impl : std::ranges::range_adaptor_closure<to_utf_impl<E, ToType>> {
template <class R>
constexpr auto operator()(R&& r) const {
using T = std::remove_cvref_t<R>;
Expand All @@ -1273,33 +1278,33 @@ namespace detail {
--last;
}
std::ranges::subrange subrange(first, last);
return to_utf_view<decltype(subrange), OrError, ToType>(std::move(subrange));
return to_utf_view<decltype(subrange), E, ToType>(std::move(subrange));
} else {
auto view = std::views::all(std::forward<R>(r));
return to_utf_view<decltype(view), OrError, ToType>(std::move(view));
return to_utf_view<decltype(view), E, ToType>(std::move(view));
}
}
};

} // namespace detail

template <exposition_only_code_unit ToType>
inline constexpr detail::to_utf_impl<false, ToType> to_utf;
inline constexpr detail::to_utf_impl<to_utf_view_error_kind::replacement, ToType> to_utf;

inline constexpr detail::to_utf_impl<false, char8_t> to_utf8;
inline constexpr detail::to_utf_impl<to_utf_view_error_kind::replacement, char8_t> to_utf8;

inline constexpr detail::to_utf_impl<false, char16_t> to_utf16;
inline constexpr detail::to_utf_impl<to_utf_view_error_kind::replacement, char16_t> to_utf16;

inline constexpr detail::to_utf_impl<false, char32_t> to_utf32;
inline constexpr detail::to_utf_impl<to_utf_view_error_kind::replacement, char32_t> to_utf32;

template <exposition_only_code_unit ToType>
inline constexpr detail::to_utf_impl<true, ToType> to_utf_or_error;
inline constexpr detail::to_utf_impl<to_utf_view_error_kind::expected, ToType> to_utf_or_error;

inline constexpr detail::to_utf_impl<true, char8_t> to_utf8_or_error;
inline constexpr detail::to_utf_impl<to_utf_view_error_kind::expected, char8_t> to_utf8_or_error;

inline constexpr detail::to_utf_impl<true, char16_t> to_utf16_or_error;
inline constexpr detail::to_utf_impl<to_utf_view_error_kind::expected, char16_t> to_utf16_or_error;

inline constexpr detail::to_utf_impl<true, char32_t> to_utf32_or_error;
inline constexpr detail::to_utf_impl<to_utf_view_error_kind::expected, char32_t> to_utf32_or_error;

/* PAPER: namespace views { */
/* PAPER: */
Expand Down
Loading