Skip to content

Commit 18b7bfd

Browse files
schlangsterschlangster
committed
Cleanup.
1 parent ca9f730 commit 18b7bfd

17 files changed

Lines changed: 162 additions & 197 deletions

‎include/react/EventStream.h‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,7 @@
1919

2020
/*****************************************/ REACT_BEGIN /*****************************************/
2121

22-
template <typename T>
23-
class Reactive;
24-
25-
enum class EventToken
26-
{
27-
token
28-
};
22+
enum class EventToken { token };
2923

3024
///////////////////////////////////////////////////////////////////////////////////////////////////
3125
/// Events

‎include/react/Observer.h‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ template <typename D>
3535
class Observer
3636
{
3737
public:
38-
using SubjectT = REACT_IMPL::NodeBase<D>;
38+
using SubjectT = REACT_IMPL::NodeBase<D>;
3939
using ObserverNodeT = REACT_IMPL::ObserverNode<D>;
4040

4141
Observer() :
@@ -66,7 +66,7 @@ class Observer
6666

6767
private:
6868
// Ownership managed by registry
69-
ObserverNodeT* ptr_;
69+
ObserverNodeT* ptr_;
7070

7171
// While the observer handle exists, the subject is not destroyed
7272
std::shared_ptr<SubjectT> subject_;
@@ -83,7 +83,7 @@ template <typename D>
8383
class ObserverRegistry
8484
{
8585
public:
86-
typedef NodeBase<D> SubjectT;
86+
using SubjectT = NodeBase<D>;
8787

8888
private:
8989
class Entry_
@@ -139,7 +139,7 @@ class ObserverRegistry
139139
}
140140

141141
private:
142-
std::unordered_map<IObserverNode*,Entry_> observerMap_;
142+
std::unordered_map<IObserverNode*,Entry_> observerMap_;
143143
};
144144

145145
/****************************************/ REACT_IMPL_END /***************************************/
@@ -155,7 +155,7 @@ template
155155
typename F,
156156
typename TArg
157157
>
158-
inline auto Observe(const Signal<D,TArg>& subject, F&& func)
158+
auto Observe(const Signal<D,TArg>& subject, F&& func)
159159
-> Observer<D>
160160
{
161161
std::unique_ptr< REACT_IMPL::ObserverNode<D>> pUnique(
@@ -177,7 +177,7 @@ template
177177
typename = std::enable_if<
178178
! std::is_same<TArg,EventToken>::value>::type
179179
>
180-
inline auto Observe(const Events<D,TArg>& subject, F&& func)
180+
auto Observe(const Events<D,TArg>& subject, F&& func)
181181
-> Observer<D>
182182
{
183183
std::unique_ptr< REACT_IMPL::ObserverNode<D>> pUnique(
@@ -196,7 +196,7 @@ template
196196
typename D,
197197
typename F
198198
>
199-
inline auto Observe(const Events<D,EventToken>& subject, F&& func)
199+
auto Observe(const Events<D,EventToken>& subject, F&& func)
200200
-> Observer<D>
201201
{
202202
std::unique_ptr< REACT_IMPL::ObserverNode<D>> pUnique(
@@ -219,7 +219,7 @@ template
219219
template <typename Domain_, typename Val_> class TNode,
220220
typename TArg
221221
>
222-
inline void DetachAllObservers(const Reactive<TNode<D,TArg>>& subject)
222+
void DetachAllObservers(const Reactive<TNode<D,TArg>>& subject)
223223
{
224224
D::Observers().UnregisterFrom(subject.GetPtr().get());
225225
}

‎include/react/ReactiveDomain.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ template <typename D, typename TPolicy>
6767
class DomainBase
6868
{
6969
public:
70-
using TurnT = typename TPolicy::Engine::TurnInterface;
70+
using TurnT = typename TPolicy::Engine::TurnT;
7171

7272
DomainBase() = delete;
7373

‎include/react/Signal.h‎

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -20,24 +20,6 @@
2020
#include "react/common/Util.h"
2121
#include "react/graph/SignalNodes.h"
2222

23-
/***************************************/ REACT_IMPL_BEGIN /**************************************/
24-
25-
template <typename D, typename S>
26-
class SignalNode;
27-
28-
template <typename D, typename S>
29-
class VarNode;
30-
31-
template
32-
<
33-
typename D,
34-
typename S,
35-
typename ... TArgs
36-
>
37-
class FunctionNode;
38-
39-
/****************************************/ REACT_IMPL_END /***************************************/
40-
4123
/*****************************************/ REACT_BEGIN /*****************************************/
4224

4325
///////////////////////////////////////////////////////////////////////////////////////////////////

‎include/react/graph/ConversionNodes.h‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ class FoldBaseNode : public SignalNode<D,S>
4141

4242
virtual ETickResult Tick(void* turnPtr) override
4343
{
44-
using TurnT = typename D::Engine::TurnInterface;
44+
using TurnT = typename D::Engine::TurnT;
4545
TurnT& turn = *static_cast<TurnT*>(turnPtr);
4646

4747
D::Log().template Append<NodeEvaluateBeginEvent>(GetObjectId(*this), turn.Id(), std::this_thread::get_id().hash());
@@ -185,7 +185,7 @@ class HoldNode : public SignalNode<D,S>
185185

186186
virtual ETickResult Tick(void* turnPtr) override
187187
{
188-
using TurnT = typename D::Engine::TurnInterface;
188+
using TurnT = typename D::Engine::TurnT;
189189
TurnT& turn = *static_cast<TurnT*>(turnPtr);
190190

191191
D::Log().template Append<NodeEvaluateBeginEvent>(GetObjectId(*this), turn.Id(), std::this_thread::get_id().hash());
@@ -247,7 +247,7 @@ class SnapshotNode : public SignalNode<D,S>
247247

248248
virtual ETickResult Tick(void* turnPtr) override
249249
{
250-
using TurnT = typename D::Engine::TurnInterface;
250+
using TurnT = typename D::Engine::TurnT;
251251
TurnT& turn = *static_cast<TurnT*>(turnPtr);
252252

253253
trigger_->SetCurrentTurn(turn);
@@ -308,7 +308,7 @@ class MonitorNode : public EventStreamNode<D,E>
308308

309309
virtual ETickResult Tick(void* turnPtr) override
310310
{
311-
using TurnT = typename D::Engine::TurnInterface;
311+
using TurnT = typename D::Engine::TurnT;
312312
TurnT& turn = *static_cast<TurnT*>(turnPtr);
313313

314314
SetCurrentTurn(turn, true);
@@ -319,12 +319,12 @@ class MonitorNode : public EventStreamNode<D,E>
319319

320320
if (events_.size() > 0)
321321
{
322-
Engine::OnNodePulse(*this, *static_cast<TurnInterface*>(turnPtr));
322+
Engine::OnNodePulse(*this, *static_cast<TurnT*>(turnPtr));
323323
return ETickResult::pulsed;
324324
}
325325
else
326326
{
327-
Engine::OnNodeIdlePulse(*this, *static_cast<TurnInterface*>(turnPtr));
327+
Engine::OnNodeIdlePulse(*this, *static_cast<TurnT*>(turnPtr));
328328
return ETickResult::idle_pulsed;
329329
}
330330
}
@@ -369,8 +369,8 @@ class PulseNode : public EventStreamNode<D,S>
369369

370370
virtual ETickResult Tick(void* turnPtr) override
371371
{
372-
typedef typename D::Engine::TurnInterface TurnInterface;
373-
TurnInterface& turn = *static_cast<TurnInterface*>(turnPtr);
372+
typedef typename D::Engine::TurnT TurnT;
373+
TurnT& turn = *static_cast<TurnT*>(turnPtr);
374374

375375
SetCurrentTurn(turn, true);
376376
trigger_->SetCurrentTurn(turn);
@@ -382,12 +382,12 @@ class PulseNode : public EventStreamNode<D,S>
382382

383383
if (events_.size() > 0)
384384
{
385-
Engine::OnNodePulse(*this, *static_cast<TurnInterface*>(turnPtr));
385+
Engine::OnNodePulse(*this, *static_cast<TurnT*>(turnPtr));
386386
return ETickResult::pulsed;
387387
}
388388
else
389389
{
390-
Engine::OnNodeIdlePulse(*this, *static_cast<TurnInterface*>(turnPtr));
390+
Engine::OnNodeIdlePulse(*this, *static_cast<TurnT*>(turnPtr));
391391
return ETickResult::idle_pulsed;
392392
}
393393
}
@@ -435,8 +435,8 @@ class EventFlattenNode : public EventStreamNode<D, TInner>
435435

436436
virtual ETickResult Tick(void* turnPtr) override
437437
{
438-
typedef typename D::Engine::TurnInterface TurnInterface;
439-
TurnInterface& turn = *static_cast<TurnInterface*>(turnPtr);
438+
typedef typename D::Engine::TurnT TurnT;
439+
TurnT& turn = *static_cast<TurnT*>(turnPtr);
440440

441441
SetCurrentTurn(turn, true);
442442
inner_->SetCurrentTurn(turn);
@@ -463,12 +463,12 @@ class EventFlattenNode : public EventStreamNode<D, TInner>
463463

464464
if (events_.size() > 0)
465465
{
466-
Engine::OnNodePulse(*this, *static_cast<TurnInterface*>(turnPtr));
466+
Engine::OnNodePulse(*this, *static_cast<TurnT*>(turnPtr));
467467
return ETickResult::pulsed;
468468
}
469469
else
470470
{
471-
Engine::OnNodeIdlePulse(*this, *static_cast<TurnInterface*>(turnPtr));
471+
Engine::OnNodeIdlePulse(*this, *static_cast<TurnT*>(turnPtr));
472472
return ETickResult::idle_pulsed;
473473
}
474474
}

‎include/react/graph/EventStreamNodes.h‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ class EventStreamNode : public ReactiveNode<D,E,void>
4141
using WeakPtrT = std::weak_ptr<EventStreamNode>;
4242

4343
using EngineT = typename D::Engine;
44-
using TurnT = typename EngineT::TurnInterface;
44+
using TurnT = typename EngineT::TurnT;
4545

4646
explicit EventStreamNode(bool registered) :
4747
ReactiveNode(true)
@@ -104,8 +104,8 @@ class EventSourceNode : public EventStreamNode<D,E>
104104
{
105105
if (events_.size() > 0 && !changedFlag_)
106106
{
107-
using TurnT = typename D::Engine::TurnInterface;
108-
TurnT& turn = *static_cast<TurnInterface*>(turnPtr);
107+
using TurnT = typename D::Engine::TurnT;
108+
TurnT& turn = *static_cast<TurnT*>(turnPtr);
109109

110110
SetCurrentTurn(turn, true, true);
111111
changedFlag_ = true;
@@ -176,7 +176,7 @@ class EventMergeNode : public EventStreamNode<D, E>
176176

177177
virtual ETickResult Tick(void* turnPtr) override
178178
{
179-
using TurnT = typename D::Engine::TurnInterface;
179+
using TurnT = typename D::Engine::TurnT;
180180
TurnT& turn = *static_cast<TurnT*>(turnPtr);
181181

182182
//printf("EventMergeNode: Tick %08X by thread %08X\n", this, std::this_thread::get_id().hash());
@@ -189,12 +189,12 @@ class EventMergeNode : public EventStreamNode<D, E>
189189

190190
if (events_.size() > 0)
191191
{
192-
Engine::OnNodePulse(*this, *static_cast<TurnInterface*>(turnPtr));
192+
Engine::OnNodePulse(*this, *static_cast<TurnT*>(turnPtr));
193193
return ETickResult::pulsed;
194194
}
195195
else
196196
{
197-
Engine::OnNodeIdlePulse(*this, *static_cast<TurnInterface*>(turnPtr));
197+
Engine::OnNodeIdlePulse(*this, *static_cast<TurnT*>(turnPtr));
198198
return ETickResult::idle_pulsed;
199199
}
200200
}
@@ -203,15 +203,15 @@ class EventMergeNode : public EventStreamNode<D, E>
203203

204204
private:
205205
const std::tuple<EventStreamNodePtr<D, TArgs> ...> deps_;
206-
const std::function<void(const TurnInterface&)> func_;
206+
const std::function<void(const TurnT&)> func_;
207207

208-
inline void expand(const TurnInterface& turn, const EventStreamNodePtr<D, TArgs>& ... args)
208+
inline void expand(const TurnT& turn, const EventStreamNodePtr<D, TArgs>& ... args)
209209
{
210210
REACT_EXPAND_PACK(processArgs<TArgs>(turn, args));
211211
}
212212

213213
template <typename TArg>
214-
inline void processArgs(const TurnInterface& turn, const EventStreamNodePtr<D, TArg>& arg)
214+
inline void processArgs(const TurnT& turn, const EventStreamNodePtr<D, TArg>& arg)
215215
{
216216
arg->SetCurrentTurn(turn);
217217

@@ -251,7 +251,7 @@ class EventFilterNode : public EventStreamNode<D, E>
251251

252252
virtual ETickResult Tick(void* turnPtr) override
253253
{
254-
using TurnT = typename D::Engine::TurnInterface;
254+
using TurnT = typename D::Engine::TurnT;
255255
TurnT& turn = *static_cast<TurnT*>(turnPtr);
256256

257257
SetCurrentTurn(turn, true);
@@ -262,12 +262,12 @@ class EventFilterNode : public EventStreamNode<D, E>
262262

263263
if (events_.size() > 0)
264264
{
265-
Engine::OnNodePulse(*this, *static_cast<TurnInterface*>(turnPtr));
265+
Engine::OnNodePulse(*this, *static_cast<TurnT*>(turnPtr));
266266
return ETickResult::pulsed;
267267
}
268268
else
269269
{
270-
Engine::OnNodeIdlePulse(*this, *static_cast<TurnInterface*>(turnPtr));
270+
Engine::OnNodeIdlePulse(*this, *static_cast<TurnT*>(turnPtr));
271271
return ETickResult::idle_pulsed;
272272
}
273273
}
@@ -312,7 +312,7 @@ class EventTransformNode : public EventStreamNode<D,TOut>
312312

313313
virtual ETickResult Tick(void* turnPtr) override
314314
{
315-
using TurnT = typename D::Engine::TurnInterface;
315+
using TurnT = typename D::Engine::TurnT;
316316
TurnT& turn = *static_cast<TurnT*>(turnPtr);
317317

318318
SetCurrentTurn(turn, true);
@@ -323,12 +323,12 @@ class EventTransformNode : public EventStreamNode<D,TOut>
323323

324324
if (events_.size() > 0)
325325
{
326-
Engine::OnNodePulse(*this, *static_cast<TurnInterface*>(turnPtr));
326+
Engine::OnNodePulse(*this, *static_cast<TurnT*>(turnPtr));
327327
return ETickResult::pulsed;
328328
}
329329
else
330330
{
331-
Engine::OnNodeIdlePulse(*this, *static_cast<TurnInterface*>(turnPtr));
331+
Engine::OnNodeIdlePulse(*this, *static_cast<TurnT*>(turnPtr));
332332
return ETickResult::idle_pulsed;
333333
}
334334
}

‎include/react/graph/GraphBase.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,16 +23,16 @@
2323
template <typename D>
2424
class NodeBase :
2525
public std::enable_shared_from_this<NodeBase<D>>,
26-
public D::Policy::Engine::NodeInterface
26+
public D::Policy::Engine::NodeT
2727
{
2828
public:
2929
using PtrT = std::shared_ptr<NodeBase>;
3030

3131
using Domain = D;
3232
using Policy = typename D::Policy;
3333
using Engine = typename D::Engine;
34-
using NodeInterface = typename Engine::NodeInterface;
35-
using TurnInterface = typename Engine::TurnInterface;
34+
using NodeT = typename Engine::NodeT;
35+
using TurnT = typename Engine::TurnT;
3636

3737
virtual const char* GetNodeType() const override { return "NodeBase"; }
3838

‎include/react/graph/ObserverNodes.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ class SignalObserverNode : public ObserverNode<D>
7474

7575
virtual ETickResult Tick(void* turnPtr) override
7676
{
77-
using TurnT = typename D::Engine::TurnInterface;
77+
using TurnT = typename D::Engine::TurnT;
7878
TurnT& turn = *static_cast<TurnT*>(turnPtr);
7979

8080
D::Log().template Append<NodeEvaluateBeginEvent>(GetObjectId(*this), turn.Id(), std::this_thread::get_id().hash());
@@ -142,7 +142,7 @@ class EventObserverNode : public ObserverNode<D>
142142

143143
virtual ETickResult Tick(void* turnPtr) override
144144
{
145-
using TurnT = typename D::Engine::TurnInterface;
145+
using TurnT = typename D::Engine::TurnT;
146146
TurnT& turn = *static_cast<TurnT*>(turnPtr);
147147

148148
D::Log().template Append<NodeEvaluateBeginEvent>(GetObjectId(*this), turn.Id(), std::this_thread::get_id().hash());

‎include/react/graph/ReactorNodes.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ class ReactorNode :
4141
using LoopT = typename CoroutineT::pull_type;
4242
using OutT = typename CoroutineT::push_type;
4343

44-
using TurnT = typename D::Engine::TurnInterface;
44+
using TurnT = typename D::Engine::TurnT;
4545

4646
template <typename F>
4747
ReactorNode(F&& func, bool registered) :

0 commit comments

Comments
 (0)