Subject: [Boost-commit] svn:boost r55307 - in trunk/boost/spirit/home: karma/nonterminal qi/nonterminal support
From: hartmut.kaiser_at_[hidden]
Date: 2009-07-30 21:12:43
Author: hkaiser
Date: 2009-07-30 20:08:50 EDT (Thu, 30 Jul 2009)
New Revision: 55307
URL: http://svn.boost.org/trac/boost/changeset/55307
Log:
Spirit: added typedef for iterator_type to qi::rule and larma::rule
Text files modified:
trunk/boost/spirit/home/karma/nonterminal/grammar.hpp | 1 +
trunk/boost/spirit/home/karma/nonterminal/rule.hpp | 2 ++
trunk/boost/spirit/home/qi/nonterminal/grammar.hpp | 1 +
trunk/boost/spirit/home/qi/nonterminal/rule.hpp | 1 +
trunk/boost/spirit/home/support/common_terminals.hpp | 4 ++--
5 files changed, 7 insertions(+), 2 deletions(-)
Modified: trunk/boost/spirit/home/karma/nonterminal/grammar.hpp
==============================================================================
--- trunk/boost/spirit/home/karma/nonterminal/grammar.hpp (original)
+++ trunk/boost/spirit/home/karma/nonterminal/grammar.hpp 2009-07-30 20:08:50 EDT (Thu, 30 Jul 2009)
@@ -45,6 +45,7 @@
typedef grammar<OutputIterator, T1, T2, T3> base_type;
typedef reference<start_type const> reference_;
typedef typename proto::terminal<reference_>::type terminal;
+
static size_t const params_size = start_type::params_size;
// the output iterator is always wrapped by karma
Modified: trunk/boost/spirit/home/karma/nonterminal/rule.hpp
==============================================================================
--- trunk/boost/spirit/home/karma/nonterminal/rule.hpp (original)
+++ trunk/boost/spirit/home/karma/nonterminal/rule.hpp 2009-07-30 20:08:50 EDT (Thu, 30 Jul 2009)
@@ -102,6 +102,8 @@
, generator<rule<OutputIterator, T1, T2, T3> >
{
typedef mpl::int_<generator_properties::all_properties> properties;
+
+ typedef OutputIterator iterator_type;
typedef rule<OutputIterator, T1, T2, T3> this_type;
typedef reference<this_type const> reference_;
typedef typename proto::terminal<reference_>::type terminal;
Modified: trunk/boost/spirit/home/qi/nonterminal/grammar.hpp
==============================================================================
--- trunk/boost/spirit/home/qi/nonterminal/grammar.hpp (original)
+++ trunk/boost/spirit/home/qi/nonterminal/grammar.hpp 2009-07-30 20:08:50 EDT (Thu, 30 Jul 2009)
@@ -44,6 +44,7 @@
typedef grammar<Iterator, T1, T2, T3> base_type;
typedef reference<start_type const> reference_;
typedef typename proto::terminal<reference_>::type terminal;
+
static size_t const params_size = start_type::params_size;
grammar(
Modified: trunk/boost/spirit/home/qi/nonterminal/rule.hpp
==============================================================================
--- trunk/boost/spirit/home/qi/nonterminal/rule.hpp (original)
+++ trunk/boost/spirit/home/qi/nonterminal/rule.hpp 2009-07-30 20:08:50 EDT (Thu, 30 Jul 2009)
@@ -99,6 +99,7 @@
>
, parser<rule<Iterator, T1, T2, T3> >
{
+ typedef Iterator iterator_type;
typedef rule<Iterator, T1, T2, T3> this_type;
typedef reference<this_type const> reference_;
typedef typename proto::terminal<reference_>::type terminal;
Modified: trunk/boost/spirit/home/support/common_terminals.hpp
==============================================================================
--- trunk/boost/spirit/home/support/common_terminals.hpp (original)
+++ trunk/boost/spirit/home/support/common_terminals.hpp 2009-07-30 20:08:50 EDT (Thu, 30 Jul 2009)
@@ -91,8 +91,8 @@
/***/
#define BOOST_SPIRIT_CHAR_SPEC(charset) \
- typedef spirit::terminal<tag::charset::char_> char__type; \
- char__type const char_ = char__type(); \
+ typedef spirit::terminal<tag::charset::char_> char_type; \
+ char_type const char_ = char_type(); \
\
inline void silence_unused_warnings__##char_() { (void) char_; } \
\