Subject: [Boost-commit] svn:boost r53235 - in trunk: boost/spirit/home/lex/lexer/lexertl libs/spirit/example/lex/static_lexer
From: hartmut.kaiser_at_[hidden]
Date: 2009-05-24 22:12:22
Author: hkaiser
Date: 2009-05-24 22:12:21 EDT (Sun, 24 May 2009)
New Revision: 53235
URL: http://svn.boost.org/trac/boost/changeset/53235
Log:
Spirit: more fixes for static lexers
Text files modified:
trunk/boost/spirit/home/lex/lexer/lexertl/static_lexer.hpp | 14 ++++++++++++--
trunk/libs/spirit/example/lex/static_lexer/word_count_lexer_tokens.hpp | 1 +
2 files changed, 13 insertions(+), 2 deletions(-)
Modified: trunk/boost/spirit/home/lex/lexer/lexertl/static_lexer.hpp
==============================================================================
--- trunk/boost/spirit/home/lex/lexer/lexertl/static_lexer.hpp (original)
+++ trunk/boost/spirit/home/lex/lexer/lexertl/static_lexer.hpp 2009-05-24 22:12:21 EDT (Sun, 24 May 2009)
@@ -23,6 +23,14 @@
namespace boost { namespace spirit { namespace lex { namespace lexertl
{
///////////////////////////////////////////////////////////////////////////
+ // forward declaration
+ ///////////////////////////////////////////////////////////////////////////
+ namespace static_
+ {
+ struct lexer;
+ }
+
+ ///////////////////////////////////////////////////////////////////////////
// static_token_set
///////////////////////////////////////////////////////////////////////////
template <typename Token
@@ -210,8 +218,10 @@
template <typename Iterator_>
iterator_type begin(Iterator_& first, Iterator_ const& last) const
{
- iterator_data_type iterator_data =
- { &tables_type::next<Iterator_>, actions_, get_state_id };
+ iterator_data_type iterator_data = {
+ &tables_type::template next<Iterator_>, actions_,
+ get_state_id
+ };
return iterator_type(iterator_data, first, last);
}
Modified: trunk/libs/spirit/example/lex/static_lexer/word_count_lexer_tokens.hpp
==============================================================================
--- trunk/libs/spirit/example/lex/static_lexer/word_count_lexer_tokens.hpp (original)
+++ trunk/libs/spirit/example/lex/static_lexer/word_count_lexer_tokens.hpp 2009-05-24 22:12:21 EDT (Sun, 24 May 2009)
@@ -28,6 +28,7 @@
, eol("\n")
, any(".")
{
+ using boost::spirit::_1;
using boost::phoenix::ref;
using boost::phoenix::distance;