update boost
This commit is contained in:
@@ -18,9 +18,9 @@ BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
|
||||
|
||||
///////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// Helper templates to derive the parser type from an auxilliary type
|
||||
// Helper templates to derive the parser type from an auxiliary type
|
||||
// and to generate an object of the required parser type given an
|
||||
// auxilliary object. Supported types to convert are parsers,
|
||||
// auxiliary object. Supported types to convert are parsers,
|
||||
// single characters and character strings.
|
||||
//
|
||||
///////////////////////////////////////////////////////////////////////////
|
||||
|
||||
@@ -33,8 +33,7 @@ namespace impl
|
||||
template <typename ParserT, typename LeafCountT>
|
||||
struct count {
|
||||
|
||||
// __BORLANDC__ == 0x0561 isn't happy with BOOST_STATIC_CONSTANT
|
||||
enum { value = (LeafCountT::value + 1) };
|
||||
BOOST_STATIC_CONSTANT(int, value = (LeafCountT::value + 1));
|
||||
};
|
||||
};
|
||||
|
||||
@@ -47,9 +46,8 @@ namespace impl
|
||||
typedef typename ParserT::subject_t subject_t;
|
||||
typedef typename subject_t::parser_category_t subject_category_t;
|
||||
|
||||
// __BORLANDC__ == 0x0561 isn't happy with BOOST_STATIC_CONSTANT
|
||||
enum { value = (nodes<subject_category_t>
|
||||
::template count<subject_t, LeafCountT>::value + 1) };
|
||||
BOOST_STATIC_CONSTANT(int, value = (nodes<subject_category_t>
|
||||
::template count<subject_t, LeafCountT>::value + 1));
|
||||
};
|
||||
};
|
||||
|
||||
@@ -62,9 +60,8 @@ namespace impl
|
||||
typedef typename ParserT::subject_t subject_t;
|
||||
typedef typename subject_t::parser_category_t subject_category_t;
|
||||
|
||||
// __BORLANDC__ == 0x0561 isn't happy with BOOST_STATIC_CONSTANT
|
||||
enum { value = (nodes<subject_category_t>
|
||||
::template count<subject_t, LeafCountT>::value + 1) };
|
||||
BOOST_STATIC_CONSTANT(int, value = (nodes<subject_category_t>
|
||||
::template count<subject_t, LeafCountT>::value + 1));
|
||||
};
|
||||
};
|
||||
|
||||
@@ -81,14 +78,14 @@ namespace impl
|
||||
|
||||
typedef count self_t;
|
||||
|
||||
// __BORLANDC__ == 0x0561 isn't happy with BOOST_STATIC_CONSTANT
|
||||
enum {
|
||||
BOOST_STATIC_CONSTANT(int,
|
||||
leftcount = (nodes<left_category_t>
|
||||
::template count<left_t, LeafCountT>::value),
|
||||
::template count<left_t, LeafCountT>::value));
|
||||
BOOST_STATIC_CONSTANT(int,
|
||||
rightcount = (nodes<right_category_t>
|
||||
::template count<right_t, LeafCountT>::value),
|
||||
value = ((self_t::leftcount) + (self_t::rightcount) + 1)
|
||||
};
|
||||
::template count<right_t, LeafCountT>::value));
|
||||
BOOST_STATIC_CONSTANT(int,
|
||||
value = ((self_t::leftcount) + (self_t::rightcount) + 1));
|
||||
};
|
||||
};
|
||||
|
||||
@@ -108,8 +105,7 @@ namespace impl
|
||||
template <typename ParserT, typename LeafCountT>
|
||||
struct count {
|
||||
|
||||
// __BORLANDC__ == 0x0561 isn't happy with BOOST_STATIC_CONSTANT
|
||||
enum { value = (LeafCountT::value + 1) };
|
||||
BOOST_STATIC_CONSTANT(int, value = (LeafCountT::value + 1));
|
||||
};
|
||||
};
|
||||
|
||||
@@ -122,9 +118,8 @@ namespace impl
|
||||
typedef typename ParserT::subject_t subject_t;
|
||||
typedef typename subject_t::parser_category_t subject_category_t;
|
||||
|
||||
// __BORLANDC__ == 0x0561 isn't happy with BOOST_STATIC_CONSTANT
|
||||
enum { value = (leafs<subject_category_t>
|
||||
::template count<subject_t, LeafCountT>::value) };
|
||||
BOOST_STATIC_CONSTANT(int, value = (leafs<subject_category_t>
|
||||
::template count<subject_t, LeafCountT>::value));
|
||||
};
|
||||
};
|
||||
|
||||
@@ -137,9 +132,8 @@ namespace impl
|
||||
typedef typename ParserT::subject_t subject_t;
|
||||
typedef typename subject_t::parser_category_t subject_category_t;
|
||||
|
||||
// __BORLANDC__ == 0x0561 isn't happy with BOOST_STATIC_CONSTANT
|
||||
enum { value = (leafs<subject_category_t>
|
||||
::template count<subject_t, LeafCountT>::value) };
|
||||
BOOST_STATIC_CONSTANT(int, value = (leafs<subject_category_t>
|
||||
::template count<subject_t, LeafCountT>::value));
|
||||
};
|
||||
};
|
||||
|
||||
@@ -156,14 +150,14 @@ namespace impl
|
||||
|
||||
typedef count self_t;
|
||||
|
||||
// __BORLANDC__ == 0x0561 isn't happy with BOOST_STATIC_CONSTANT
|
||||
enum {
|
||||
BOOST_STATIC_CONSTANT(int,
|
||||
leftcount = (leafs<left_category_t>
|
||||
::template count<left_t, LeafCountT>::value),
|
||||
::template count<left_t, LeafCountT>::value));
|
||||
BOOST_STATIC_CONSTANT(int,
|
||||
rightcount = (leafs<right_category_t>
|
||||
::template count<right_t, LeafCountT>::value),
|
||||
value = (self_t::leftcount + self_t::rightcount)
|
||||
};
|
||||
::template count<right_t, LeafCountT>::value));
|
||||
BOOST_STATIC_CONSTANT(int,
|
||||
value = (self_t::leftcount + self_t::rightcount));
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@@ -64,7 +64,7 @@ struct is_unary_composite {
|
||||
//
|
||||
// The is_acction_parser traits template can be used to tell if a given
|
||||
// parser is a action parser, i.e. it is a composite consisting of a
|
||||
// auxilliary parser and an attached semantic action.
|
||||
// auxiliary parser and an attached semantic action.
|
||||
//
|
||||
///////////////////////////////////////////////////////////////////////////////
|
||||
template <typename ActionT>
|
||||
|
||||
@@ -18,7 +18,7 @@ BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
|
||||
|
||||
///////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// Post-order traversal of auxilliary parsers.
|
||||
// Post-order traversal of auxiliary parsers.
|
||||
//
|
||||
///////////////////////////////////////////////////////////////////////////
|
||||
struct post_order
|
||||
|
||||
Reference in New Issue
Block a user