[Boost-commit] svn:boost r40342 - in trunk/boost/xpressive/detail: . core core/matcher

From: eric_at_[hidden]
Date: 2007-10-23 03:01:54

Author: eric_niebler
Date: 2007-10-23 03:01:53 EDT (Tue, 23 Oct 2007)
New Revision: 40342
URL: http://svn.boost.org/trac/boost/changeset/40342

Log:
clean-up, actionable need not be a template
Text files modified: 
   trunk/boost/xpressive/detail/core/action.hpp                 |     6 ++----                                  
   trunk/boost/xpressive/detail/core/matcher/action_matcher.hpp |    10 +++++-----                              
   trunk/boost/xpressive/detail/core/matcher/end_matcher.hpp    |     2 +-                                      
   trunk/boost/xpressive/detail/core/state.hpp                  |     4 ++--                                    
   trunk/boost/xpressive/detail/detail_fwd.hpp                  |     1 -                                       
   5 files changed, 10 insertions(+), 13 deletions(-)

Modified: trunk/boost/xpressive/detail/core/action.hpp
==============================================================================
--- trunk/boost/xpressive/detail/core/action.hpp	(original)
+++ trunk/boost/xpressive/detail/core/action.hpp	2007-10-23 03:01:53 EDT (Tue, 23 Oct 2007)
@@ -21,7 +21,6 @@
     ///////////////////////////////////////////////////////////////////////////////
     // actionable
     //
-    template<typename BidiIter>
     struct actionable
     {
         virtual ~actionable() {}
@@ -29,10 +28,9 @@
 
         actionable()
           : next(0)
-        {
-        }
+        {}
 
-        actionable<BidiIter> const *next;
+        actionable const *next;
     };
 
 }}} // namespace boost::xpressive::detail

Modified: trunk/boost/xpressive/detail/core/matcher/action_matcher.hpp
==============================================================================
--- trunk/boost/xpressive/detail/core/matcher/action_matcher.hpp	(original)
+++ trunk/boost/xpressive/detail/core/matcher/action_matcher.hpp	2007-10-23 03:01:53 EDT (Tue, 23 Oct 2007)
@@ -232,12 +232,12 @@
     ///////////////////////////////////////////////////////////////////////////////
     // action
     //
-    template<typename BidiIter, typename Actor>
+    template<typename Actor>
     struct action
-      : actionable<BidiIter>
+      : actionable
     {
         action(Actor const &actor)
-          : actionable<BidiIter>()
+          : actionable()
           , actor_(actor)
         {
         }
@@ -437,10 +437,10 @@
         {
             // Bind the arguments
             typedef typename BindActionArgs::apply<Actor, match_state<BidiIter>, int>::type action_type;
-            action<BidiIter, action_type> actor(BindActionArgs::call(this->actor_, state, this->sub_));
+            action<action_type> actor(BindActionArgs::call(this->actor_, state, this->sub_));
 
             // Put the action in the action list
-            actionable<BidiIter> const **action_list_tail = state.action_list_tail_;
+            actionable const **action_list_tail = state.action_list_tail_;
             *state.action_list_tail_ = &actor;
             state.action_list_tail_ = &actor.next;
 

Modified: trunk/boost/xpressive/detail/core/matcher/end_matcher.hpp
==============================================================================
--- trunk/boost/xpressive/detail/core/matcher/end_matcher.hpp	(original)
+++ trunk/boost/xpressive/detail/core/matcher/end_matcher.hpp	2007-10-23 03:01:53 EDT (Tue, 23 Oct 2007)
@@ -65,7 +65,7 @@
             s0.matched = true;
 
             // Now execute any actions that have been queued
-            for(actionable<BidiIter> const *actor = state.action_list_.next; 0 != actor; actor = actor->next)
+            for(actionable const *actor = state.action_list_.next; 0 != actor; actor = actor->next)
             {
                 actor->execute(state.action_args_);
             }

Modified: trunk/boost/xpressive/detail/core/state.hpp
==============================================================================
--- trunk/boost/xpressive/detail/core/state.hpp	(original)
+++ trunk/boost/xpressive/detail/core/state.hpp	2007-10-23 03:01:53 EDT (Tue, 23 Oct 2007)
@@ -110,7 +110,7 @@
     typedef detail::matchable<BidiIter> matchable;
     typedef xpressive::match_results<BidiIter> match_results;
     typedef detail::sub_match_impl<BidiIter> sub_match_impl;
-    typedef detail::actionable<BidiIter> actionable;
+    typedef detail::actionable actionable;
 
     BidiIter cur_;
     sub_match_impl *sub_matches_;
@@ -314,7 +314,7 @@
 {
     sub_match_impl<BidiIter> *old_sub_matches_;
     std::size_t nested_results_count_;
-    actionable<BidiIter> const **action_list_tail_;
+    actionable const **action_list_tail_;
     attr_context attr_context_;
 };
 

Modified: trunk/boost/xpressive/detail/detail_fwd.hpp
==============================================================================
--- trunk/boost/xpressive/detail/detail_fwd.hpp	(original)
+++ trunk/boost/xpressive/detail/detail_fwd.hpp	2007-10-23 03:01:53 EDT (Tue, 23 Oct 2007)
@@ -296,7 +296,6 @@
     template<typename T, typename U>
     struct action_arg;
 
-    template<typename BidiIter>
     struct actionable;
 
     template<typename Char>