mirror of
https://github.com/nasa/fprime.git
synced 2025-12-10 17:47:10 -06:00
PRIVATE->private and PROTECTED->protected updates in FppTest/state_machine (nasa#3446) (#3687)
* PRIVATE->private and PROTECTED->protected updates in FppTest/state_machine/internal_instance/choice/ (nasa#3446) * PRIVATE->private and PROTECTED->protected updates in FppTest/state_machine/internal_instance/initial/ (nasa#3446) * PRIVATE->private and PROTECTED->protected updates in FppTest/state_machine/internal_instance/state/ (nasa#3446)
This commit is contained in:
parent
5a0acd1dc0
commit
f330d608e5
@ -52,7 +52,7 @@ class Basic : public BasicComponentBase {
|
||||
//! Destroy Basic object
|
||||
~Basic();
|
||||
|
||||
PRIVATE:
|
||||
private:
|
||||
// ----------------------------------------------------------------------
|
||||
// Handler implementations for typed input ports
|
||||
// ----------------------------------------------------------------------
|
||||
@ -62,7 +62,7 @@ class Basic : public BasicComponentBase {
|
||||
U32 context //!< The call order
|
||||
) override;
|
||||
|
||||
PRIVATE:
|
||||
private:
|
||||
// ----------------------------------------------------------------------
|
||||
// Implementations for internal state machine actions
|
||||
// ----------------------------------------------------------------------
|
||||
@ -97,7 +97,7 @@ class Basic : public BasicComponentBase {
|
||||
FppTest_SmChoice_Basic::Signal signal //!< The signal
|
||||
) override;
|
||||
|
||||
PRIVATE:
|
||||
private:
|
||||
// ----------------------------------------------------------------------
|
||||
// Implementations for internal state machine guards
|
||||
// ----------------------------------------------------------------------
|
||||
|
||||
@ -49,7 +49,7 @@ class BasicU32 : public BasicU32ComponentBase {
|
||||
//! Destroy BasicU32 object
|
||||
~BasicU32();
|
||||
|
||||
PRIVATE:
|
||||
private:
|
||||
// ----------------------------------------------------------------------
|
||||
// Implementations for internal state machine actions
|
||||
// ----------------------------------------------------------------------
|
||||
@ -69,7 +69,7 @@ class BasicU32 : public BasicU32ComponentBase {
|
||||
FppTest_SmChoice_BasicU32::Signal signal //!< The signal
|
||||
) override;
|
||||
|
||||
PRIVATE:
|
||||
private:
|
||||
// ----------------------------------------------------------------------
|
||||
// Implementations for internal state machine guards
|
||||
// ----------------------------------------------------------------------
|
||||
|
||||
@ -56,7 +56,7 @@ class ChoiceToChoice : public ChoiceToChoiceComponentBase {
|
||||
//! Destroy ChoiceToChoice object
|
||||
~ChoiceToChoice();
|
||||
|
||||
PRIVATE:
|
||||
private:
|
||||
// ----------------------------------------------------------------------
|
||||
// Implementations for internal state machine actions
|
||||
// ----------------------------------------------------------------------
|
||||
@ -82,7 +82,7 @@ class ChoiceToChoice : public ChoiceToChoiceComponentBase {
|
||||
FppTest_SmChoice_ChoiceToChoice::Signal signal //!< The signal
|
||||
) override;
|
||||
|
||||
PRIVATE:
|
||||
private:
|
||||
// ----------------------------------------------------------------------
|
||||
// Implementations for internal state machine guards
|
||||
// ----------------------------------------------------------------------
|
||||
@ -101,7 +101,7 @@ class ChoiceToChoice : public ChoiceToChoiceComponentBase {
|
||||
FppTest_SmChoice_ChoiceToChoice::Signal signal //!< The signal
|
||||
) const override;
|
||||
|
||||
PRIVATE:
|
||||
private:
|
||||
// ----------------------------------------------------------------------
|
||||
// Overflow hook implementations for internal state machines
|
||||
// ----------------------------------------------------------------------
|
||||
|
||||
@ -57,7 +57,7 @@ class ChoiceToState : public ChoiceToStateComponentBase {
|
||||
//! Destroy ChoiceToState object
|
||||
~ChoiceToState();
|
||||
|
||||
PRIVATE:
|
||||
private:
|
||||
// ----------------------------------------------------------------------
|
||||
// Implementations for internal state machine actions
|
||||
// ----------------------------------------------------------------------
|
||||
@ -90,7 +90,7 @@ class ChoiceToState : public ChoiceToStateComponentBase {
|
||||
FppTest_SmChoice_ChoiceToState::Signal signal //!< The signal
|
||||
) override;
|
||||
|
||||
PRIVATE:
|
||||
private:
|
||||
// ----------------------------------------------------------------------
|
||||
// Implementations for internal state machine guards
|
||||
// ----------------------------------------------------------------------
|
||||
|
||||
@ -49,7 +49,7 @@ class InputPairU16U32 : public InputPairU16U32ComponentBase {
|
||||
//! Destroy InputPairU16U32 object
|
||||
~InputPairU16U32();
|
||||
|
||||
PRIVATE:
|
||||
private:
|
||||
// ----------------------------------------------------------------------
|
||||
// Implementations for internal state machine actions
|
||||
// ----------------------------------------------------------------------
|
||||
@ -62,7 +62,7 @@ class InputPairU16U32 : public InputPairU16U32ComponentBase {
|
||||
U32 value //!< The value
|
||||
) override;
|
||||
|
||||
PRIVATE:
|
||||
private:
|
||||
// ----------------------------------------------------------------------
|
||||
// Implementations for internal state machine guards
|
||||
// ----------------------------------------------------------------------
|
||||
|
||||
@ -49,7 +49,7 @@ class Sequence : public SequenceComponentBase {
|
||||
//! Destroy Sequence object
|
||||
~Sequence();
|
||||
|
||||
PRIVATE:
|
||||
private:
|
||||
// ----------------------------------------------------------------------
|
||||
// Implementations for internal state machine actions
|
||||
// ----------------------------------------------------------------------
|
||||
@ -68,7 +68,7 @@ class Sequence : public SequenceComponentBase {
|
||||
FppTest_SmChoice_Sequence::Signal signal //!< The signal
|
||||
) override;
|
||||
|
||||
PRIVATE:
|
||||
private:
|
||||
// ----------------------------------------------------------------------
|
||||
// Implementations for internal state machine guards
|
||||
// ----------------------------------------------------------------------
|
||||
|
||||
@ -49,7 +49,7 @@ class SequenceU32 : public SequenceU32ComponentBase {
|
||||
//! Destroy SequenceU32 object
|
||||
~SequenceU32();
|
||||
|
||||
PRIVATE:
|
||||
private:
|
||||
// ----------------------------------------------------------------------
|
||||
// Implementations for internal state machine actions
|
||||
// ----------------------------------------------------------------------
|
||||
@ -69,7 +69,7 @@ class SequenceU32 : public SequenceU32ComponentBase {
|
||||
FppTest_SmChoice_SequenceU32::Signal signal //!< The signal
|
||||
) override;
|
||||
|
||||
PRIVATE:
|
||||
private:
|
||||
// ----------------------------------------------------------------------
|
||||
// Implementations for internal state machine guards
|
||||
// ----------------------------------------------------------------------
|
||||
|
||||
@ -52,7 +52,7 @@ class Basic : public BasicComponentBase {
|
||||
//! Destroy Basic object
|
||||
~Basic();
|
||||
|
||||
PRIVATE:
|
||||
private:
|
||||
// ----------------------------------------------------------------------
|
||||
// Handler implementations for typed input ports
|
||||
// ----------------------------------------------------------------------
|
||||
@ -62,7 +62,7 @@ class Basic : public BasicComponentBase {
|
||||
U32 context //!< The call order
|
||||
) override;
|
||||
|
||||
PRIVATE:
|
||||
private:
|
||||
// ----------------------------------------------------------------------
|
||||
// Implementations for internal state machine actions
|
||||
// ----------------------------------------------------------------------
|
||||
|
||||
@ -52,7 +52,7 @@ class Choice : public ChoiceComponentBase {
|
||||
//! Destroy Choice object
|
||||
~Choice();
|
||||
|
||||
PRIVATE:
|
||||
private:
|
||||
// ----------------------------------------------------------------------
|
||||
// Implementations for internal state machine actions
|
||||
// ----------------------------------------------------------------------
|
||||
@ -72,7 +72,7 @@ class Choice : public ChoiceComponentBase {
|
||||
FppTest_SmInstanceInitial_Choice_Choice::Signal signal //!< The signal
|
||||
) override;
|
||||
|
||||
PRIVATE:
|
||||
private:
|
||||
// ----------------------------------------------------------------------
|
||||
// Implementations for internal state machine guards
|
||||
// ----------------------------------------------------------------------
|
||||
|
||||
@ -52,7 +52,7 @@ class Nested : public NestedComponentBase {
|
||||
//! Destroy Nested object
|
||||
~Nested();
|
||||
|
||||
PRIVATE:
|
||||
private:
|
||||
// ----------------------------------------------------------------------
|
||||
// Implementations for internal state machine actions
|
||||
// ----------------------------------------------------------------------
|
||||
@ -72,7 +72,7 @@ class Nested : public NestedComponentBase {
|
||||
FppTest_SmInstanceInitial_Nested_Nested::Signal signal //!< The signal
|
||||
) override;
|
||||
|
||||
PRIVATE:
|
||||
private:
|
||||
// ----------------------------------------------------------------------
|
||||
// Overflow hook implementations for internal state machines
|
||||
// ----------------------------------------------------------------------
|
||||
|
||||
@ -52,7 +52,7 @@ class Basic : public BasicComponentBase {
|
||||
//! Destroy Basic object
|
||||
~Basic();
|
||||
|
||||
PRIVATE:
|
||||
private:
|
||||
// ----------------------------------------------------------------------
|
||||
// Handler implementations for typed input ports
|
||||
// ----------------------------------------------------------------------
|
||||
@ -62,7 +62,7 @@ class Basic : public BasicComponentBase {
|
||||
U32 context //!< The call order
|
||||
) override;
|
||||
|
||||
PRIVATE:
|
||||
private:
|
||||
// ----------------------------------------------------------------------
|
||||
// Implementations for internal state machine actions
|
||||
// ----------------------------------------------------------------------
|
||||
|
||||
@ -49,7 +49,7 @@ class BasicGuard : public BasicGuardComponentBase {
|
||||
//! Destroy BasicGuard object
|
||||
~BasicGuard();
|
||||
|
||||
PRIVATE:
|
||||
private:
|
||||
// ----------------------------------------------------------------------
|
||||
// Implementations for internal state machine actions
|
||||
// ----------------------------------------------------------------------
|
||||
@ -61,7 +61,7 @@ class BasicGuard : public BasicGuardComponentBase {
|
||||
FppTest_SmState_BasicGuard::Signal signal //!< The signal
|
||||
) override;
|
||||
|
||||
PRIVATE:
|
||||
private:
|
||||
// ----------------------------------------------------------------------
|
||||
// Implementations for internal state machine guards
|
||||
// ----------------------------------------------------------------------
|
||||
|
||||
@ -49,7 +49,7 @@ class BasicGuardString : public BasicGuardStringComponentBase {
|
||||
//! Destroy BasicGuardString object
|
||||
~BasicGuardString();
|
||||
|
||||
PRIVATE:
|
||||
private:
|
||||
// ----------------------------------------------------------------------
|
||||
// Implementations for internal state machine actions
|
||||
// ----------------------------------------------------------------------
|
||||
@ -62,7 +62,7 @@ class BasicGuardString : public BasicGuardStringComponentBase {
|
||||
const Fw::StringBase& value //!< The value
|
||||
) override;
|
||||
|
||||
PRIVATE:
|
||||
private:
|
||||
// ----------------------------------------------------------------------
|
||||
// Implementations for internal state machine guards
|
||||
// ----------------------------------------------------------------------
|
||||
|
||||
@ -49,7 +49,7 @@ class BasicGuardTestAbsType : public BasicGuardTestAbsTypeComponentBase {
|
||||
//! Destroy BasicGuardTestAbsType object
|
||||
~BasicGuardTestAbsType();
|
||||
|
||||
PRIVATE:
|
||||
private:
|
||||
// ----------------------------------------------------------------------
|
||||
// Implementations for internal state machine actions
|
||||
// ----------------------------------------------------------------------
|
||||
@ -63,7 +63,7 @@ class BasicGuardTestAbsType : public BasicGuardTestAbsTypeComponentBase {
|
||||
const SmHarness::TestAbsType& value //!< The value
|
||||
) override;
|
||||
|
||||
PRIVATE:
|
||||
private:
|
||||
// ----------------------------------------------------------------------
|
||||
// Implementations for internal state machine guards
|
||||
// ----------------------------------------------------------------------
|
||||
@ -77,7 +77,7 @@ class BasicGuardTestAbsType : public BasicGuardTestAbsTypeComponentBase {
|
||||
const SmHarness::TestAbsType& value //!< The value
|
||||
) const override;
|
||||
|
||||
PRIVATE:
|
||||
private:
|
||||
// ----------------------------------------------------------------------
|
||||
// Overflow hook implementations for internal state machines
|
||||
// ----------------------------------------------------------------------
|
||||
|
||||
@ -49,7 +49,7 @@ class BasicGuardTestArray : public BasicGuardTestArrayComponentBase {
|
||||
//! Destroy BasicGuardTestArray object
|
||||
~BasicGuardTestArray();
|
||||
|
||||
PRIVATE:
|
||||
private:
|
||||
// ----------------------------------------------------------------------
|
||||
// Implementations for internal state machine actions
|
||||
// ----------------------------------------------------------------------
|
||||
@ -63,7 +63,7 @@ class BasicGuardTestArray : public BasicGuardTestArrayComponentBase {
|
||||
const SmHarness::TestArray& value //!< The value
|
||||
) override;
|
||||
|
||||
PRIVATE:
|
||||
private:
|
||||
// ----------------------------------------------------------------------
|
||||
// Implementations for internal state machine guards
|
||||
// ----------------------------------------------------------------------
|
||||
|
||||
@ -49,7 +49,7 @@ class BasicGuardTestEnum : public BasicGuardTestEnumComponentBase {
|
||||
//! Destroy BasicGuardTestEnum object
|
||||
~BasicGuardTestEnum();
|
||||
|
||||
PRIVATE:
|
||||
private:
|
||||
// ----------------------------------------------------------------------
|
||||
// Implementations for internal state machine actions
|
||||
// ----------------------------------------------------------------------
|
||||
@ -62,7 +62,7 @@ class BasicGuardTestEnum : public BasicGuardTestEnumComponentBase {
|
||||
const SmHarness::TestEnum& value //!< The value
|
||||
) override;
|
||||
|
||||
PRIVATE:
|
||||
private:
|
||||
// ----------------------------------------------------------------------
|
||||
// Implementations for internal state machine guards
|
||||
// ----------------------------------------------------------------------
|
||||
|
||||
@ -49,7 +49,7 @@ class BasicGuardTestStruct : public BasicGuardTestStructComponentBase {
|
||||
//! Destroy BasicGuardTestStruct object
|
||||
~BasicGuardTestStruct();
|
||||
|
||||
PRIVATE:
|
||||
private:
|
||||
// ----------------------------------------------------------------------
|
||||
// Implementations for internal state machine actions
|
||||
// ----------------------------------------------------------------------
|
||||
@ -63,7 +63,7 @@ class BasicGuardTestStruct : public BasicGuardTestStructComponentBase {
|
||||
const SmHarness::TestStruct& value //!< The value
|
||||
) override;
|
||||
|
||||
PRIVATE:
|
||||
private:
|
||||
// ----------------------------------------------------------------------
|
||||
// Implementations for internal state machine guards
|
||||
// ----------------------------------------------------------------------
|
||||
|
||||
@ -49,7 +49,7 @@ class BasicGuardU32 : public BasicGuardU32ComponentBase {
|
||||
//! Destroy BasicGuardU32 object
|
||||
~BasicGuardU32();
|
||||
|
||||
PRIVATE:
|
||||
private:
|
||||
// ----------------------------------------------------------------------
|
||||
// Implementations for internal state machine actions
|
||||
// ----------------------------------------------------------------------
|
||||
@ -62,7 +62,7 @@ class BasicGuardU32 : public BasicGuardU32ComponentBase {
|
||||
U32 value //!< The value
|
||||
) override;
|
||||
|
||||
PRIVATE:
|
||||
private:
|
||||
// ----------------------------------------------------------------------
|
||||
// Implementations for internal state machine guards
|
||||
// ----------------------------------------------------------------------
|
||||
|
||||
@ -49,7 +49,7 @@ class BasicInternal : public BasicInternalComponentBase {
|
||||
//! Destroy BasicInternal object
|
||||
~BasicInternal();
|
||||
|
||||
PRIVATE:
|
||||
private:
|
||||
// ----------------------------------------------------------------------
|
||||
// Implementations for internal state machine actions
|
||||
// ----------------------------------------------------------------------
|
||||
|
||||
@ -49,7 +49,7 @@ class BasicSelf : public BasicSelfComponentBase {
|
||||
//! Destroy BasicSelf object
|
||||
~BasicSelf();
|
||||
|
||||
PRIVATE:
|
||||
private:
|
||||
// ----------------------------------------------------------------------
|
||||
// Implementations for internal state machine actions
|
||||
// ----------------------------------------------------------------------
|
||||
|
||||
@ -48,7 +48,7 @@ class BasicString : public BasicStringComponentBase {
|
||||
//! The type FppTest_SmState_BasicString
|
||||
using SmState_BasicString = FppTest_SmState_BasicString;
|
||||
|
||||
PRIVATE:
|
||||
private:
|
||||
// ----------------------------------------------------------------------
|
||||
// Implementations for internal state machine actions
|
||||
// ----------------------------------------------------------------------
|
||||
|
||||
@ -48,7 +48,7 @@ class BasicTestAbsType : public BasicTestAbsTypeComponentBase {
|
||||
//! The type FppTest_SmState_BasicTestAbsType
|
||||
using SmState_BasicTestAbsType = FppTest_SmState_BasicTestAbsType;
|
||||
|
||||
PRIVATE:
|
||||
private:
|
||||
// ----------------------------------------------------------------------
|
||||
// Implementations for internal state machine actions
|
||||
// ----------------------------------------------------------------------
|
||||
|
||||
@ -48,7 +48,7 @@ class BasicTestArray : public BasicTestArrayComponentBase {
|
||||
//! The type FppTest_SmState_BasicTestArray
|
||||
using SmState_BasicTestArray = FppTest_SmState_BasicTestArray;
|
||||
|
||||
PRIVATE:
|
||||
private:
|
||||
// ----------------------------------------------------------------------
|
||||
// Implementations for internal state machine actions
|
||||
// ----------------------------------------------------------------------
|
||||
|
||||
@ -48,7 +48,7 @@ class BasicTestEnum : public BasicTestEnumComponentBase {
|
||||
//! The type FppTest_SmState_BasicTestEnum
|
||||
using SmState_BasicTestEnum = FppTest_SmState_BasicTestEnum;
|
||||
|
||||
PRIVATE:
|
||||
private:
|
||||
// ----------------------------------------------------------------------
|
||||
// Implementations for internal state machine actions
|
||||
// ----------------------------------------------------------------------
|
||||
|
||||
@ -48,7 +48,7 @@ class BasicTestStruct : public BasicTestStructComponentBase {
|
||||
//! The type FppTest_SmState_BasicTestStruct
|
||||
using SmState_BasicTestStruct = FppTest_SmState_BasicTestStruct;
|
||||
|
||||
PRIVATE:
|
||||
private:
|
||||
// ----------------------------------------------------------------------
|
||||
// Implementations for internal state machine actions
|
||||
// ----------------------------------------------------------------------
|
||||
|
||||
@ -48,7 +48,7 @@ class BasicU32 : public BasicU32ComponentBase {
|
||||
//! The type FppTest_SmState_BasicU32
|
||||
using SmState_BasicU32 = FppTest_SmState_BasicU32;
|
||||
|
||||
PRIVATE:
|
||||
private:
|
||||
// ----------------------------------------------------------------------
|
||||
// Implementations for internal state machine actions
|
||||
// ----------------------------------------------------------------------
|
||||
|
||||
@ -48,7 +48,7 @@ class Internal : public InternalComponentBase {
|
||||
//! The type FppTest_SmState_Internal
|
||||
using SmState_Internal = FppTest_SmState_Internal;
|
||||
|
||||
PRIVATE:
|
||||
private:
|
||||
// ----------------------------------------------------------------------
|
||||
// Implementations for internal state machine actions
|
||||
// ----------------------------------------------------------------------
|
||||
|
||||
@ -51,7 +51,7 @@ class StateToChild : public StateToChildComponentBase {
|
||||
//! Action IDs
|
||||
enum class ActionId { EXIT_S2, EXIT_S3, A, ENTER_S2, ENTER_S3 };
|
||||
|
||||
PRIVATE:
|
||||
private:
|
||||
// ----------------------------------------------------------------------
|
||||
// Implementations for internal state machine actions
|
||||
// ----------------------------------------------------------------------
|
||||
|
||||
@ -51,7 +51,7 @@ class StateToChoice : public StateToChoiceComponentBase {
|
||||
//! Action IDs
|
||||
enum class ActionId { EXIT_S1, EXIT_S2, EXIT_S3, A, ENTER_S1, ENTER_S2, ENTER_S3, ENTER_S4 };
|
||||
|
||||
PRIVATE:
|
||||
private:
|
||||
// ----------------------------------------------------------------------
|
||||
// Implementations for internal state machine actions
|
||||
// ----------------------------------------------------------------------
|
||||
@ -112,7 +112,7 @@ class StateToChoice : public StateToChoiceComponentBase {
|
||||
FppTest_SmState_StateToChoice::Signal signal //!< The signal
|
||||
) override;
|
||||
|
||||
PRIVATE:
|
||||
private:
|
||||
// ----------------------------------------------------------------------
|
||||
// Implementations for internal state machine guards
|
||||
// ----------------------------------------------------------------------
|
||||
|
||||
@ -51,7 +51,7 @@ class StateToSelf : public StateToSelfComponentBase {
|
||||
//! Action IDs
|
||||
enum class ActionId { EXIT_S1, EXIT_S2, EXIT_S3, A, ENTER_S1, ENTER_S2, ENTER_S3 };
|
||||
|
||||
PRIVATE:
|
||||
private:
|
||||
// ----------------------------------------------------------------------
|
||||
// Implementations for internal state machine actions
|
||||
// ----------------------------------------------------------------------
|
||||
|
||||
@ -51,7 +51,7 @@ class StateToState : public StateToStateComponentBase {
|
||||
//! Action IDs
|
||||
enum class ActionId { EXIT_S1, EXIT_S2, EXIT_S3, A, ENTER_S1, ENTER_S2, ENTER_S3, ENTER_S4, ENTER_S5 };
|
||||
|
||||
PRIVATE:
|
||||
private:
|
||||
// ----------------------------------------------------------------------
|
||||
// Implementations for internal state machine actions
|
||||
// ----------------------------------------------------------------------
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user