From d651f891b16ec630813c2f91fd4682de22973162 Mon Sep 17 00:00:00 2001
From: revsic <revsic99@gmail.com>
Date: Sat, 6 Apr 2019 01:30:41 +0900
Subject: [PATCH] temporal commit

---
 obfuscator.hpp          | 32 ++++++++++++++++++++++----------
 obfuscator/obfs/fsm.hpp | 32 ++++++++++++++++++++++----------
 2 files changed, 44 insertions(+), 20 deletions(-)

diff --git a/obfuscator.hpp b/obfuscator.hpp
index b0fd998..932aa90 100644
--- a/obfuscator.hpp
+++ b/obfuscator.hpp
@@ -136,19 +136,25 @@ namespace obfs {
         using next = typename Machine::template next<Event>;
         using next_s = typename Machine::template next_s<Event>;
 
-        constexpr static void run() {
-            if (next::action()) {
-                return;
+        constexpr static auto run() {
+            if (std::is_same_v<next, None> || next::action()) {
+                return Machine{};
             }
-            MachineExecutor<next_s, Others...>::run();
+            return MachineExecutor<next_s, Others...>::run();
         }
     };
 
     template <typename Machine, typename Event>
     struct MachineExecutor<Machine, Event> {
         using next = typename Machine::template next<Event>;
-        constexpr static void run() {
+        using next_s = typename Machine::template next_s<Event>;
+
+        constexpr static auto run() {
+            if (std::is_same_v<next, None>) {
+                return Machine{};
+            }
             next::action();
+            return next_s{};
         }
     };
 
@@ -158,18 +164,24 @@ namespace obfs {
         using find = std::conditional_t<
             std::is_same_v<typename ST::state, State>, ST, Pass>;
 
-        using stage = typename First<Pass, find<Specs>...>::type;
+        using stage = typename First<None, find<Specs>...>::type;
 
         template <typename Event>
-        using next = typename stage::template next<Event>;
+        using next = std::conditional_t<
+            std::is_same_v<stage, None>,
+            None,
+            typename stage::template next<Event>>;
 
         template <typename Event>
-        using next_s = StateMachine<typename next<Event>::state, Specs...>;
+        using next_s = std::conditional_t<
+            std::is_same_v<next<Event>, None>,
+            None,
+            StateMachine<typename next<Event>::state, Specs...>>;
 
         template <typename... Events>
-        constexpr static void run() {
+        constexpr static auto run() {
             using self = StateMachine<State, Specs...>;
-            MachineExecutor<self, Events...>::run();
+            return MachineExecutor<self, Events...>::run();
         }
     };
 }
diff --git a/obfuscator/obfs/fsm.hpp b/obfuscator/obfs/fsm.hpp
index d7be67b..e0a87ae 100644
--- a/obfuscator/obfs/fsm.hpp
+++ b/obfuscator/obfs/fsm.hpp
@@ -55,19 +55,25 @@ namespace obfs {
         using next = typename Machine::template next<Event>;
         using next_s = typename Machine::template next_s<Event>;
 
-        constexpr static void run() {
-            if (next::action()) {
-                return;
+        constexpr static auto run() {
+            if (std::is_same_v<next, None> || next::action()) {
+                return Machine{};
             }
-            MachineExecutor<next_s, Others...>::run();
+            return MachineExecutor<next_s, Others...>::run();
         }
     };
 
     template <typename Machine, typename Event>
     struct MachineExecutor<Machine, Event> {
         using next = typename Machine::template next<Event>;
-        constexpr static void run() {
+        using next_s = typename Machine::template next_s<Event>;
+
+        constexpr static auto run() {
+            if (std::is_same_v<next, None>) {
+                return Machine{};
+            }
             next::action();
+            return next_s{};
         }
     };
 
@@ -77,18 +83,24 @@ namespace obfs {
         using find = std::conditional_t<
             std::is_same_v<typename ST::state, State>, ST, Pass>;
 
-        using stage = typename First<Pass, find<Specs>...>::type;
+        using stage = typename First<None, find<Specs>...>::type;
 
         template <typename Event>
-        using next = typename stage::template next<Event>;
+        using next = std::conditional_t<
+            std::is_same_v<stage, None>,
+            None,
+            typename stage::template next<Event>>;
 
         template <typename Event>
-        using next_s = StateMachine<typename next<Event>::state, Specs...>;
+        using next_s = std::conditional_t<
+            std::is_same_v<next<Event>, None>,
+            None,
+            StateMachine<typename next<Event>::state, Specs...>>;
 
         template <typename... Events>
-        constexpr static void run() {
+        constexpr static auto run() {
             using self = StateMachine<State, Specs...>;
-            MachineExecutor<self, Events...>::run();
+            return MachineExecutor<self, Events...>::run();
         }
     };
 }