[Boost-commit] svn:boost r47326 - in trunk: boost/spirit/home/karma/action libs/spirit/test/karma

From: hartmut.kaiser_at_[hidden]
Date: 2008-07-11 16:26:10

Author: hkaiser
Date: 2008-07-11 16:26:09 EDT (Fri, 11 Jul 2008)
New Revision: 47326
URL: http://svn.boost.org/trac/boost/changeset/47326

Log:
Spirit: Fixing rest of the regressions in Karma
Text files modified: 
   trunk/boost/spirit/home/karma/action/action.hpp |     5 ++---                                   
   trunk/libs/spirit/test/karma/char.cpp           |     4 ++--                                    
   2 files changed, 4 insertions(+), 5 deletions(-)

Modified: trunk/boost/spirit/home/karma/action/action.hpp
==============================================================================
--- trunk/boost/spirit/home/karma/action/action.hpp	(original)
+++ trunk/boost/spirit/home/karma/action/action.hpp	2008-07-11 16:26:09 EDT (Fri, 11 Jul 2008)
@@ -49,7 +49,7 @@
                 result_of::left<Component>::type::director
             director;
             typedef typename is_same<director, sequence>::type is_sequence;
-            
+
             typedef typename
                 attribute<Component, Context, unused_type>::type
             param_type;
@@ -65,8 +65,7 @@
 
             // call the function, passing the parameter, the context
             // and a bool flag that the client can set to false to
-            // fail parsing.
-            // call the function, passing the attribute, the context.
+            // fail generating.
             // The client can return false to fail parsing.
             bool pass = spirit::detail::action_dispatch(
                 spirit::right(component), p, ctx, is_sequence());

Modified: trunk/libs/spirit/test/karma/char.cpp
==============================================================================
--- trunk/libs/spirit/test/karma/char.cpp	(original)
+++ trunk/libs/spirit/test/karma/char.cpp	2008-07-11 16:26:09 EDT (Fri, 11 Jul 2008)
@@ -136,9 +136,9 @@
     // action tests
     {
         BOOST_TEST(test("x", char_[_1 = val('x')]));
-        BOOST_TEST(test(L"x", char_[_1 = val(L'x')]));
+        BOOST_TEST(test(L"x", wchar[_1 = val(L'x')]));
         BOOST_TEST(!test("x", char_[_1 = val('y')]));
-        BOOST_TEST(!test(L"x", char_[_1 = val(L'y')]));
+        BOOST_TEST(!test(L"x", wchar[_1 = val(L'y')]));
     }
 
     {   // lazy chars