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

X3: Fix multiple times missed force_attribute parameter

Browse Source 
Switched `parse_rule` to dispatch only on the rule id only instead.
This commit is contained in:
Nikita Kniazev
2021-02-21 19:43:14 +03:00
parent f3cff61408
commit 2096077943
3 changed files with 19 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
include/boost/spirit/home/x3/nonterminal/detail/rule.hpp
View File

@@ -34,6 +34,9 @@ namespace boost { namespace spirit { namespace x3
namespace detail
{
template <typename ID>
struct rule_id {};
// we use this so we can detect if the default parse_rule
// is the being called.
struct default_parse_rule_result
@@ -46,11 +49,11 @@ namespace boost { namespace spirit { namespace x3
}
// default parse_rule implementation
template <typename ID, typename Attribute, typename Iterator
template <typename ID, typename Iterator
, typename Context, typename ActualAttribute>
inline detail::default_parse_rule_result
parse_rule(
rule<ID, Attribute> rule_
detail::rule_id<ID>
, Iterator& first, Iterator const& last
, Context const& context, ActualAttribute& attr);
}}}
@@ -192,7 +195,7 @@ namespace boost { namespace spirit { namespace x3 { namespace detail
// see if the user has a BOOST_SPIRIT_DEFINE for this rule
typedef
decltype(parse_rule(
rule<ID, Attribute>(), first, last
detail::rule_id<ID>{}, first, last
, make_unique_context<ID>(rhs, context), std::declval<Attribute&>()))
parse_rule_result;

24
include/boost/spirit/home/x3/nonterminal/rule.hpp
View File

@@ -22,11 +22,11 @@
namespace boost { namespace spirit { namespace x3
{
// default parse_rule implementation
template <typename ID, typename Attribute, typename Iterator
template <typename ID, typename Iterator
, typename Context, typename ActualAttribute>
inline detail::default_parse_rule_result
parse_rule(
rule<ID, Attribute> /* rule_ */
detail::rule_id<ID>
, Iterator& first, Iterator const& last
, Context const& context, ActualAttribute& attr)
{
@@ -41,7 +41,7 @@ namespace boost { namespace spirit { namespace x3
typedef rule_definition<ID, RHS, Attribute, force_attribute_> this_type;
typedef ID id;
typedef RHS rhs_type;
typedef rule<ID, Attribute> lhs_type;
typedef rule<ID, Attribute, force_attribute_> lhs_type;
typedef Attribute attribute_type;
static bool const has_attribute =
@@ -71,7 +71,7 @@ namespace boost { namespace spirit { namespace x3
};
template <typename ID, typename Attribute, bool force_attribute_>
struct rule : parser<rule<ID, Attribute>>
struct rule : parser<rule<ID, Attribute, force_attribute_>>
{
static_assert(!std::is_reference<Attribute>::value,
"Reference qualifier on rule attribute type is meaningless");
@@ -132,7 +132,7 @@ namespace boost { namespace spirit { namespace x3
using transform_attr = typename transform::type;
transform_attr attr_ = transform::pre(attr);
if (parse_rule(*this, first, last, context, attr_)) {
if (parse_rule(detail::rule_id<ID>{}, first, last, context, attr_)) {
transform::post(attr, std::forward<transform_attr>(attr_));
return true;
}
@@ -145,7 +145,7 @@ namespace boost { namespace spirit { namespace x3
{
// make sure we pass exactly the rule attribute type
attribute_type no_attr{};
return parse_rule(*this, first, last, context, no_attr);
return parse_rule(detail::rule_id<ID>{}, first, last, context, no_attr);
}
char const* name;
@@ -156,8 +156,8 @@ namespace boost { namespace spirit { namespace x3
template <typename T, typename Enable = void>
struct is_rule : mpl::false_ {};
template <typename ID, typename Attribute>
struct is_rule<rule<ID, Attribute>> : mpl::true_ {};
template <typename ID, typename Attribute, bool force_attribute>
struct is_rule<rule<ID, Attribute, force_attribute>> : mpl::true_ {};
template <typename ID, typename Attribute, typename RHS, bool force_attribute>
struct is_rule<rule_definition<ID, RHS, Attribute, force_attribute>> : mpl::true_ {};
@@ -177,7 +177,7 @@ namespace boost { namespace spirit { namespace x3
#define BOOST_SPIRIT_DECLARE_(r, data, rule_type) \
template <typename Iterator, typename Context> \
bool parse_rule( \
rule_type rule_ \
::boost::spirit::x3::detail::rule_id<rule_type::id> \
, Iterator& first, Iterator const& last \
, Context const& context, rule_type::attribute_type& attr); \
/***/
@@ -191,7 +191,7 @@ namespace boost { namespace spirit { namespace x3
using BOOST_PP_CAT(rule_name, _synonym) = decltype(rule_name); \
template <typename Iterator, typename Context> \
inline bool parse_rule( \
BOOST_PP_CAT(rule_name, _synonym) /* rule_ */ \
::boost::spirit::x3::detail::rule_id<BOOST_PP_CAT(rule_name, _synonym)::id> \
, Iterator& first, Iterator const& last \
, Context const& context, BOOST_PP_CAT(rule_name, _synonym)::attribute_type& attr) \
{ \
@@ -208,7 +208,7 @@ namespace boost { namespace spirit { namespace x3
#define BOOST_SPIRIT_DEFINE_(r, data, rule_name) \
template <typename Iterator, typename Context> \
inline bool parse_rule( \
decltype(rule_name) /* rule_ */ \
::boost::spirit::x3::detail::rule_id<decltype(rule_name)::id> \
, Iterator& first, Iterator const& last \
, Context const& context, decltype(rule_name)::attribute_type& attr) \
{ \
@@ -229,7 +229,7 @@ namespace boost { namespace spirit { namespace x3
#define BOOST_SPIRIT_INSTANTIATE(rule_type, Iterator, Context) \
template bool parse_rule<Iterator, Context>( \
rule_type rule_ \
::boost::spirit::x3::detail::rule_id<rule_type::id> \
, Iterator& first, Iterator const& last \
, Context const& context, rule_type::attribute_type&); \
/***/

2
test/x3/rule_separate_tu_grammar.hpp
View File

@@ -42,7 +42,7 @@ using skipper_type = x3::rule<class skipper_r>;
const skipper_type skipper;
BOOST_SPIRIT_DECLARE(skipper_type)
using grammar_type = x3::rule<class grammar_r, int>;
using grammar_type = x3::rule<class grammar_r, int, true>;
const grammar_type grammar;
BOOST_SPIRIT_DECLARE(grammar_type)