Skip to content

Rearrange some template parameters #117

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 28, 2025
Merged

Rearrange some template parameters #117

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
4 changes: 0 additions & 4 deletions include/beman/utf_view/detail/concepts.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,6 @@ concept exposition_only_code_unit = std::same_as<std::remove_cv_t<T>, char8_t> |
std::same_as<std::remove_cv_t<T>, char16_t> ||
std::same_as<std::remove_cv_t<T>, char32_t>;

template <class T>
concept exposition_only_utf_range = std::ranges::input_range<T> &&
exposition_only_code_unit<std::ranges::range_value_t<T>>;

/* !PAPER */

} // namespace beman::utf_view
Expand Down
74 changes: 38 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 @@ -88,11 +88,8 @@ enum class utf_transcoding_error {
invalid_utf8_leading_byte
};

template <class V>
concept exposition_only_from_utf_view =
exposition_only_utf_range<V> && std::ranges::view<V>;

template <bool OrError, exposition_only_code_unit ToType, exposition_only_from_utf_view V>
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>>
class exposition_only_to_utf_view_impl {
public:
template <bool Const>
Expand All @@ -108,8 +105,8 @@ class exposition_only_to_utf_view_impl {
using exposition_only_sent =
std::ranges::sentinel_t<exposition_only_maybe_const<Const, V>>;

template <bool OrError2, exposition_only_code_unit ToType2,
exposition_only_from_utf_view V2>
template <std::ranges::input_range V2, bool OrError2, 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*@

using exposition_only_from_type = std::iter_value_t<exposition_only_iter>; // @*exposition only*@
Expand Down Expand Up @@ -790,13 +787,14 @@ class exposition_only_to_utf_view_impl {
}
};

template <exposition_only_from_utf_view V>
template <std::ranges::input_range V>
requires std::ranges::view<V> && exposition_only_code_unit<std::ranges::range_value_t<V>>
class to_utf8_view : public std::ranges::view_interface<to_utf8_view<V>> {
private:
using exposition_only_iterator =
std::ranges::iterator_t<exposition_only_to_utf_view_impl<false, char8_t, V>>;
std::ranges::iterator_t<exposition_only_to_utf_view_impl<V, false, char8_t>>;
using exposition_only_sentinel =
std::ranges::sentinel_t<exposition_only_to_utf_view_impl<false, char8_t, V>>;
std::ranges::sentinel_t<exposition_only_to_utf_view_impl<V, false, char8_t>>;

public:
constexpr to_utf8_view()
Expand Down Expand Up @@ -841,20 +839,21 @@ class to_utf8_view : public std::ranges::view_interface<to_utf8_view<V>> {
}

private:
exposition_only_to_utf_view_impl<false, char8_t, V> impl_;
exposition_only_to_utf_view_impl<V, false, char8_t> impl_;
};

template <class R>
to_utf8_view(R&&) -> to_utf8_view<std::views::all_t<R>>;

template <exposition_only_from_utf_view V>
template <std::ranges::input_range V>
requires std::ranges::view<V> && exposition_only_code_unit<std::ranges::range_value_t<V>>
class to_utf8_or_error_view
: public std::ranges::view_interface<to_utf8_or_error_view<V>> {
private:
using exposition_only_iterator =
std::ranges::iterator_t<exposition_only_to_utf_view_impl<true, char8_t, V>>;
std::ranges::iterator_t<exposition_only_to_utf_view_impl<V, true, char8_t>>;
using exposition_only_sentinel =
std::ranges::sentinel_t<exposition_only_to_utf_view_impl<true, char8_t, V>>;
std::ranges::sentinel_t<exposition_only_to_utf_view_impl<V, true, char8_t>>;

public:
constexpr to_utf8_or_error_view()
Expand Down Expand Up @@ -899,19 +898,20 @@ class to_utf8_or_error_view
}

private:
exposition_only_to_utf_view_impl<true, char8_t, V> impl_;
exposition_only_to_utf_view_impl<V, true, char8_t> impl_;
};

template <class R>
to_utf8_or_error_view(R&&) -> to_utf8_or_error_view<std::views::all_t<R>>;

template <exposition_only_from_utf_view V>
template <std::ranges::input_range V>
requires std::ranges::view<V> && exposition_only_code_unit<std::ranges::range_value_t<V>>
class to_utf16_view : public std::ranges::view_interface<to_utf16_view<V>> {
private:
using exposition_only_iterator =
std::ranges::iterator_t<exposition_only_to_utf_view_impl<false, char16_t, V>>;
std::ranges::iterator_t<exposition_only_to_utf_view_impl<V, false, char16_t>>;
using exposition_only_sentinel =
std::ranges::sentinel_t<exposition_only_to_utf_view_impl<false, char16_t, V>>;
std::ranges::sentinel_t<exposition_only_to_utf_view_impl<V, false, char16_t>>;

public:
constexpr to_utf16_view()
Expand Down Expand Up @@ -956,20 +956,21 @@ class to_utf16_view : public std::ranges::view_interface<to_utf16_view<V>> {
}

private:
exposition_only_to_utf_view_impl<false, char16_t, V> impl_;
exposition_only_to_utf_view_impl<V, false, char16_t> impl_;
};

template <class R>
to_utf16_view(R&&) -> to_utf16_view<std::views::all_t<R>>;

template <exposition_only_from_utf_view V>
template <std::ranges::input_range V>
requires std::ranges::view<V> && exposition_only_code_unit<std::ranges::range_value_t<V>>
class to_utf16_or_error_view
: public std::ranges::view_interface<to_utf16_or_error_view<V>> {
private:
using exposition_only_iterator =
std::ranges::iterator_t<exposition_only_to_utf_view_impl<true, char16_t, V>>;
std::ranges::iterator_t<exposition_only_to_utf_view_impl<V, true, char16_t>>;
using exposition_only_sentinel =
std::ranges::sentinel_t<exposition_only_to_utf_view_impl<true, char16_t, V>>;
std::ranges::sentinel_t<exposition_only_to_utf_view_impl<V, true, char16_t>>;

public:
constexpr to_utf16_or_error_view()
Expand Down Expand Up @@ -1014,19 +1015,20 @@ class to_utf16_or_error_view
}

private:
exposition_only_to_utf_view_impl<true, char16_t, V> impl_;
exposition_only_to_utf_view_impl<V, true, char16_t> impl_;
};

template <class R>
to_utf16_or_error_view(R&&) -> to_utf16_or_error_view<std::views::all_t<R>>;

template <exposition_only_from_utf_view V>
template <std::ranges::input_range V>
requires std::ranges::view<V> && exposition_only_code_unit<std::ranges::range_value_t<V>>
class to_utf32_view : public std::ranges::view_interface<to_utf32_view<V>> {
private:
using exposition_only_iterator =
std::ranges::iterator_t<exposition_only_to_utf_view_impl<false, char32_t, V>>;
std::ranges::iterator_t<exposition_only_to_utf_view_impl<V, false, char32_t>>;
using exposition_only_sentinel =
std::ranges::sentinel_t<exposition_only_to_utf_view_impl<false, char32_t, V>>;
std::ranges::sentinel_t<exposition_only_to_utf_view_impl<V, false, char32_t>>;

public:
constexpr to_utf32_view()
Expand Down Expand Up @@ -1071,20 +1073,21 @@ class to_utf32_view : public std::ranges::view_interface<to_utf32_view<V>> {
}

private:
exposition_only_to_utf_view_impl<false, char32_t, V> impl_;
exposition_only_to_utf_view_impl<V, false, char32_t> impl_;
};

template <class R>
to_utf32_view(R&&) -> to_utf32_view<std::views::all_t<R>>;

template <exposition_only_from_utf_view V>
template <std::ranges::input_range V>
requires std::ranges::view<V> && exposition_only_code_unit<std::ranges::range_value_t<V>>
class to_utf32_or_error_view
: public std::ranges::view_interface<to_utf32_or_error_view<V>> {
private:
using exposition_only_iterator =
std::ranges::iterator_t<exposition_only_to_utf_view_impl<true, char32_t, V>>;
std::ranges::iterator_t<exposition_only_to_utf_view_impl<V, true, char32_t>>;
using exposition_only_sentinel =
std::ranges::sentinel_t<exposition_only_to_utf_view_impl<true, char32_t, V>>;
std::ranges::sentinel_t<exposition_only_to_utf_view_impl<V, true, char32_t>>;

public:
constexpr to_utf32_or_error_view()
Expand Down Expand Up @@ -1125,7 +1128,7 @@ class to_utf32_or_error_view
}

private:
exposition_only_to_utf_view_impl<true, char32_t, V> impl_;
exposition_only_to_utf_view_impl<V, true, char32_t> impl_;
};

template <class R>
Expand All @@ -1135,8 +1138,7 @@ to_utf32_or_error_view(R&&) -> to_utf32_or_error_view<std::views::all_t<R>>;

namespace detail {

template <bool OrError, exposition_only_code_unit ToType,
exposition_only_from_utf_view V>
template <class V, bool OrError, exposition_only_code_unit ToType>
using to_utf_view = std::conditional_t<
OrError,
std::conditional_t<
Expand All @@ -1152,7 +1154,7 @@ namespace detail {

template <bool OrError, exposition_only_code_unit ToType>
struct to_utf_impl : std::ranges::range_adaptor_closure<to_utf_impl<OrError, ToType>> {
template <exposition_only_utf_range R>
template <class R>
constexpr auto operator()(R&& r) const {
using T = std::remove_cvref_t<R>;
if constexpr (exposition_only_is_empty_view<T>) {
Expand All @@ -1165,10 +1167,10 @@ namespace detail {
--last;
}
std::ranges::subrange subrange(first, last);
return to_utf_view<OrError, ToType, decltype(subrange)>(std::move(subrange));
return to_utf_view<decltype(subrange), OrError, ToType>(std::move(subrange));
} else {
auto view = std::views::all(std::forward<R>(r));
return to_utf_view<OrError, ToType, decltype(view)>(std::move(view));
return to_utf_view<decltype(view), OrError, ToType>(std::move(view));
}
}
};
Expand Down
2 changes: 0 additions & 2 deletions tests/beman/utf_view/detail/concepts.t.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,4 @@ static_assert(!exposition_only_code_unit<wchar_t>);
static_assert(!exposition_only_code_unit<char>);
static_assert(!exposition_only_code_unit<int>);

// todo: utf_range

} // namespace beman::utf_view::detail::tests