boost/parser
2
0
Fork 0
mirror of https://github.com/boostorg/parser.git synced 2026-01-19 04:22:13 +00:00
Code Issues Projects Releases Wiki Activity

std::{begin,end} -> detail::text::detail::{begin,end}

Browse Source
This commit is contained in:
Zach Laine
2024-01-15 23:09:00 -06:00
parent c2ba50de51
commit cced72dbcd
2 changed files with 26 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
include/boost/parser/detail/case_fold.hpp
View File

@@ -57,9 +57,11 @@ namespace boost::parser::detail {
return out;
} else {
// Skip [0x41, 0x5a), handled above.
auto const first = std::begin(mapping_ranges) + 1;
auto const first =
detail::text::detail::begin(mapping_ranges) + 1;
// 7th entry starts with 0x100.
auto const last = std::begin(mapping_ranges) + 7;
auto const last =
detail::text::detail::begin(mapping_ranges) + 7;
if (auto out_opt = do_short_mapping(first, last, cp, out))
return *out_opt;
}
@@ -69,17 +71,17 @@ namespace boost::parser::detail {
// Single-cp-mapping path (next most common case).
{
auto const first = std::begin(mapping_ranges);
auto const last = std::end(mapping_ranges);
auto const first = detail::text::detail::begin(mapping_ranges);
auto const last = detail::text::detail::end(mapping_ranges);
if (auto out_opt = do_short_mapping(first, last, cp, out))
return *out_opt;
}
// Multi-cp mapping path.
{
auto const last = std::end(long_mappings);
auto const last = detail::text::detail::end(long_mappings);
auto const it = std::lower_bound(
std::begin(long_mappings),
detail::text::detail::begin(long_mappings),
last,
cp,
[](long_mapping const & mapping, char32_t cp) {
@@ -93,7 +95,9 @@ namespace boost::parser::detail {
return std::copy(
it->mapping_,
std::find(
std::begin(it->mapping_), std::end(it->mapping_), 0),
detail::text::detail::begin(it->mapping_),
detail::text::detail::end(it->mapping_),
0),
out);
#endif
}

24
include/boost/parser/parser.hpp
View File

@@ -968,9 +968,11 @@ namespace boost { namespace parser {
constexpr bool is_invocable_v = is_detected_v<callable, F, Args...>;
template<typename T>
using has_begin = decltype(*std::begin(std::declval<T &>()));
using has_begin =
decltype(*detail::text::detail::begin(std::declval<T &>()));
template<typename T>
using has_end = decltype(std::end(std::declval<T &>()));
using has_end =
decltype(detail::text::detail::end(std::declval<T &>()));
template<typename T>
constexpr bool is_range =
@@ -999,9 +1001,11 @@ namespace boost { namespace parser {
#else
template<typename T>
using iterator_t = decltype(std::begin(std::declval<T &>()));
using iterator_t =
decltype(detail::text::detail::begin(std::declval<T &>()));
template<typename Range>
using sentinel_t = decltype(std::end(std::declval<Range>()));
using sentinel_t =
decltype(detail::text::detail::end(std::declval<Range>()));
template<typename T>
using iter_value_t = typename std::iterator_traits<T>::value_type;
template<typename T>
@@ -2322,8 +2326,8 @@ namespace boost { namespace parser {
using value_type = range_value_t<r_t>;
if constexpr (std::is_array_v<r_t>) {
if constexpr (std::is_same_v<value_type, char>) {
auto first = std::begin(r);
auto last = std::end(r);
auto first = detail::text::detail::begin(r);
auto last = detail::text::detail::end(r);
if (first != last && !*std::prev(last))
--last;
return parser::make_subrange(first, last);
@@ -2334,7 +2338,9 @@ namespace boost { namespace parser {
if constexpr (
std::is_same_v<value_type, char> &&
!is_utf8_view<r_t>::value) {
return parser::make_subrange(std::begin(r), std::end(r));
return parser::make_subrange(
detail::text::detail::begin(r),
detail::text::detail::end(r));
} else {
return r | text::as_utf32;
}
@@ -2348,7 +2354,7 @@ namespace boost { namespace parser {
if constexpr (std::is_pointer_v<std::decay_t<R>>) {
return r;
} else {
return std::begin(r);
return detail::text::detail::begin(r);
}
}
@@ -2358,7 +2364,7 @@ namespace boost { namespace parser {
if constexpr (std::is_pointer_v<std::decay_t<R>>) {
return text::null_sentinel;
} else {
return std::end(r);
return detail::text::detail::end(r);
}
}