Skip to content

Disable transcoding in utf_iterator if no transcoding is necessary. #262

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

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Disable transcoding in utf_iterator if no transcoding is necessary. #262

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
84 changes: 53 additions & 31 deletions include/boost/parser/detail/text/transcode_iterator.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2652,8 +2652,10 @@ namespace boost::parser::detail { namespace text {
#endif
: first_and_curr_{first, it}, last_(last)
{
if (curr() != last_)
read();
if constexpr (FromFormat != ToFormat) {
if (curr() != last_)
read();
}
}
#if !BOOST_PARSER_DETAIL_TEXT_USE_CONCEPTS
template<
Expand All @@ -2667,8 +2669,10 @@ namespace boost::parser::detail { namespace text {
:
first_and_curr_{it}, last_(last)
{
if (curr() != last_)
read();
if constexpr (FromFormat != ToFormat) {
if (curr() != last_)
read();
}
}

template<
Expand Down Expand Up @@ -2723,31 +2727,40 @@ namespace boost::parser::detail { namespace text {

constexpr value_type operator*() const
{
BOOST_PARSER_DEBUG_ASSERT(buf_index_ < buf_last_);
return buf_[buf_index_];
if constexpr (FromFormat == ToFormat) {
return *curr();
} else {
BOOST_PARSER_DEBUG_ASSERT(buf_index_ < buf_last_);
return buf_[buf_index_];
}
}

constexpr utf_iterator & operator++()
{
BOOST_PARSER_DEBUG_ASSERT(buf_index_ != buf_last_ || curr() != last_);
if (buf_index_ + 1 == buf_last_ && curr() != last_) {
if constexpr (
#if BOOST_PARSER_DETAIL_TEXT_USE_CONCEPTS
std::forward_iterator<I>
#else
is_forward<I>
#endif
) {
std::advance(curr(), to_increment_);
if constexpr (FromFormat == ToFormat) {
++curr();
return *this;
} else {
BOOST_PARSER_DEBUG_ASSERT(buf_index_ != buf_last_ || curr() != last_);
if (buf_index_ + 1 == buf_last_ && curr() != last_) {
if constexpr (
#if BOOST_PARSER_DETAIL_TEXT_USE_CONCEPTS
std::forward_iterator<I>
#else
is_forward<I>
#endif
) {
std::advance(curr(), to_increment_);
}
if (curr() == last_)
buf_index_ = 0;
else
read();
} else if (buf_index_ + 1 <= buf_last_) {
++buf_index_;
}
if (curr() == last_)
buf_index_ = 0;
else
read();
} else if (buf_index_ + 1 <= buf_last_) {
++buf_index_;
return *this;
}
return *this;
}

#if !BOOST_PARSER_DETAIL_TEXT_USE_CONCEPTS
Expand All @@ -2760,12 +2773,17 @@ namespace boost::parser::detail { namespace text {
requires std::bidirectional_iterator<I>
#endif
{
BOOST_PARSER_DEBUG_ASSERT(buf_index_ || curr() != first());
if (!buf_index_ && curr() != first())
read_reverse();
else if (buf_index_)
--buf_index_;
return *this;
if constexpr (FromFormat == ToFormat) {
--curr();
return *this;
} else {
BOOST_PARSER_DEBUG_ASSERT(buf_index_ || curr() != first());
if (!buf_index_ && curr() != first())
read_reverse();
else if (buf_index_)
--buf_index_;
return *this;
}
}

friend constexpr bool operator==(
Expand All @@ -2779,7 +2797,9 @@ namespace boost::parser::detail { namespace text {
requires std::forward_iterator<I> || requires(I i) { i == i; }
#endif
{
if constexpr (
if constexpr (FromFormat == ToFormat) {
return lhs.curr() == rhs.curr();
} else if constexpr (
#if BOOST_PARSER_DETAIL_TEXT_USE_CONCEPTS
std::forward_iterator<I>
#else
Expand Down Expand Up @@ -2809,7 +2829,9 @@ namespace boost::parser::detail { namespace text {

friend constexpr bool operator==(utf_iterator lhs, S rhs)
{
if constexpr (
if constexpr (FromFormat == ToFormat) {
return lhs.curr() == rhs;
} else if constexpr (
#if BOOST_PARSER_DETAIL_TEXT_USE_CONCEPTS
std::forward_iterator<I>
#else
Expand Down