[Boost-commit] svn:boost r58737 - sandbox/msm/boost/msm/back

Subject: [Boost-commit] svn:boost r58737 - sandbox/msm/boost/msm/back
From: christophe.j.henry_at_[hidden]
Date: 2010-01-05 18:09:45

Author: chenry
Date: 2010-01-05 18:09:44 EST (Tue, 05 Jan 2010)
New Revision: 58737
URL: http://svn.boost.org/trac/boost/changeset/58737

Log:
bugfix
Text files modified: 
   sandbox/msm/boost/msm/back/dispatch_table.hpp |     5 +++--                                   
   sandbox/msm/boost/msm/back/metafunctions.hpp  |     4 ++--                                    
   sandbox/msm/boost/msm/back/state_machine.hpp  |    40 ++++++++++++++++++++--------------------
   3 files changed, 25 insertions(+), 24 deletions(-)

Modified: sandbox/msm/boost/msm/back/dispatch_table.hpp
==============================================================================
--- sandbox/msm/boost/msm/back/dispatch_table.hpp	(original)
+++ sandbox/msm/boost/msm/back/dispatch_table.hpp	2010-01-05 18:09:44 EST (Tue, 05 Jan 2010)
@@ -43,7 +43,7 @@
     struct chain_row
     {
         typedef State	current_state_type;
-        typedef AnEvent event;
+        typedef AnEvent transition_event;
 
         // helper for building a disable/enable_if-controlled execute function
         struct execute_helper
@@ -140,7 +140,8 @@
         {
             //only if the transition event is a base of our event is the reinterpret_case safe
             init_event_base_case(tr,
-                ::boost::mpl::bool_< ::boost::is_base_of<typename Transition::Event,Event>::type::value>() );
+                ::boost::mpl::bool_< 
+                    ::boost::is_base_of<typename Transition::transition_event,Event>::type::value>() );
         }
     
         dispatch_table* self;

Modified: sandbox/msm/boost/msm/back/metafunctions.hpp
==============================================================================
--- sandbox/msm/boost/msm/back/metafunctions.hpp	(original)
+++ sandbox/msm/boost/msm/back/metafunctions.hpp	2010-01-05 18:09:44 EST (Tue, 05 Jan 2010)
@@ -199,7 +199,7 @@
 template <class Transition>
 struct transition_event
 {
-    typedef typename Transition::Event type;
+    typedef typename Transition::transition_event type;
 };
 
 // returns true for composite states
@@ -294,7 +294,7 @@
     };
     typedef T1                  current_state_type;
     typedef T1                  next_state_type;
-    typedef dummy_event         Event;
+    typedef dummy_event         transition_event;
 };
 
 // metafunctions used to find out if a state is entry, exit or something else

Modified: sandbox/msm/boost/msm/back/state_machine.hpp
==============================================================================
--- sandbox/msm/boost/msm/back/state_machine.hpp	(original)
+++ sandbox/msm/boost/msm/back/state_machine.hpp	2010-01-05 18:09:44 EST (Tue, 05 Jan 2010)
@@ -285,7 +285,7 @@
         //typedef typename ROW::Source T1;
         typedef typename make_entry<typename ROW::Source,library_sm>::type T1;
         typedef typename make_exit<typename ROW::Target,library_sm>::type T2;
-        typedef typename ROW::Evt Event;
+        typedef typename ROW::Evt transition_event;
         // if the source has no automatic creation (i.e. is an exit pseudo state), then
         // current_state_type becomes the result of get_owner
         // meaning the containing SM from which the exit occurs
@@ -307,7 +307,7 @@
         >::type next_state_type;
 
         // if a guard condition is here, call it to check that the event is accepted
-        static bool check_guard(library_sm& fsm,Event const& evt)
+        static bool check_guard(library_sm& fsm,transition_event const& evt)
         {
             if ( ROW::guard_call(fsm,evt,
                                  ::boost::fusion::at_key<current_state_type>(fsm.m_substate_list),
@@ -316,7 +316,7 @@
             return false;
         }
         // Take the transition action and return the next state.
-        static HandledEnum execute(library_sm& fsm, int region_index, int state, Event const& evt)
+        static HandledEnum execute(library_sm& fsm, int region_index, int state, transition_event const& evt)
         {
 
             BOOST_STATIC_CONSTANT(int, current_state = (get_state_id<stt,current_state_type>::type::value));
@@ -360,7 +360,7 @@
         //typedef typename ROW::Source T1;
         typedef typename make_entry<typename ROW::Source,library_sm>::type T1;
         typedef typename make_exit<typename ROW::Target,library_sm>::type T2;
-        typedef typename ROW::Evt Event;
+        typedef typename ROW::Evt transition_event;
         // if the source has no automatic creation (i.e. is an exit pseudo state), then
         // current_state_type becomes the result of get_owner
         // meaning the containing SM from which the exit occurs
@@ -382,7 +382,7 @@
         >::type next_state_type;
 
         // if a guard condition is defined, call it to check that the event is accepted
-        static bool check_guard(library_sm& fsm,Event const& evt)
+        static bool check_guard(library_sm& fsm,transition_event const& evt)
         {
             if ( ROW::guard_call(fsm,evt,
                                  ::boost::fusion::at_key<current_state_type>(fsm.m_substate_list),
@@ -391,7 +391,7 @@
             return false;
         }
         // Take the transition action and return the next state.
-        static HandledEnum execute(library_sm& fsm, int region_index, int state, Event const& evt)
+        static HandledEnum execute(library_sm& fsm, int region_index, int state, transition_event const& evt)
         {
             BOOST_STATIC_CONSTANT(int, current_state = (get_state_id<stt,current_state_type>::type::value));
             BOOST_STATIC_CONSTANT(int, next_state = (get_state_id<stt,next_state_type>::type::value));
@@ -429,7 +429,7 @@
         //typedef typename ROW::Source T1;
         typedef typename make_entry<typename ROW::Source,library_sm>::type T1;
         typedef typename make_exit<typename ROW::Target,library_sm>::type T2;
-        typedef typename ROW::Evt Event;
+        typedef typename ROW::Evt transition_event;
         // if the source has no automatic creation (i.e. is an exit pseudo state), then
         // current_state_type becomes the result of get_owner
         // meaning the containing SM from which the exit occurs
@@ -451,7 +451,7 @@
         >::type next_state_type;
 
         // Take the transition action and return the next state.
-        static HandledEnum execute(library_sm& fsm, int region_index, int state, Event const& evt)
+        static HandledEnum execute(library_sm& fsm, int region_index, int state, transition_event const& evt)
         {
             BOOST_STATIC_CONSTANT(int, current_state = (get_state_id<stt,current_state_type>::type::value));
             BOOST_STATIC_CONSTANT(int, next_state = (get_state_id<stt,next_state_type>::type::value));
@@ -491,7 +491,7 @@
         //typedef typename ROW::Source T1;
         typedef typename make_entry<typename ROW::Source,library_sm>::type T1;
         typedef typename make_exit<typename ROW::Target,library_sm>::type T2;
-        typedef typename ROW::Evt Event;
+        typedef typename ROW::Evt transition_event;
         // if the source has no automatic creation (i.e. is an exit pseudo state), then
         // current_state_type becomes the result of get_owner
         // meaning the containing SM from which the exit occurs
@@ -513,7 +513,7 @@
         >::type next_state_type;
 
         // Take the transition action and return the next state.
-        static HandledEnum execute(library_sm& fsm, int region_index, int state, Event const& evt)
+        static HandledEnum execute(library_sm& fsm, int region_index, int state, transition_event const& evt)
         {
             BOOST_STATIC_CONSTANT(int, current_state = (get_state_id<stt,current_state_type>::type::value));
             BOOST_STATIC_CONSTANT(int, next_state = (get_state_id<stt,next_state_type>::type::value));
@@ -545,12 +545,12 @@
     {
         typedef typename ROW::Source T1;
         typedef typename ROW::Target T2;
-        typedef typename ROW::Evt Event;
+        typedef typename ROW::Evt transition_event;
         typedef T1 current_state_type;
         typedef T2 next_state_type;
 
         // if a guard condition is here, call it to check that the event is accepted
-        static bool check_guard(library_sm& fsm,Event const& evt)
+        static bool check_guard(library_sm& fsm,transition_event const& evt)
         {
             if ( ROW::guard_call(fsm,evt,
                                  ::boost::fusion::at_key<current_state_type>(fsm.m_substate_list),
@@ -559,7 +559,7 @@
             return false;
         }
         // Take the transition action and return the next state.
-        static HandledEnum execute(library_sm& fsm, int , int state, Event const& evt)
+        static HandledEnum execute(library_sm& fsm, int , int state, transition_event const& evt)
         {
 
             BOOST_STATIC_CONSTANT(int, current_state = (get_state_id<stt,current_state_type>::type::value));
@@ -587,12 +587,12 @@
     {
         typedef typename ROW::Source T1;
         typedef typename ROW::Target T2;
-        typedef typename ROW::Evt Event;
+        typedef typename ROW::Evt transition_event;
         typedef T1 current_state_type;
         typedef T2 next_state_type;
 
         // if a guard condition is defined, call it to check that the event is accepted
-        static bool check_guard(library_sm& fsm,Event const& evt)
+        static bool check_guard(library_sm& fsm,transition_event const& evt)
         {
             if ( ROW::guard_call(fsm,evt,
                                  ::boost::fusion::at_key<current_state_type>(fsm.m_substate_list),
@@ -601,7 +601,7 @@
             return false;
         }
         // Take the transition action and return the next state.
-        static HandledEnum execute(library_sm& fsm, int , int state, Event const& evt)
+        static HandledEnum execute(library_sm& fsm, int , int state, transition_event const& evt)
         {
             BOOST_STATIC_CONSTANT(int, current_state = (get_state_id<stt,current_state_type>::type::value));
             BOOST_STATIC_CONSTANT(int, next_state = (get_state_id<stt,next_state_type>::type::value));
@@ -623,12 +623,12 @@
     {
         typedef typename ROW::Source T1;
         typedef typename ROW::Target T2;
-        typedef typename ROW::Evt Event;
+        typedef typename ROW::Evt transition_event;
         typedef T1 current_state_type;
         typedef T2 next_state_type;
 
         // Take the transition action and return the next state.
-        static HandledEnum execute(library_sm& fsm, int region_index, int state, Event const& evt)
+        static HandledEnum execute(library_sm& fsm, int region_index, int state, transition_event const& evt)
         {
             BOOST_STATIC_CONSTANT(int, current_state = (get_state_id<stt,current_state_type>::type::value));
             BOOST_STATIC_CONSTANT(int, next_state = (get_state_id<stt,next_state_type>::type::value));
@@ -652,10 +652,10 @@
     {
         typedef T1                  current_state_type;
         typedef T1                  next_state_type;
-        typedef Evt                 Event;
+        typedef Evt                 transition_event;
 
         // Take the transition action and return the next state.
-        static HandledEnum execute(library_sm& fsm, int region_index, int , Event const& evt)
+        static HandledEnum execute(library_sm& fsm, int region_index, int , transition_event const& evt)
         {
              execute_return res = 
                 (::boost::fusion::at_key<current_state_type>(fsm.m_substate_list)).process_event(evt);