Skip to content
Draft
Changes from all commits
Commits
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
9 changes: 6 additions & 3 deletions include/boost/parser/parser.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -3396,7 +3396,6 @@ namespace boost { namespace parser {
template<typename Parser>
auto operator()(Parser const & parser) const
{
detail::skip(first_, last_, skip_, flags_);
success_ = true; // In case someone earlier already failed...
return parser.call(
first_,
Expand All @@ -3410,7 +3409,6 @@ namespace boost { namespace parser {
template<typename Parser, typename Attribute>
void operator()(Parser const & parser, Attribute & retval) const
{
detail::skip(first_, last_, skip_, flags_);
success_ = true; // In case someone earlier already failed...

detail::apply_parser(
Expand Down Expand Up @@ -3518,6 +3516,7 @@ namespace boost { namespace parser {
*this, first, last, context, flags, retval);
#endif

auto unmodified_first = first;
use_parser_t<Iter, Sentinel, Context, SkipParser> const use_parser{
first, last, context, skip, flags, success};

Expand All @@ -3539,12 +3538,16 @@ namespace boost { namespace parser {
else
use_parser.first_ = prev_first;
};
detail::skip(first, last, skip, flags);

std::apply([&try_parser](auto&&... args) {
((try_parser(args)), ...);
}, parsers_);

if (!done)
if (!done) {
success = false;
first = unmodified_first;
}
}

#ifndef BOOST_PARSER_DOXYGEN
Expand Down
Loading