Skip to content
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

Jump to bottom

X3: Pass container attribute through sequence #370

Merged
merged 1 commit into from
Mar 1, 2018
Merged

X3: Pass container attribute through sequence #370

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
30 changes: 28 additions & 2 deletions include/boost/spirit/home/x3/operator/detail/sequence.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -391,6 +391,32 @@ namespace boost { namespace spirit { namespace x3 { namespace detail
, Context const& context, RContext& rcontext, Attribute& attr
, traits::container_attribute);

template <typename Parser, typename Context>
constexpr bool pass_sequence_container_attribute
= sequence_size<Parser, Context>::value > 1;

template <typename Parser, typename Iterator, typename Context
, typename RContext, typename Attribute>
typename enable_if_c<pass_sequence_container_attribute<Parser, Context>, bool>::type
parse_sequence_container(
Parser const& parser
, Iterator& first, Iterator const& last, Context const& context
, RContext& rcontext, Attribute& attr)
{
return parser.parse(first, last, context, rcontext, attr);
}

template <typename Parser, typename Iterator, typename Context
, typename RContext, typename Attribute>
typename disable_if_c<pass_sequence_container_attribute<Parser, Context>, bool>::type
parse_sequence_container(
Parser const& parser
, Iterator& first, Iterator const& last, Context const& context
, RContext& rcontext, Attribute& attr)
{
return parse_into_container(parser, first, last, context, rcontext, attr);
}

template <typename Parser, typename Iterator, typename Context
, typename RContext, typename Attribute>
bool parse_sequence(
Expand All @@ -399,8 +425,8 @@ namespace boost { namespace spirit { namespace x3 { namespace detail
, traits::container_attribute)
{
Iterator save = first;
if (parse_into_container(parser.left, first, last, context, rcontext, attr)
&& parse_into_container(parser.right, first, last, context, rcontext, attr))
if (parse_sequence_container(parser.left, first, last, context, rcontext, attr)
&& parse_sequence_container(parser.right, first, last, context, rcontext, attr))
return true;
first = save;
return false;
Expand Down
16 changes: 16 additions & 0 deletions test/x3/sequence.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,6 +179,22 @@ main()
BOOST_TEST((!test("BEGIN END", no_case[lit("begin") >> "nend"], space)));
}

{ // check attribute is passed through unary to another sequence
using boost::spirit::x3::eps;
std::string s;
BOOST_TEST(test_attr("ab", eps >> no_case[char_ >> char_], s));
BOOST_TEST("ab" == s);
s.clear();
BOOST_TEST(test_attr("ab", no_case[char_ >> char_] >> eps, s));
BOOST_TEST("ab" == s);
s.clear();
BOOST_TEST(test_attr("abc", char_ >> no_case[char_ >> char_], s));
BOOST_TEST("abc" == s);
s.clear();
BOOST_TEST(test_attr("abc", no_case[char_ >> char_] >> char_, s));
BOOST_TEST("abc" == s);
}

{
#ifdef SPIRIT_NO_COMPILE_CHECK
char_ >> char_ = char_ >> char_; // disallow this!
Expand Down