1.1 --- a/sourcehook/test/testevents.h Sat Apr 30 18:45:41 2005 +0000
1.2 +++ b/sourcehook/test/testevents.h Sat Apr 30 19:09:51 2005 +0000
1.3 @@ -1,67 +1,70 @@
1.4 #ifndef __TESTEVENTS_H__
1.5 #define __TESTEVENTS_H__
1.6
1.7 -struct State
1.8 +namespace
1.9 {
1.10 - virtual ~State()
1.11 - {
1.12
1.13 - }
1.14 -
1.15 - virtual bool IsEqual(State *other)
1.16 + struct State
1.17 {
1.18 - return (typeid(other) == typeid(this)) ? true : false;
1.19 - }
1.20 -};
1.21 + virtual ~State()
1.22 + {
1.23 +
1.24 + }
1.25
1.26 -typedef std::list<State*> StateList;
1.27 -StateList g_States;
1.28 + virtual bool IsEqual(State *other)
1.29 + {
1.30 + return (typeid(other) == typeid(this)) ? true : false;
1.31 + }
1.32 + };
1.33
1.34 -#define ADD_STATE(name) g_States.push_back(new name)
1.35 + typedef std::list<State*> StateList;
1.36 +
1.37 + #define ADD_STATE(name) g_States.push_back(new name)
1.38
1.39
1.40 -bool StatesOk(StateList *sl, ...)
1.41 -{
1.42 - StateList requiredstates;
1.43 - va_list argptr;
1.44 - va_start(argptr, sl);
1.45 - while (true)
1.46 + bool StatesOk(StateList *sl, ...)
1.47 {
1.48 - State *cs = va_arg(argptr, State*);
1.49 - if (!cs)
1.50 - break;
1.51 - requiredstates.push_back(cs);
1.52 - }
1.53 - va_end(argptr);
1.54 + StateList requiredstates;
1.55 + va_list argptr;
1.56 + va_start(argptr, sl);
1.57 + while (true)
1.58 + {
1.59 + State *cs = va_arg(argptr, State*);
1.60 + if (!cs)
1.61 + break;
1.62 + requiredstates.push_back(cs);
1.63 + }
1.64 + va_end(argptr);
1.65
1.66 - if (requiredstates.size() != sl->size())
1.67 - {
1.68 + if (requiredstates.size() != sl->size())
1.69 + {
1.70 + for (StateList::iterator iter = requiredstates.begin(); iter != requiredstates.end(); ++iter)
1.71 + delete *iter;
1.72 + for (StateList::iterator iter = sl->begin(); iter != sl->end(); ++iter)
1.73 + delete *iter;
1.74 + sl->clear();
1.75 + return false;
1.76 + }
1.77 +
1.78 + bool ok = true;
1.79 + StateList::iterator req_iter = requiredstates.begin();
1.80 + for (StateList::iterator o_iter = sl->begin(); o_iter != sl->end(); ++o_iter, ++req_iter)
1.81 + {
1.82 + if (!(*o_iter)->IsEqual(*req_iter))
1.83 + {
1.84 + ok = false;
1.85 + break;
1.86 + }
1.87 + }
1.88 +
1.89 for (StateList::iterator iter = requiredstates.begin(); iter != requiredstates.end(); ++iter)
1.90 delete *iter;
1.91 for (StateList::iterator iter = sl->begin(); iter != sl->end(); ++iter)
1.92 delete *iter;
1.93 sl->clear();
1.94 - return false;
1.95 +
1.96 + return ok;
1.97 }
1.98 -
1.99 - bool ok = true;
1.100 - StateList::iterator req_iter = requiredstates.begin();
1.101 - for (StateList::iterator o_iter = sl->begin(); o_iter != sl->end(); ++o_iter, ++req_iter)
1.102 - {
1.103 - if (!(*o_iter)->IsEqual(*req_iter))
1.104 - {
1.105 - ok = false;
1.106 - break;
1.107 - }
1.108 - }
1.109 -
1.110 - for (StateList::iterator iter = requiredstates.begin(); iter != requiredstates.end(); ++iter)
1.111 - delete *iter;
1.112 - for (StateList::iterator iter = sl->begin(); iter != sl->end(); ++iter)
1.113 - delete *iter;
1.114 - sl->clear();
1.115 -
1.116 - return ok;
1.117 }
1.118
1.119 #define CHECK_STATES(mwah, myerr) if (!StatesOk mwah) { error=myerr; return false; }