[Boost-commit] svn:boost r66738 - in trunk/libs/spirit/test: . lex

Subject: [Boost-commit] svn:boost r66738 - in trunk/libs/spirit/test: . lex
From: hartmut.kaiser_at_[hidden]
Date: 2010-11-24 13:10:36

Author: hkaiser
Date: 2010-11-24 13:10:35 EST (Wed, 24 Nov 2010)
New Revision: 66738
URL: http://svn.boost.org/trac/boost/changeset/66738

Log:
Spirit: adding yet another regression test
Added:
   trunk/libs/spirit/test/lex/regression008.cpp   (contents, props changed)
Text files modified: 
   trunk/libs/spirit/test/Jamfile               |     1 +                                       
   trunk/libs/spirit/test/lex/regression007.cpp |     8 +++-----                                
   2 files changed, 4 insertions(+), 5 deletions(-)

Modified: trunk/libs/spirit/test/Jamfile
==============================================================================
--- trunk/libs/spirit/test/Jamfile	(original)
+++ trunk/libs/spirit/test/Jamfile	2010-11-24 13:10:35 EST (Wed, 24 Nov 2010)
@@ -147,6 +147,7 @@
     [ run lex/regression005.cpp             : : : : lex_regression005 ]
     [ run lex/regression006.cpp             : : : : lex_regression006 ]
     [ run lex/regression007.cpp             : : : : lex_regression007 ]
+    [ run lex/regression008.cpp             : : : : lex_regression008 ]
 
     # support tests
     [ compile support/multi_pass_regression001.cpp : : support_multi_pass_regression001 ]

Modified: trunk/libs/spirit/test/lex/regression007.cpp
==============================================================================
--- trunk/libs/spirit/test/lex/regression007.cpp	(original)
+++ trunk/libs/spirit/test/lex/regression007.cpp	2010-11-24 13:10:35 EST (Wed, 24 Nov 2010)
@@ -22,9 +22,7 @@
 namespace phoenix = boost::phoenix;
 
 typedef spirit::classic::position_iterator2<
-    spirit::multi_pass<
-        std::istreambuf_iterator<char>
-    >
+    spirit::multi_pass<std::istreambuf_iterator<char> >
 > file_iterator;
 
 typedef boost::iterator_range<file_iterator> file_range;
@@ -92,8 +90,8 @@
     token_iterator begin2 = l.begin(begin, end, "ST");
     token_iterator end2 = l.end();
     
-    int test_data[] = { 1, 2, 3 };
-    std::size_t const test_data_size = sizeof(test_data[0])/sizeof(test_data);
+    int test_data[] = { 1, 3, 2 };
+    std::size_t const test_data_size = sizeof(test_data)/sizeof(test_data[0]);
 
     int i = 0;
     for (token_iterator it = begin2; it != end2 && i < test_data_size; ++it, ++i)

Added: trunk/libs/spirit/test/lex/regression008.cpp
==============================================================================
--- (empty file)
+++ trunk/libs/spirit/test/lex/regression008.cpp	2010-11-24 13:10:35 EST (Wed, 24 Nov 2010)
@@ -0,0 +1,111 @@
+//  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/detail/lightweight_test.hpp>
+#include <boost/config/warning_disable.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>
+#include <boost/spirit/home/phoenix/stl.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
+    );
+}
+
+struct identifier
+{
+    identifier(file_iterator begin, file_iterator end)
+    {
+    }
+};
+
+struct string_literal
+{
+    string_literal(file_iterator begin, file_iterator end)
+    {
+    }
+};
+
+typedef lex::lexertl::token<
+    file_iterator, boost::mpl::vector<identifier, string_literal>
+> token_type;
+
+struct lexer
+  : lex::lexer<lex::lexertl::actor_lexer<token_type> >
+{
+    lexer() 
+      : id("[a-zA-Z0-9]+", 1)
+      , st("'[^'\\n]*'", 2)
+    {
+        self =  id [ 
+                    lex::_state = "ST"
+                ]
+            |   lex::token_def<>(".", 3) [ 
+                    lex::_state = "ST" 
+                ]
+            ;
+        
+        self("ST") =
+                st [ 
+                    lex::_state = "INITIAL" 
+                ]
+            |   lex::token_def<>(".", 4) [ 
+                    lex::_state = "INITIAL"
+                  , lex::_pass = lex::pass_flags::pass_fail 
+                ]
+            ;
+    }
+    
+    lex::token_def<identifier> id;
+    lex::token_def<string_literal> st;
+};
+
+typedef lexer::iterator_type token_iterator;
+
+int main()
+{
+    std::stringstream ss;
+    ss << "foo 'bar'";
+    
+    file_iterator begin = make_file_iterator(ss, "SS");
+    file_iterator end;
+    
+    lexer l;
+    token_iterator begin2 = l.begin(begin, end, "ST");
+    token_iterator end2 = l.end();
+    
+    int test_data[] = { 1, 3, 2 };
+    std::size_t const test_data_size = sizeof(test_data)/sizeof(test_data[0]);
+
+    int i = 0;
+    for (token_iterator it = begin2; it != end2; ++it, ++i)
+    {
+        BOOST_TEST(it->id() == test_data[i]);
+    }
+    BOOST_TEST(i == test_data_size);
+
+    return boost::report_errors();
+}