[Boost-commit] svn:boost r57306 - trunk/boost/spirit/home/lex

Subject: [Boost-commit] svn:boost r57306 - trunk/boost/spirit/home/lex
From: hartmut.kaiser_at_[hidden]
Date: 2009-11-03 09:11:38

Author: hkaiser
Date: 2009-11-03 09:11:38 EST (Tue, 03 Nov 2009)
New Revision: 57306
URL: http://svn.boost.org/trac/boost/changeset/57306

Log:
Spirit: reverting latest change to semantics of tokenize_and_parse at.al.
Text files modified: 
   trunk/boost/spirit/home/lex/tokenize_and_parse.hpp      |    16 ++++++----------                        
   trunk/boost/spirit/home/lex/tokenize_and_parse_attr.hpp |     3 ++-                                     
   2 files changed, 8 insertions(+), 11 deletions(-)

Modified: trunk/boost/spirit/home/lex/tokenize_and_parse.hpp
==============================================================================
--- trunk/boost/spirit/home/lex/tokenize_and_parse.hpp	(original)
+++ trunk/boost/spirit/home/lex/tokenize_and_parse.hpp	2009-11-03 09:11:38 EST (Tue, 03 Nov 2009)
@@ -75,10 +75,8 @@
         BOOST_SPIRIT_ASSERT_MATCH(qi::domain, ParserExpr);
 
         typename Lexer::iterator_type iter = lex.begin(first, last);
-        typename Lexer::iterator_type end = lex.end();
-        bool result = compile<qi::domain>(xpr).parse(
-            iter, end, unused, unused, unused);
-        return result && iter == end;
+        return compile<qi::domain>(xpr).parse(
+            iter, lex.end(), unused, unused, unused);
     }
 
     ///////////////////////////////////////////////////////////////////////////
@@ -94,10 +92,8 @@
         BOOST_SPIRIT_ASSERT_MATCH(qi::domain, ParserExpr);
 
         typename Lexer::iterator_type iter = lex.begin(first, last);
-        typename Lexer::iterator_type end = lex.end();
-        bool result = compile<qi::domain>(xpr).parse(
-            iter, end, unused, unused, attr);
-        return result && iter == end;
+        return compile<qi::domain>(xpr).parse(
+            iter, lex.end(), unused, unused, attr);
     }
 
     ///////////////////////////////////////////////////////////////////////////
@@ -177,7 +173,7 @@
         // do a final post-skip
         if (post_skip == skip_flag::postskip)
             qi::skip_over(iter, end, skipper_);
-        return iter != end;
+        return true;
     }
 
     template <typename Iterator, typename Lexer, typename ParserExpr
@@ -207,7 +203,7 @@
         // do a final post-skip
         if (post_skip == skip_flag::postskip)
             qi::skip_over(iter, end, skipper_);
-        return iter != end;
+        return true;
     }
 
     ///////////////////////////////////////////////////////////////////////////

Modified: trunk/boost/spirit/home/lex/tokenize_and_parse_attr.hpp
==============================================================================
--- trunk/boost/spirit/home/lex/tokenize_and_parse_attr.hpp	(original)
+++ trunk/boost/spirit/home/lex/tokenize_and_parse_attr.hpp	2009-11-03 09:11:38 EST (Tue, 03 Nov 2009)
@@ -54,7 +54,8 @@
 
         vector_type attr (BOOST_PP_ENUM_PARAMS(N, attr));
         typename Lexer::iterator_type iter = lex.begin(first, last);
-        return compile<qi::domain>(expr).parse(iter, lex.end(), unused, unused, attr);
+        return compile<qi::domain>(expr).parse(
+            iter, lex.end(), unused, unused, attr);
     }
 
     ///////////////////////////////////////////////////////////////////////////