Eliminate kInitialState variable

Provide a comfortable Start() function instead
dziegel · Jun 20, 2024 · f3a0854 · f3a0854
1 parent 7d59ac7
commit f3a0854
Show file tree

Hide file tree

Showing 10 changed files with 27 additions and 17 deletions.
diff --git a/generator/src/generator/Declaration.egl b/generator/src/generator/Declaration.egl
@@ -6,11 +6,15 @@
 class [%=statemachine.name%] final : public [%=statemachine.name%]Base
 {
 public:
-    static const StatePtr kInitialState;
 [%
   var regionTemplate : Template = TemplateFactory.load("DeclarationRegion.egl");
   regionTemplate.populate("region", statemachine.region);
   regionTemplate.populate("statemachine", statemachine);
 %]
     [%=regionTemplate.process()%]
+
+    void Start()
+    {
+        [%=statemachine.name%]Base::Start(&[%=statemachine.region.initial_variable_name%]);
+    }
 };
diff --git a/generator/src/generator/Instance.egl b/generator/src/generator/Instance.egl
@@ -18,6 +18,4 @@
   regionTemplate.populate("region", statemachine.region);
   regionTemplate.populate("statemachine", statemachine);
 %]
-// Initial state
-const [%=statemachine.name%]::StatePtr [%=statemachine.name%]::kInitialState = &[%=statemachine.name%]::[%=statemachine.region.initial_variable_name%];
 [%=regionTemplate.process()%]
diff --git a/test/ScXmlFsmImpl.cxx b/test/ScXmlFsmImpl.cxx
@@ -27,7 +27,7 @@ void ScXmlFsmImpl::Test()
     assert(fsm_.CurrentState() == nullptr);
 
     // Start FSM. Entry actions of initial states must be called.
-    fsm_.Start(ScXmlTest::kInitialState);
+    fsm_.Start();
     assert(fsm_.CurrentState() == &ScXmlTest::kState_1State_2);
     assert(state1_on_entry_called_);
     state1_on_entry_called_ = false;

diff --git a/test/XmiFsmImpl.cxx b/test/XmiFsmImpl.cxx
@@ -36,7 +36,7 @@ void XmiFsmImpl::Test()
     assert(fsm_.CurrentState() == nullptr);
 
     // Start FSM. Entry actions of initial states must be called.
-    fsm_.Start(XmiTest::kInitialState);
+    fsm_.Start();
     assert(fsm_.CurrentState() == &XmiTest::kState_1State_2);
     assert(state1_on_entry_called_);
     state1_on_entry_called_ = false;

diff --git a/test/generated/IScXmlTestImpl.hxx b/test/generated/IScXmlTestImpl.hxx
@@ -1,11 +1,13 @@
 // Statemachine ScXmlTest implementation interface
-// Generated: 26.01.24, 17:51
+// Generated: 20.06.24, 10:59
 
 #pragma once
 
 class IScXmlTestImpl
 {
 	public:
+	virtual ~IScXmlTestImpl() = default;
+
 	// Actions
 	virtual void State2InternalAction(ScXmlTestBase::Event event) = 0;
 	virtual void Transition3Action1(ScXmlTestBase::Event event) = 0;

diff --git a/test/generated/IXmiTestImpl.hxx b/test/generated/IXmiTestImpl.hxx
@@ -1,11 +1,13 @@
 // Statemachine XmiTest implementation interface
-// Generated: 26.01.24, 17:52
+// Generated: 20.06.24, 10:59
 
 #pragma once
 
 class IXmiTestImpl
 {
 	public:
+	virtual ~IXmiTestImpl() = default;
+
 	// Actions
 	virtual void ChoiceAction1(XmiTestBase::Event event) = 0;
 	virtual void ChoiceAction2(XmiTestBase::Event event) = 0;

diff --git a/test/generated/ScXmlTestDeclaration.hxx b/test/generated/ScXmlTestDeclaration.hxx
@@ -1,12 +1,11 @@
 // Statemachine ScXmlTest declaration
-// Generated: 26.01.24, 17:51
+// Generated: 20.06.24, 10:59
 
 #pragma once
 
 class ScXmlTest final : public ScXmlTestBase
 {
 	public:
-	static const StatePtr kInitialState;
 
 	// State State_1
 	static const State kState_1;
@@ -25,4 +24,9 @@ class ScXmlTest final : public ScXmlTestBase
 
 	// State State_1::State_4::State_6
 	static const State kState_1State_4State_6;
+
+	void Start()
+	{
+		ScXmlTestBase::Start(&kState_1);
+	}
 };
diff --git a/test/generated/ScXmlTestInstance.hxx b/test/generated/ScXmlTestInstance.hxx
@@ -1,5 +1,5 @@
 // Statemachine ScXmlTest instance
-// Generated: 26.01.24, 17:51
+// Generated: 20.06.24, 10:59
 
 #pragma once
 
@@ -13,8 +13,6 @@
 #define ScXmlTest_GET_STATIC_EVENT_ID(event_name) event_name::kId
 #endif
 
-// Initial state
-const ScXmlTest::StatePtr ScXmlTest::kInitialState = &ScXmlTest::kState_1;
 
 // State State_1
 static ScXmlTest::Transition State_1Handler(ScXmlTest::ImplPtr impl, ScXmlTest::Event event)

diff --git a/test/generated/XmiTestDeclaration.hxx b/test/generated/XmiTestDeclaration.hxx
@@ -1,12 +1,11 @@
 // Statemachine XmiTest declaration
-// Generated: 26.01.24, 17:52
+// Generated: 20.06.24, 10:59
 
 #pragma once
 
 class XmiTest final : public XmiTestBase
 {
 	public:
-	static const StatePtr kInitialState;
 
 	// State State_1
 	static const State kState_1;
@@ -25,4 +24,9 @@ class XmiTest final : public XmiTestBase
 
 	// State State_1::State_4::State_5
 	static const State kState_1State_4State_5;
+
+	void Start()
+	{
+		XmiTestBase::Start(&kState_1);
+	}
 };
diff --git a/test/generated/XmiTestInstance.hxx b/test/generated/XmiTestInstance.hxx
@@ -1,5 +1,5 @@
 // Statemachine XmiTest instance
-// Generated: 26.01.24, 17:52
+// Generated: 20.06.24, 10:59
 
 #pragma once
 
@@ -13,8 +13,6 @@
 #define XmiTest_GET_STATIC_EVENT_ID(event_name) event_name::kId
 #endif
 
-// Initial state
-const XmiTest::StatePtr XmiTest::kInitialState = &XmiTest::kState_1;
 
 // State State_1
 static XmiTest::Transition State_1Handler(XmiTest::ImplPtr impl, XmiTest::Event event)