gv_fsm 0.4.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 36de89f3e2479b1f535f199601a58af93d53065aaff940143330244597e88a3d
-  data.tar.gz: 58c148315536416ffb99555fb6e3a88253a2f83a6776a17691b5c39019aee4cb
+  metadata.gz: 6e2b60dc6b9b04ce5e69c1737103af124f756c56324a9c92193b35223acacf9e
+  data.tar.gz: 55ba355493f4e6ffe0ed6ea9a48174b1a478a024b6d07c6b3b4d4dafc9d4ebc3
 SHA512:
-  metadata.gz: 514f56b578dc4093df80b45ed139a4f129e55a2441a2abb2b93f1dff3997782e0cb78e4df07720b06703a277f6df4a84374ded23d37b4ff55318411d393b87a3
-  data.tar.gz: 429480975d005883b23862eec8c2f834e835dc7f6de2d404c980fe31a30947e3232fc45decde91e2eafd44a0a5cb5d7310c3382551090c77d9929156e16cbff3
+  metadata.gz: 871eaa5cf354c80f516d31878efb9bea108ee55b76a04f3b4715bdc317e2eb8cb9b1005646248f9cff7838cb168aac7d120b8d3388d4be3cbf6ddf237426a0e0
+  data.tar.gz: 39e534fe925ac412a12b88c02e29bbfb106e3460509a7a4a1bbc077f7a6074e7b35f1071fb10151e8e96a1d08706b729919978efc025ee7361d7f6a3b5fd7d87

data/lib/templates.rb

@@ -457,12 +457,26 @@ public:
     }
   }
 
-  // Run the FSM from a given state
-  void run(<%= @prefix %>state_t state, operation_fun operation = nullptr) {
+
+  // Setup initial state links
+  void setup(state_t state) {
     <%= ns %>::<%= self.sigint %>_requested = false;
-    <%= @prefix %>state_t prev_state = state;
     _state.first = state;
     _state.second = state;
+  }
+
+  // Evaluate the current state and update the next state
+  // to be used when main loop is customized (i.e., not using FSM::run())
+  state_t eval_state() {
+      (*this)(_state.first, _state.second);
+      _state.first = _state.second;
+      _state.second = (*this)(_state.second);
+      return _state.second;
+  }
+
+  // Run the FSM from a given state
+  void run(<%= @prefix %>state_t state, operation_fun operation = nullptr) {
+    setup(state);
 <% if sigint then -%>
     std::signal(SIGINT, [](int signum) {
 <% if log == :syslog then -%>
@@ -475,9 +489,7 @@ public:
       if (operation) {
         operation(*_data);
       }
-      (*this)(_state.first, _state.second);
-      _state.first = _state.second;
-      _state.second = (*this)(_state.second);
+      eval_state();
       if (_timing_func) {
         _timing_func();
       }

data/lib/version.rb

@@ -1,3 +1,3 @@
 module GV_FSM
-  VERSION = "0.4.2"
+  VERSION = "0.4.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gv_fsm
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors:
 - Paolo Bosetti