[Boost-commit] svn:boost r66849 - in trunk/libs/spirit: doc test test/lex

Subject: [Boost-commit] svn:boost r66849 - in trunk/libs/spirit: doc test test/lex
From: hartmut.kaiser_at_[hidden]
Date: 2010-11-29 13:51:14

Author: hkaiser
Date: 2010-11-29 13:51:12 EST (Mon, 29 Nov 2010)
New Revision: 66849
URL: http://svn.boost.org/trac/boost/changeset/66849

Log:
Spirit: added new test for lexer id_types not equal to std::size_t
Added:
   trunk/libs/spirit/test/lex/id_type_enum.cpp   (contents, props changed)
Text files modified: 
   trunk/libs/spirit/doc/what_s_new.qbk         |     2 ++                                      
   trunk/libs/spirit/test/Jamfile               |     1 +                                       
   trunk/libs/spirit/test/lex/regression009.cpp |     1 -                                       
   trunk/libs/spirit/test/lex/regression010.cpp |     1 -                                       
   4 files changed, 3 insertions(+), 2 deletions(-)

Modified: trunk/libs/spirit/doc/what_s_new.qbk
==============================================================================
--- trunk/libs/spirit/doc/what_s_new.qbk	(original)
+++ trunk/libs/spirit/doc/what_s_new.qbk	2010-11-29 13:51:12 EST (Mon, 29 Nov 2010)
@@ -45,6 +45,8 @@
    iterator_range of the matched input, as qi::token() does).
  * Added additional template parameter to the default `lexertl::token<>`
    definition: the type of the token id. This type defaults to `std::size_t`.
+   Any type used as the id type needs to be (explicitly) convertible from 
+   `std::size_t`.
  * It's now possible to attach lexer semantic actions to token definitions 
    based on `lex::char()` and `lex::string()`.
  * It's now possible to specify a lexer state the lexer should automatically be

Modified: trunk/libs/spirit/test/Jamfile
==============================================================================
--- trunk/libs/spirit/test/Jamfile	(original)
+++ trunk/libs/spirit/test/Jamfile	2010-11-29 13:51:12 EST (Mon, 29 Nov 2010)
@@ -136,6 +136,7 @@
     [ run lex/set_token_value_phoenix.cpp   : : : : ]
     [ run lex/semantic_actions.cpp          : : : : ]
     [ run lex/auto_switch_lexerstate.cpp    : : : : ]
+    [ run lex/id_type_enum.cpp              : : : : ]
 
     # run Lex regression tests
     [ run lex/regression001.cpp             : : : : lex_regression001 ]

Added: trunk/libs/spirit/test/lex/id_type_enum.cpp
==============================================================================
--- (empty file)
+++ trunk/libs/spirit/test/lex/id_type_enum.cpp	2010-11-29 13:51:12 EST (Mon, 29 Nov 2010)
@@ -0,0 +1,99 @@
+//  Copyright (c) 2001-2010 Hartmut Kaiser
+//  Copyright (c) 2010 Mathias Gaunard
+// 
+//  Distributed under the Boost Software License, Version 1.0. (See accompanying 
+//  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+
+#include <boost/config/warning_disable.hpp>
+#include <boost/detail/lightweight_test.hpp>
+
+#include <boost/spirit/include/support_multi_pass.hpp>
+#include <boost/spirit/include/classic_position_iterator.hpp>
+#include <boost/spirit/include/lex_lexertl.hpp>
+
+#include <boost/spirit/home/phoenix/core.hpp>
+#include <boost/spirit/home/phoenix/operator.hpp>
+#include <boost/spirit/home/phoenix/statement.hpp>
+#include <boost/spirit/home/phoenix/object.hpp>
+
+namespace spirit = boost::spirit;
+namespace lex = spirit::lex;
+namespace phoenix = boost::phoenix;
+
+typedef spirit::classic::position_iterator2<
+    spirit::multi_pass<std::istreambuf_iterator<char> >
+> file_iterator;
+
+inline file_iterator 
+make_file_iterator(std::istream& input, const std::string& filename)
+{
+    return file_iterator(
+        spirit::make_default_multi_pass(
+            std::istreambuf_iterator<char>(input)),
+        spirit::multi_pass<std::istreambuf_iterator<char> >(),
+        filename);
+}
+
+enum token_id
+{
+    ID_WORD = lex::min_token_id + 1,
+    ID_EOL
+};
+
+typedef lex::lexertl::token<
+    file_iterator, boost::mpl::vector<>, boost::mpl::true_, token_id
+> token_type;
+
+struct lexer
+  : lex::lexer<lex::lexertl::actor_lexer<token_type> >
+{
+    lexer() : word("^[a-zA-Z0-9]+$", ID_WORD)
+    {
+        typedef lex::token_def<lex::unused_type, char, token_id> toked_def;
+
+        self("INITIAL", "O") = 
+                word 
+            |   toked_def("!.*$") [ 
+                    lex::_pass = lex::pass_flags::pass_ignore 
+                ]
+            |   toked_def('\n', ID_EOL) 
+            ;
+        
+        self("O", "INITIAL") = 
+                toked_def(".") [ 
+                    lex::_pass = lex::pass_flags::pass_fail 
+                ]
+            ;
+    }
+    
+    lex::token_def<lex::unused_type, char, token_id> word;
+};
+
+typedef lexer::iterator_type token_iterator;
+
+int main()
+{
+    std::stringstream ss;
+    ss << "!foo\nbar\n!baz";
+    
+    file_iterator begin = make_file_iterator(ss, "SS");
+    file_iterator end;
+    
+    lexer l;
+    token_iterator begin2 = l.begin(begin, end);
+    token_iterator end2 = l.end();
+    
+    int test_data[] = { ID_EOL, ID_WORD, ID_EOL };
+    std::size_t const test_data_size = sizeof(test_data)/sizeof(test_data[0]);
+
+    token_iterator it = begin2;
+    int i = 0;
+    for (/**/; it != end2 && i < test_data_size; ++it, ++i)
+    {
+        BOOST_TEST(it->id() == test_data[i]);
+    }
+    BOOST_TEST(it == end2);
+    BOOST_TEST(i == test_data_size);
+
+    return boost::report_errors();
+}

Modified: trunk/libs/spirit/test/lex/regression009.cpp
==============================================================================
--- trunk/libs/spirit/test/lex/regression009.cpp	(original)
+++ trunk/libs/spirit/test/lex/regression009.cpp	2010-11-29 13:51:12 EST (Mon, 29 Nov 2010)
@@ -18,7 +18,6 @@
 #include <boost/spirit/home/phoenix/operator.hpp>
 #include <boost/spirit/home/phoenix/statement.hpp>
 #include <boost/spirit/home/phoenix/object.hpp>
-#include <boost/spirit/home/phoenix/stl.hpp>
 
 #include <sstream>
 

Modified: trunk/libs/spirit/test/lex/regression010.cpp
==============================================================================
--- trunk/libs/spirit/test/lex/regression010.cpp	(original)
+++ trunk/libs/spirit/test/lex/regression010.cpp	2010-11-29 13:51:12 EST (Mon, 29 Nov 2010)
@@ -21,7 +21,6 @@
 #include <boost/spirit/home/phoenix/operator.hpp>
 #include <boost/spirit/home/phoenix/statement.hpp>
 #include <boost/spirit/home/phoenix/object.hpp>
-#include <boost/spirit/home/phoenix/stl.hpp>
 
 namespace spirit = boost::spirit;
 namespace lex = spirit::lex;