gv_fsm 0.4.1 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 73902a6a767d8a5642f9f611cd7d6d73e5edfa34d17181b95a17c94ac45dfeed
-  data.tar.gz: 7729bd9ef72ebe5ec2cdd8734d3aa9a42114932418ca9189b176af90012803c6
+  metadata.gz: 6e2b60dc6b9b04ce5e69c1737103af124f756c56324a9c92193b35223acacf9e
+  data.tar.gz: 55ba355493f4e6ffe0ed6ea9a48174b1a478a024b6d07c6b3b4d4dafc9d4ebc3
 SHA512:
-  metadata.gz: 044106cb2470f4189a44ff8b3988119d3c65a25417a380a10bd115dab85738655429b3f90cd0bbaa40353a2de9cdbbee6cbe549d2cdf9554e0555af7b132d9e3
-  data.tar.gz: 359bbefb9df9567a012660b23ed6c04c323be54f2c411198e00c85833adb4a682099c2aea9386d5b4114ec6e9cedde5eb08246fc3b4d386d6838f4e33074990d
+  metadata.gz: 871eaa5cf354c80f516d31878efb9bea108ee55b76a04f3b4715bdc317e2eb8cb9b1005646248f9cff7838cb168aac7d120b8d3388d4be3cbf6ddf237426a0e0
+  data.tar.gz: 39e534fe925ac412a12b88c02e29bbfb106e3460509a7a4a1bbc077f7a6074e7b35f1071fb10151e8e96a1d08706b729919978efc025ee7361d7f6a3b5fd7d87

data/lib/templates.rb

@@ -442,7 +442,11 @@ public:
     if (_states.find(state) == _states.end()) {
       throw std::runtime_error("State not found: "s + state_names[state]);
     }
-    return _states[state](*_data);
+    state_t next = _states[state](*_data);
+    if (next == NO_CHANGE) {
+      next = state;
+    }
+    return next;
   }
 
   void operator()(<%= @prefix %>state_t from, <%= @prefix %>state_t to) {
@@ -453,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 -%>
@@ -471,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.1"
+  VERSION = "0.4.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gv_fsm
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.3
 platform: ruby
 authors:
 - Paolo Bosetti
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-10-10 00:00:00.000000000 Z
+date: 2025-01-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-graphviz