[Boost-commit] svn:boost r44883 - trunk/boost/spirit/home/qi/nonterminal

From: hartmut.kaiser_at_[hidden]
Date: 2008-04-29 10:47:30

Author: hkaiser
Date: 2008-04-29 10:47:29 EDT (Tue, 29 Apr 2008)
New Revision: 44883
URL: http://svn.boost.org/trac/boost/changeset/44883

Log:
Spirit.Qi: Minor edits mainly in comments
Text files modified: 
   trunk/boost/spirit/home/qi/nonterminal/rule.hpp |    17 ++++++++++-------                       
   1 files changed, 10 insertions(+), 7 deletions(-)

Modified: trunk/boost/spirit/home/qi/nonterminal/rule.hpp
==============================================================================
--- trunk/boost/spirit/home/qi/nonterminal/rule.hpp	(original)
+++ trunk/boost/spirit/home/qi/nonterminal/rule.hpp	2008-04-29 10:47:29 EDT (Tue, 29 Apr 2008)
@@ -80,10 +80,13 @@
             typedef spirit::traits::is_component<qi::domain, Expr> is_component;
 
             // report invalid expression error as early as possible
-            BOOST_MPL_ASSERT_MSG(
-                is_component::value,
-                xpr_is_not_convertible_to_a_parser, ());
+//             BOOST_MPL_ASSERT_MSG(
+//                 is_component::value,
+//                 xpr_is_not_convertible_to_a_parser, ());
 
+            // temp workaround for mpl problem
+            BOOST_STATIC_ASSERT(is_component::value);
+            
             define(xpr, mpl::false_());
             return *this;
         }
@@ -173,9 +176,9 @@
         {
             // If the following line produces a compilation error stating the
             // 4th parameter is not convertible to the expected type, then you
-            // probably trying to use this rule instance with a skipper which
-            // is not compatible with the skipper type used while defining the
-            // type of this rule instance.
+            // are probably trying to use this rule instance with a skipper 
+            // which is not compatible with the skipper type used while 
+            // defining the type of this rule instance.
             return ptr->parse(first, last, context, skipper);
         }
 
@@ -217,7 +220,7 @@
             static call(Rule& r, A1 const& a1)
             {
                 typename Rule::pointer_type old (r.ptr);
-            r.ptr.reset(new Decorator(r.ptr, a1));
+                r.ptr.reset(new Decorator(r.ptr, a1));
                 return old;
             }