Extract the FSM before beginning to use it.

fsm.hpp

@@ -0,0 +1,16 @@
+#pragma once
+
+template<typename S, typename E>
+class DeadSimpleFSM {
+protected:
+  S _state = S::START;
+
+public:
+  virtual void event(E event) = 0;
+
+  void state(S next_state) {
+    _state = next_state;
+  }
+};
+
+#define FSM_T(S, F) case S: F(); break

fsmtest.cpp

@@ -1,22 +1,8 @@
 #include <fmt/core.h>
+#include "fsm.hpp"
 
 using namespace fmt;
 
-template<typename S, typename E>
-class DeadSimpleFSM {
-protected:
-  S _state = S::START;
-
-public:
-  virtual void event(E event) = 0;
-
-  void state(S next_state) {
-    _state = next_state;
-  }
-};
-
-#define T(S, F) case S: F(); break
-
 enum MyState {
   START, RUNNING, END
 };
@@ -29,9 +15,9 @@ class MyFSM : DeadSimpleFSM<MyState, MyEvent> {
 public:
   void event(MyEvent ev) override {
     switch(ev) {
-      T(STARTED, start);
+      FSM_T(STARTED, start);
-      T(PUSH, push);
+      FSM_T(PUSH, push);
-      T(QUIT, stop);
+      FSM_T(QUIT, quit);
     }
   }