[Boost-commit] svn:boost r53304 - in trunk/boost/spirit/home: . lex

Subject: [Boost-commit] svn:boost r53304 - in trunk/boost/spirit/home: . lex
From: hartmut.kaiser_at_[hidden]
Date: 2009-05-27 12:15:05

Author: hkaiser
Date: 2009-05-27 12:15:05 EDT (Wed, 27 May 2009)
New Revision: 53304
URL: http://svn.boost.org/trac/boost/changeset/53304

Log:
Spirit: added tokenize_and_parse functions taking multiple attributes
Added:
   trunk/boost/spirit/home/lex/tokenize_and_parse_attr.hpp   (contents, props changed)
Text files modified: 
   trunk/boost/spirit/home/lex.hpp                    |     1                                         
   trunk/boost/spirit/home/lex/tokenize_and_parse.hpp |    48 +++++++++++++++++++++++++++++---------- 
   2 files changed, 36 insertions(+), 13 deletions(-)

Modified: trunk/boost/spirit/home/lex.hpp
==============================================================================
--- trunk/boost/spirit/home/lex.hpp	(original)
+++ trunk/boost/spirit/home/lex.hpp	2009-05-27 12:15:05 EDT (Wed, 27 May 2009)
@@ -13,5 +13,6 @@
 #include <boost/spirit/home/lex/lexer.hpp>
 #include <boost/spirit/home/lex/qi.hpp>
 #include <boost/spirit/home/lex/tokenize_and_parse.hpp>
+#include <boost/spirit/home/lex/tokenize_and_parse_attr.hpp>
 
 #endif

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-05-27 12:15:05 EDT (Wed, 27 May 2009)
@@ -7,6 +7,7 @@
 #define BOOST_SPIRIT_LEXER_PARSE_NOV_17_2007_0246PM
 
 #include <boost/spirit/home/qi/skip_over.hpp>
+#include <boost/spirit/home/qi/parse.hpp>
 #include <boost/spirit/home/qi/nonterminal/grammar.hpp>
 #include <boost/spirit/home/support/unused.hpp>
 #include <boost/spirit/home/lex/lexer.hpp>
@@ -15,6 +16,10 @@
 namespace boost { namespace spirit { namespace lex
 {
     ///////////////////////////////////////////////////////////////////////////
+    //  Import skip_flag enumerator type from Qi namespace
+    using qi::skip_flag;
+
+    ///////////////////////////////////////////////////////////////////////////
     //
     //  The tokenize_and_parse() function is one of the main Spirit API 
     //  functions. It simplifies using a lexer as the underlying token source
@@ -122,21 +127,25 @@
     //                  object instance. The ParserExpr type must conform to 
     //                  the grammar interface described in the corresponding 
     //                  section of the documentation.
+    //  skipper:        The skip parser to be used while parsing the given 
+    //                  input sequence. Note, the skip parser will have to 
+    //                  act on the same token sequence as the main parser 
+    //                  'xpr'.
+    //  post_skip:      The post_skip flag controls whether the funciton will
+    //                  invoke an additional post skip after the main parser
+    //                  returned.
     //  attr:           The top level attribute passed to the parser. It will 
     //                  be populated during the parsing of the input sequence.
     //                  On exit it will hold the 'parser result' corresponding 
     //                  to the matched input sequence.
-    //  skipper_:       The skip parser to be used while parsing the given 
-    //                  input sequence. Note, the skip parser will have to 
-    //                  act on the same token sequence as the main parser 
-    //                  'xpr'.
     //
     ///////////////////////////////////////////////////////////////////////////
     template <typename Iterator, typename Lexer, typename ParserExpr
       , typename Skipper>
     inline bool
     tokenize_and_phrase_parse(Iterator& first, Iterator last
-      , Lexer const& lex, ParserExpr const& xpr, Skipper const& skipper)
+      , Lexer const& lex, ParserExpr const& xpr, Skipper const& skipper
+      , BOOST_SCOPED_ENUM(skip_flag) post_skip = skip_flag::postskip)
     {
         // Report invalid expression error as early as possible.
         // If you got an error_invalid_expression error message here,
@@ -155,17 +164,17 @@
             return false;
 
         // do a final post-skip
-        qi::skip_over(iter, lex.end(), skipper_);
+        if (post_skip == skip_flag::postskip)
+            qi::skip_over(iter, lex.end(), skipper_);
         return true;
     }
 
-    ///////////////////////////////////////////////////////////////////////////
     template <typename Iterator, typename Lexer, typename ParserExpr
       , typename Skipper, typename Attribute>
     inline bool
     tokenize_and_phrase_parse(Iterator& first, Iterator last
-      , Lexer const& lex, ParserExpr const& xpr, Skipper const& skipper_
-      , Attribute& attr)
+      , Lexer const& lex, ParserExpr const& xpr, Skipper const& skipper
+      , BOOST_SCOPED_ENUM(skip_flag) post_skip, Attribute& attr)
     {
         // Report invalid expression error as early as possible.
         // If you got an error_invalid_expression error message here,
@@ -176,24 +185,37 @@
         typedef
             typename result_of::compile<qi::domain, Skipper>::type
         skipper_type;
-        skipper_type const skipper = compile<qi::domain>(skipper_);
+        skipper_type const skipper_ = compile<qi::domain>(skipper);
 
         typename Lexer::iterator_type iter = lex.begin(first, last);
         if (!compile<qi::domain>(xpr).parse(
-                iter, lex.end(), unused, skipper, attr))
+                iter, lex.end(), unused, skipper_, attr))
             return false;
 
         // do a final post-skip
-        qi::skip_over(iter, lex.end(), skipper);
+        if (post_skip == skip_flag::postskip)
+            qi::skip_over(iter, lex.end(), skipper_);
         return true;
     }
 
     ///////////////////////////////////////////////////////////////////////////
+    template <typename Iterator, typename Lexer, typename ParserExpr
+      , typename Skipper, typename Attribute>
+    inline bool
+    tokenize_and_phrase_parse(Iterator& first, Iterator last
+      , Lexer const& lex, ParserExpr const& xpr, Skipper const& skipper
+      , Attribute& attr)
+    {
+        return tokenize_and_phrase_parse(first, last, lex, xpr, skipper
+          , skip_flag::postskip, attr);
+    }
+
+    ///////////////////////////////////////////////////////////////////////////
     //
     //  The tokenize() function is one of the main Spirit API functions. It 
     //  simplifies using a lexer to tokenize a given input sequence. It's main
     //  purpose is to use the lexer to tokenize all the input. 
-
+    //
     //  The second version below discards all generated tokens afterwards. 
     //  This is useful whenever all the needed functionality has been 
     //  implemented directly inside the lexer semantic actions, which are being 

Added: trunk/boost/spirit/home/lex/tokenize_and_parse_attr.hpp
==============================================================================
--- (empty file)
+++ trunk/boost/spirit/home/lex/tokenize_and_parse_attr.hpp	2009-05-27 12:15:05 EDT (Wed, 27 May 2009)
@@ -0,0 +1,113 @@
+//  Copyright (c) 2001-2009 Hartmut Kaiser
+//  Copyright (c) 2001-2009 Joel de Guzman
+//  Copyright (c) 2009 Carl Barron
+// 
+//  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)
+
+#if !defined(BOOST_PP_IS_ITERATING)
+
+#if !defined(BOOST_SPIRIT_LEXER_PARSE_ATTR_MAY_27_2009_0926AM)
+#define BOOST_SPIRIT_LEXER_PARSE_ATTR_MAY_27_2009_0926AM
+
+#include <boost/spirit/home/lex/tokenize_and_parse.hpp>
+
+#include <boost/fusion/include/vector.hpp>
+#include <boost/preprocessor/cat.hpp>
+#include <boost/preprocessor/iterate.hpp>
+#include <boost/preprocessor/repetition/enum.hpp>
+#include <boost/preprocessor/repetition/enum_params.hpp>
+#include <boost/preprocessor/repetition/enum_binary_params.hpp>
+
+#define BOOST_PP_FILENAME_1 <boost/spirit/home/lex/tokenize_and_parse_attr.hpp>
+#define BOOST_PP_ITERATION_LIMITS (2, SPIRIT_ARGUMENTS_LIMIT)
+#include BOOST_PP_ITERATE()
+
+#endif
+
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Preprocessor vertical repetition code
+//
+///////////////////////////////////////////////////////////////////////////////
+#else // defined(BOOST_PP_IS_ITERATING)
+
+#define N BOOST_PP_ITERATION()
+#define BOOST_SPIRIT_QI_ATTRIBUTE_REFERENCE(z, n, A) BOOST_PP_CAT(A, n)&
+
+namespace boost { namespace spirit { namespace lex
+{
+    template <typename Iterator, typename Lexer, typename ParserExpr
+      , BOOST_PP_ENUM_PARAMS(N, typename A)>
+    inline bool
+    tokenize_and_parse(Iterator& first, Iterator last, Lexer const& lex
+      , ParserExpr const& expr, BOOST_PP_ENUM_BINARY_PARAMS(N, A, & attr))
+    {
+        // Report invalid expression error as early as possible.
+        // If you got an error_invalid_expression error message here,
+        // then the expression (expr) is not a valid spirit qi expression.
+        BOOST_SPIRIT_ASSERT_MATCH(qi::domain, ParserExpr)
+
+        typedef fusion::vector<
+            BOOST_PP_ENUM(N, BOOST_SPIRIT_QI_ATTRIBUTE_REFERENCE, A)
+        > vector_type;
+
+        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);
+    }
+
+    ///////////////////////////////////////////////////////////////////////////
+    template <typename Iterator, typename Lexer, typename ParserExpr
+      , typename Skipper, BOOST_PP_ENUM_PARAMS(N, typename A)>
+    inline bool
+    tokenize_and_phrase_parse(Iterator& first, Iterator last, Lexer const& lex
+      , ParserExpr const& expr, Skipper const& skipper
+      , BOOST_SCOPED_ENUM(skip_flag) post_skip
+      , BOOST_PP_ENUM_BINARY_PARAMS(N, A, & attr))
+    {
+        // Report invalid expression error as early as possible.
+        // If you got an error_invalid_expression error message here,
+        // then either the expression (expr) or skipper is not a valid
+        // spirit qi expression.
+        BOOST_SPIRIT_ASSERT_MATCH(qi::domain, ParserExpr)
+        BOOST_SPIRIT_ASSERT_MATCH(qi::domain, Skipper)
+
+        typedef
+            typename result_of::compile<qi::domain, Skipper>::type
+        skipper_type;
+        skipper_type const skipper_ = compile<qi::domain>(skipper);
+
+        typedef fusion::vector<
+            BOOST_PP_ENUM(N, BOOST_SPIRIT_QI_ATTRIBUTE_REFERENCE, A)
+        > vector_type;
+
+        vector_type attr (BOOST_PP_ENUM_PARAMS(N, attr));
+        typename Lexer::iterator_type iter = lex.begin(first, last);
+        if (!compile<qi::domain>(expr).parse(
+                iter, lex.end(), unused, skipper_, attr))
+            return false;
+
+        if (post_skip == skip_flag::postskip)
+            qi::skip_over(first, last, skipper_);
+        return true;
+    }
+
+    template <typename Iterator, typename Lexer, typename ParserExpr
+      , typename Skipper, BOOST_PP_ENUM_PARAMS(N, typename A)>
+    inline bool
+    tokenize_and_phrase_parse(Iterator& first, Iterator last, Lexer const& lex
+      , ParserExpr const& expr, Skipper const& skipper
+      , BOOST_PP_ENUM_BINARY_PARAMS(N, A, & attr))
+    {
+        return tokenize_and_phrase_parse(first, last, expr, skipper
+          , skip_flag::postskip, BOOST_PP_ENUM_PARAMS(N, attr));
+    }
+
+}}}
+
+#undef BOOST_SPIRIT_QI_ATTRIBUTE_REFERENCE
+#undef N
+
+#endif
+