- AState and AStateMachine have template stateId

- AStateMachine has linked list for states
- AStateMachine::reset() resets to first added state


git-svn-id: http://moon:8086/svn/software/trunk/projects/FsmEval@134 b431acfa-c32f-4a4a-93f1-934dc6c82436

AStateMachine.hpp

@@ -11,12 +11,14 @@
 #include "IStateMachine.hpp"
 #include "AState.hpp"
 
+template <class IdType>
 class AStateMachine : public IStateMachine
 {
 public:
 
-	AStateMachine(StateId stateInit)
-	: m_stateCurr(stateInit)
+	AStateMachine()
+	: m_firstState(0)
+	, m_currState(0)
 	{
 	}
 	
@@ -24,26 +26,91 @@ public:
 	{
 	}
 	
-	void add(StateId stateId, AState *pState)
+	AState<IdType>* currState()
 	{
+		if (!m_currState)
+		{
+			reset();
+		}
+		return m_currState;
+	}
+	
+	virtual void reset()
+	{
+		setState(m_firstState->id());
+	}
+	
+	void add(AState<IdType> *pState)
+	{
+		if (!pState)
+		{
+			return;
+		}
+
+		if (findById(pState->id()))
+		{
+			return;
+		}
+		
+		if (!m_firstState)
+		{
+			m_firstState = pState;
+//			m_currState = pState;
+		}
+		else
+		{
+			AState<IdType> *pStateCurr = m_firstState;
+			while(pStateCurr->m_pNext)
+			{
+				pStateCurr = pStateCurr->m_pNext;
+			}
+			pStateCurr->m_pNext = pState;
+		}
 		pState->registerStateMachine(this);
-		m_states[stateId] = pState;
 	}
 	
 	void setState(StateId stateId)
 	{
-		bool isTransition = (m_stateCurr != stateId);
+		AState<IdType> *pStateNext = findById(stateId);
+
+		if (!pStateNext)
+		{
+			return;
+		}
 		
-		m_stateCurr = stateId;
+		bool isTransition = (m_currState != pStateNext);
+
+		m_currState = pStateNext;
+
 		if (isTransition)
 		{
-			m_states[m_stateCurr]->onTransition();
+			m_currState->onTransition();
 		}
 	}
 	
-protected:
-	StateId m_stateCurr;
-	AState *m_states[NUM_STATES];
+private:
+	AState<IdType> *m_firstState;
+	AState<IdType> *m_currState;
+
+	AState<IdType>* findById(StateId stateId)
+	{
+		AState<IdType> *pStateNext = m_firstState;
+
+		if (pStateNext)
+		{
+			while(pStateNext->id() != stateId)
+			{
+				pStateNext = pStateNext->m_pNext;
+				if (!pStateNext)
+				{
+					break;
+				}
+			}
+		}
+		return pStateNext;
+	}
+	
+		
 	
 };