Beautify "no transition" code

dziegel · Aug 23, 2024 · 52909bc · 52909bc
1 parent 5355887
commit 52909bc
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 7 deletions.
diff --git a/generator/src/generator/InstanceHandlerTransition.egl b/generator/src/generator/InstanceHandlerTransition.egl
@@ -1,8 +1,10 @@
 [%
   var actions = "";
+  var actions_with_comma = "";
   if (transition.actions_list != null) {
     statemachine.unique_id = statemachine.unique_id + 1;
-    actions = ", kActions" + statemachine.unique_id;
+    actions = "kActions" + statemachine.unique_id;
+    actions_with_comma = ", " + actions;
 %]
 static const auto kActions[%=statemachine.unique_id%] = std::to_array<[%=statemachine.name%]::[%=statemachine.transition_action_type%]>({[%=transition.actions_list%]});
 [%
@@ -11,12 +13,12 @@ static const auto kActions[%=statemachine.unique_id%] = std::to_array<[%=statema
 [%
   if (transition.internal) {
 %]
-return [%=statemachine.name%]::TransitionTo([%=statemachine.name%]::kNone[%=actions%]);
+return [%=statemachine.name%]::NoTransition([%=actions%]);
 [%     
   }
   if (transition.target_variable_name != null) {
 %]
-return [%=statemachine.name%]::TransitionTo([%=statemachine.name%]::[%=transition.target_variable_name%][%=actions%]);
+return [%=statemachine.name%]::TransitionTo([%=statemachine.name%]::[%=transition.target_variable_name%][%=actions_with_comma%]);
 [%     
  }
 

diff --git a/test/generated/IXmiTestImpl.hxx b/test/generated/IXmiTestImpl.hxx
@@ -1,5 +1,5 @@
 // Statemachine XmiTest implementation interface
-// Generated: 22.08.24, 09:32
+// Generated: 23.08.24, 06:47
 
 #pragma once
 

diff --git a/test/generated/XmiTestDeclaration.hxx b/test/generated/XmiTestDeclaration.hxx
@@ -1,5 +1,5 @@
 // Statemachine XmiTest declaration
-// Generated: 22.08.24, 09:32
+// Generated: 23.08.24, 06:47
 
 #pragma once
 

diff --git a/test/generated/XmiTestInstance.hxx b/test/generated/XmiTestInstance.hxx
@@ -1,5 +1,5 @@
 // Statemachine XmiTest instance
-// Generated: 22.08.24, 09:32
+// Generated: 23.08.24, 06:47
 
 #pragma once
 
@@ -51,7 +51,7 @@ static XmiTest::Transition State_1State_2Handler(XmiTest::ImplPtr impl, XmiTest:
 	{
 		case XmiTest_GET_STATIC_EVENT_ID(Internal):
 		static const auto kActions1 = std::to_array<XmiTest::Transition::ActionType>({&XmiTest::Impl::State2InternalAction});
-		return XmiTest::TransitionTo(XmiTest::kNone, kActions1);
+		return XmiTest::NoTransition(kActions1);
 		break;
 
 		case XmiTest_GET_STATIC_EVENT_ID(Transition_3):