Revert last changes in pimpl and plain examples

Author: dziegel

examples/pimpl/Fsm.cxx

@@ -2,29 +2,29 @@
 
 namespace example::pimpl
 {
-static Fsm::Transition State1Handler(Fsm::ImplPtr /* impl */, Fsm::Event event)
+Fsm::Transition Fsm::State1Handler(ImplPtr /* impl */, Event event)
 {
     switch (event)
     {
     case EEvent::kGo2:
-        return Fsm::TransitionTo(Fsm::kState2);
+        return TransitionTo(kState2);
     default:
-        return Fsm::NoTransition();
+        return NoTransition();
     }
 }
 
-static Fsm::Transition State2Handler(Fsm::ImplPtr impl, Fsm::Event event)
+Fsm::Transition Fsm::State2Handler(ImplPtr impl, Event event)
 {
     switch (event)
     {
     case EEvent::kGo1:
         if (impl->SomeGuardFunction(event))
         {
-            return Fsm::TransitionTo(Fsm::kState1, &Fsm::Impl::State2ToState1TransitionAction);
+            return TransitionTo(kState1, &Impl::State2ToState1TransitionAction);
         }
-        return Fsm::NoTransition();
+        return NoTransition();
     default:
-        return Fsm::UnhandledEvent();
+        return UnhandledEvent();
     }
 }
 

examples/pimpl/Fsm.hxx

@@ -11,6 +11,10 @@ public:
     static const State kState1;
     static const State kState2;
 
+    // Handlers
+    static Transition State1Handler(ImplPtr impl, Event event);
+    static Transition State2Handler(ImplPtr impl, Event event);
+
     inline void Start()
     {
         FsmBase::Start(&kState1);

examples/pimpl/FsmImpl.hxx

@@ -26,14 +26,18 @@ public:
 
     void Run();
 
+private:
+    struct Private;
+    std::unique_ptr<Private> private_;
+
+    // Give Fsm access to private entry/exit/transition actions
+    // (This is not needed if actions are public functions)
+    friend class Fsm;
+
     void State1Entry();
 
     void State2ToState1TransitionAction(FsmBase::Event event);
 
     bool SomeGuardFunction(FsmBase::Event event);
-
-private:
-    struct Private;
-    std::unique_ptr<Private> private_;
 };
 } // namespace example::pimpl

examples/plain/FsmImpl.cxx

@@ -49,29 +49,29 @@ bool FsmImpl::SomeGuardFunction(FsmBase::Event /*event*/)
 
 // FSM code
 
-static Fsm::Transition State1Handler(Fsm::ImplPtr /* impl */, Fsm::Event event)
+Fsm::Transition Fsm::State1Handler(ImplPtr /* impl */, Event event)
 {
     switch (event)
     {
     case EEvent::kGo2:
-        return Fsm::TransitionTo(Fsm::kState2);
+        return TransitionTo(kState2);
     default:
-        return Fsm::NoTransition();
+        return NoTransition();
     }
 }
 
-static Fsm::Transition State2Handler(Fsm::ImplPtr impl, Fsm::Event event)
+Fsm::Transition Fsm::State2Handler(ImplPtr impl, Event event)
 {
     switch (event)
     {
     case EEvent::kGo1:
         if (impl->SomeGuardFunction(event))
         {
-            return Fsm::TransitionTo(Fsm::kState1, &Fsm::Impl::State2ToState1TransitionAction);
+            return TransitionTo(kState1, &Impl::State2ToState1TransitionAction);
         }
-        return Fsm::NoTransition();
+        return NoTransition();
     default:
-        return Fsm::UnhandledEvent();
+        return UnhandledEvent();
     }
 }
 

examples/plain/FsmImpl.hxx

@@ -20,6 +20,10 @@ public:
     static const State kState1;
     static const State kState2;
 
+    // Handlers
+    static Transition State1Handler(ImplPtr impl, Event event);
+    static Transition State2Handler(ImplPtr impl, Event event);
+
     inline void Start()
     {
         FsmBase::Start(&kState1);
@@ -34,13 +38,17 @@ public:
 
     void Run();
 
+private:
+    Fsm fsm_;
+
+    // Give Fsm access to private entry/exit/transition actions
+    // (This is not needed if actions are public functions)
+    friend class Fsm;
+
     void State1Entry();
 
     void State2ToState1TransitionAction(FsmBase::Event event);
 
     bool SomeGuardFunction(FsmBase::Event event);
-
-private:
-    Fsm fsm_;
 };
 } // namespace example::plain