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

V2: Fixed transform_attribute ambiguity #407

Merged
merged 1 commit into from
Oct 23, 2018
Merged

V2: Fixed transform_attribute ambiguity #407

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
8 changes: 3 additions & 5 deletions include/boost/spirit/home/karma/detail/attributes.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,14 +95,12 @@ namespace boost { namespace spirit { namespace karma
}}}

///////////////////////////////////////////////////////////////////////////////
namespace boost { namespace spirit { namespace traits
namespace boost { namespace spirit { namespace traits { namespace detail
{
template <typename Exposed, typename Transformed>
struct transform_attribute<Exposed, Transformed, karma::domain>
struct transform_attribute_base<Exposed, Transformed, karma::domain>
: karma::transform_attribute<Exposed, Transformed>
{};
}}}
}}}}

#endif


10 changes: 6 additions & 4 deletions include/boost/spirit/home/qi/detail/attributes.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,10 +143,12 @@ namespace boost { namespace spirit { namespace qi
///////////////////////////////////////////////////////////////////////////////
namespace boost { namespace spirit { namespace traits
{
template <typename Exposed, typename Transformed>
struct transform_attribute<Exposed, Transformed, qi::domain>
: qi::transform_attribute<Exposed, Transformed>
{};
namespace detail {
template <typename Exposed, typename Transformed>
struct transform_attribute_base<Exposed, Transformed, qi::domain>
: qi::transform_attribute<Exposed, Transformed>
{};
}

template <typename Exposed, typename Transformed>
struct transform_attribute<Exposed&, Transformed, qi::domain>
Expand Down
12 changes: 11 additions & 1 deletion include/boost/spirit/home/support/attributes.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -923,6 +923,14 @@ namespace boost { namespace spirit { namespace traits
type;
};

namespace detail {
// Domain-agnostic class template partial specializations and
// type agnostic domain partial specializations are ambious.
// To resolve the ambiguity type agnostic domain partial
// specializations are dispatched via intermediate type.
template <typename Exposed, typename Transformed, typename Domain>
struct transform_attribute_base;
}
///////////////////////////////////////////////////////////////////////////
// transform_attribute
//
Expand All @@ -933,7 +941,9 @@ namespace boost { namespace spirit { namespace traits
///////////////////////////////////////////////////////////////////////////
template <typename Exposed, typename Transformed, typename Domain
, typename Enable/* = void*/>
struct transform_attribute;
struct transform_attribute
: detail::transform_attribute_base<Exposed, Transformed, Domain>
{};

///////////////////////////////////////////////////////////////////////////
template <typename Domain, typename Transformed, typename Exposed>
Expand Down
7 changes: 7 additions & 0 deletions test/qi/regression_adapt_adt.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,5 +92,12 @@ int main()
data.str == "Hello" && !data.optstr);
}

{ // GH#396
qi::rule<char const*, unsigned()> uint_r = qi::uint_;
test1 data;
BOOST_TEST(test_attr("123@999", uint_r >> -('@' >> uint_r), data) &&
data.var == 123 && data.opt && data.opt.get() == 999);
}

return boost::report_errors();
}