2.9.0

`FSM::Instance::Structure` has entries for every (even headless) state

Author: andrew-gresyk

development/hfsm2/detail/features/structure_report.hpp

@@ -5,9 +5,18 @@ namespace hfsm2 {
 //------------------------------------------------------------------------------
 
 struct StructureEntry final {
+	HFSM2_CONSTEXPR(11)
+	StructureEntry(const bool isActive_ = false,
+				   const wchar_t* const prefix_ = nullptr,
+				   const char   * const name_   = nullptr)				noexcept
+		: isActive{isActive_}
+		, prefix  {prefix_  }
+		, name    {name_    }
+	{}
+
 	bool isActive;
 	const wchar_t* prefix;
-	const char* name;
+	const char   * name;
 };
 
 namespace detail {

development/hfsm2/detail/root_0.hpp

@@ -66,10 +66,6 @@ class R_ {
 	using ReadStream			= typename Args::ReadStream;
 #endif
 
-#if HFSM2_STRUCTURE_REPORT_AVAILABLE()
-	static constexpr Long NAME_COUNT = Apex::NAME_COUNT;
-#endif
-
 public:
 	using Info					= WrapInfo<TApex>;
 
@@ -561,11 +557,11 @@ class R_ {
 
 	/// @brief Array of 'StructureEntry' representing FSM structure
 	/// @see HFSM2_ENABLE_STRUCTURE_REPORT
-	using Structure				= DynamicArrayT<StructureEntry, NAME_COUNT>;
+	using Structure				= StaticArrayT<StructureEntry, STATE_COUNT>;
 
 	/// @brief Array of 'int8_t' representing FSM activation history (negative - 'update()' cycles since deactivated, positive - 'update()' cycles since activated)
 	/// @see `HFSM2_ENABLE_STRUCTURE_REPORT`
-	using ActivityHistory		= DynamicArrayT<int8_t,		 NAME_COUNT>;
+	using ActivityHistory		= StaticArrayT<int8_t,         STATE_COUNT>;
 
 	/// @brief Get the array of `StructureEntry` representing FSM structure
 	/// @return FSM structure
@@ -677,7 +673,6 @@ class R_ {
 	HFSM2_CONSTEXPR(14)	void udpateActivity()													noexcept;
 
 	Prefixes _prefixes;
-	NamedStates _namedStates;
 
 	Structure _structure;
 	ActivityHistory _activityHistory;

development/hfsm2/detail/root_0.inl

@@ -767,9 +767,6 @@ R_<TG_, TA_>::getStateNames() noexcept {
 		const StructureStateInfo& stateInfo = stateInfos[s];
 		Prefix& prefix = _prefixes[s];
 
-		if (stateInfo.name[0] != '\0')
-			_namedStates.set(s);
-
 		if (margin > stateInfo.depth && stateInfo.name[0] != '\0')
 			margin = stateInfo.depth;
 
@@ -805,16 +802,17 @@ R_<TG_, TA_>::getStateNames() noexcept {
 	if (margin > 0)
 		margin -= 1;
 
-	_structure.clear();
 	for (Long s = 0; s < stateInfos.count(); ++s) {
 		const StructureStateInfo& stateInfo = stateInfos[s];
 		Prefix& prefix = _prefixes[s];
 		const Long space = stateInfo.depth * 2;
 
 		if (stateInfo.name[0] != L'\0') {
-			_structure.emplace(StructureEntry{false, &prefix[margin * 2], stateInfo.name});
-			_activityHistory.emplace(static_cast<int8_t>(0));
-		} else if (s + 1 < stateInfos.count()) {
+			_structure[s] = StructureEntry{false, &prefix[margin * 2], stateInfo.name};
+			_activityHistory[s] = static_cast<int8_t>(0);
+		}
+		else
+		if (s + 1 < stateInfos.count()) {
 			Prefix& nextPrefix = _prefixes[s + 1];
 
 			if (s > 0)
@@ -841,26 +839,25 @@ template <typename TG_, typename TA_>
 HFSM2_CONSTEXPR(14)
 void
 R_<TG_, TA_>::udpateActivity() noexcept {
-	for (Long s = 0, i = 0; s < STATE_COUNT; ++s)
-		if (_namedStates.get(s)) {
-			_structure[i].isActive = isActive(s);
-
-			typename ActivityHistory::Item& activity = _activityHistory[i];
-
-			if (_structure[i].isActive) {
-				if (activity < 0)
-					activity = +1;
-				else
-					activity = activity < INT8_MAX ? activity + 1 : activity;
-			} else {
-				if (activity > 0)
-					activity = -1;
-				else
-					activity = activity > INT8_MIN ? activity - 1 : activity;
-			}
-
-			++i;
+	for (Long s = 0, i = 0; s < STATE_COUNT; ++s) {
+		_structure[i].isActive = isActive(s);
+
+		typename ActivityHistory::Item& activity = _activityHistory[i];
+
+		if (_structure[i].isActive) {
+			if (activity < 0)
+				activity = +1;
+			else
+				activity = activity < INT8_MAX ? activity + 1 : activity;
+		} else {
+			if (activity > 0)
+				activity = -1;
+			else
+				activity = activity > INT8_MIN ? activity - 1 : activity;
 		}
+
+		++i;
+	}
 }
 
 #endif

development/hfsm2/detail/structure/composite.hpp

@@ -292,8 +292,6 @@ struct HFSM2_EMPTY_BASES C_
 #if HFSM2_STRUCTURE_REPORT_AVAILABLE()
 	using StructureStateInfos = typename Args::StructureStateInfos;
 
-	static constexpr Long NAME_COUNT = HeadState::NAME_COUNT + SubStates::NAME_COUNT;
-
 	HFSM2_CONSTEXPR(14)	void deepGetNames(const Long parent,
 										  const RegionType region,
 										  const Short depth,

development/hfsm2/detail/structure/composite_sub_1.hpp

@@ -181,8 +181,6 @@ struct HFSM2_EMPTY_BASES CS_<
 #if HFSM2_STRUCTURE_REPORT_AVAILABLE()
 	using StructureStateInfos = typename Args::StructureStateInfos;
 
-	static constexpr Long NAME_COUNT = LHalf::NAME_COUNT + RHalf::NAME_COUNT;
-
 	HFSM2_CONSTEXPR(14)	void wideGetNames(const Long parent,
 										  const RegionType region,
 										  const Short depth,

development/hfsm2/detail/structure/composite_sub_2.hpp

@@ -153,8 +153,6 @@ struct HFSM2_EMPTY_BASES CS_<
 #if HFSM2_STRUCTURE_REPORT_AVAILABLE()
 	using StructureStateInfos = typename Args::StructureStateInfos;
 
-	static constexpr Long NAME_COUNT = Single::NAME_COUNT;
-
 	HFSM2_CONSTEXPR(14)	void wideGetNames(const Long parent,
 										  const RegionType region,
 										  const Short depth,

development/hfsm2/detail/structure/orthogonal.hpp

@@ -190,8 +190,6 @@ struct HFSM2_EMPTY_BASES O_
 #if HFSM2_STRUCTURE_REPORT_AVAILABLE()
 	using StructureStateInfos = typename Args::StructureStateInfos;
 
-	static constexpr Long NAME_COUNT	 = HeadState::NAME_COUNT  + SubStates::NAME_COUNT;
-
 	HFSM2_CONSTEXPR(14)	void deepGetNames(const Long parent,
 										  const RegionType region,
 										  const Short depth,

development/hfsm2/detail/structure/orthogonal_sub_1.hpp

@@ -170,8 +170,6 @@ struct HFSM2_EMPTY_BASES OS_<
 #if HFSM2_STRUCTURE_REPORT_AVAILABLE()
 	using StructureStateInfos = typename Args::StructureStateInfos;
 
-	static constexpr Long NAME_COUNT	 = Initial::NAME_COUNT  + Remaining::NAME_COUNT;
-
 	HFSM2_CONSTEXPR(14)	void wideGetNames(const Long parent,
 										  const Short depth,
 										  StructureStateInfos& stateInfos)	  const noexcept;

development/hfsm2/detail/structure/orthogonal_sub_2.hpp

@@ -138,8 +138,6 @@ struct HFSM2_EMPTY_BASES OS_<
 #if HFSM2_STRUCTURE_REPORT_AVAILABLE()
 	using StructureStateInfos = typename Args::StructureStateInfos;
 
-	static constexpr Long NAME_COUNT	 = Initial::NAME_COUNT;
-
 	HFSM2_CONSTEXPR(14)	void wideGetNames(const Long parent,
 										  const Short depth,
 										  StructureStateInfos& stateInfos)							  const noexcept;

development/hfsm2/detail/structure/state_1.hpp

@@ -157,8 +157,6 @@ struct HFSM2_EMPTY_BASES S_
 
 	HFSM2_IF_TYPEINDEX(const std::type_index TYPE = typeid(Head));
 
-	static constexpr Long NAME_COUNT = 1;
-
 #endif
 
 #if HFSM2_LOG_INTERFACE_AVAILABLE()