From: hartmut.kaiser_at_[hidden]
Date: 2008-04-20 18:37:35
Author: hkaiser
Date: 2008-04-20 18:37:35 EDT (Sun, 20 Apr 2008)
New Revision: 44657
URL: http://svn.boost.org/trac/boost/changeset/44657
Log:
Spirit.Lex: Updated examples.
Text files modified:
trunk/libs/spirit/example/lex/static_lexer/word_count_generate.cpp | 2 +-
trunk/libs/spirit/example/lex/static_lexer/word_count_static.hpp | 10 +++++-----
trunk/libs/spirit/example/lex/word_count_lexer.cpp | 6 ------
3 files changed, 6 insertions(+), 12 deletions(-)
Modified: trunk/libs/spirit/example/lex/static_lexer/word_count_generate.cpp
==============================================================================
--- trunk/libs/spirit/example/lex/static_lexer/word_count_generate.cpp (original)
+++ trunk/libs/spirit/example/lex/static_lexer/word_count_generate.cpp 2008-04-20 18:37:35 EDT (Sun, 20 Apr 2008)
@@ -14,7 +14,7 @@
// #define BOOST_SPIRIT_LEXERTL_DEBUG
#include <boost/spirit/include/lex_lexer_lexertl.hpp>
-#include <boost/spirit/lex/lexer/lexertl/lexertl_generate_static.hpp>
+#include <boost/spirit/home/lex/lexer/lexertl/lexertl_generate_static.hpp>
#include <fstream>
Modified: trunk/libs/spirit/example/lex/static_lexer/word_count_static.hpp
==============================================================================
--- trunk/libs/spirit/example/lex/static_lexer/word_count_static.hpp (original)
+++ trunk/libs/spirit/example/lex/static_lexer/word_count_static.hpp 2008-04-20 18:37:35 EDT (Sun, 20 Apr 2008)
@@ -4,11 +4,11 @@
// file licence_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
// Auto-generated by boost::lexer
-#if !defined(BOOST_SPIRIT_LEXER_NEXT_TOKEN_Feb_13_2008_12_01_20)
-#define BOOST_SPIRIT_LEXER_NEXT_TOKEN_Feb_13_2008_12_01_20
+#if !defined(BOOST_SPIRIT_LEXER_NEXT_TOKEN_Apr_20_2008_17_34_03)
+#define BOOST_SPIRIT_LEXER_NEXT_TOKEN_Apr_20_2008_17_34_03
#include <boost/detail/iterator.hpp>
-#include <boost/spirit/support/detail/lexer/char_traits.hpp>
+#include <boost/spirit/home/support/detail/lexer/char_traits.hpp>
// the generated table of state names and the tokenizer have to be
// defined in the boost::spirit::lex::static namespace
@@ -63,8 +63,8 @@
static const std::size_t dfa_[45] = {0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 3,
4, 2, 1, 65536, 0, 0, 0, 0,
- 0, 0, 2, 1, 65537, 0, 0, 0,
- 0, 0, 0, 0, 1, 65538, 0, 0,
+ 0, 0, 2, 1, 10, 0, 0, 0,
+ 0, 0, 0, 0, 1, 65537, 0, 0,
0, 0, 0, 0, 0};
if (start_token_ == end_) return 0;
Modified: trunk/libs/spirit/example/lex/word_count_lexer.cpp
==============================================================================
--- trunk/libs/spirit/example/lex/word_count_lexer.cpp (original)
+++ trunk/libs/spirit/example/lex/word_count_lexer.cpp 2008-04-20 18:37:35 EDT (Sun, 20 Apr 2008)
@@ -72,12 +72,6 @@
{
using boost::phoenix::ref;
using boost::phoenix::distance;
-
- // Note that all placeholders used in lexer semantic actions in
- // conjunction with functors created based on Phoenix2 need to be from
- // the namespace boost::phoenix::arg_names (not spirit::arg_names).
- // Using the wrong placeholders leads to subtle compilation errors
- // which are difficult to backtrack to their cause.
using boost::spirit::arg_names::_1;
// associate tokens with the lexer