Skip to content

Commit 79ffa32

Browse files
schlangsterschlangster
committed
Refactoring.
1 parent f36bb4c commit 79ffa32

18 files changed

Lines changed: 501 additions & 497 deletions

‎include/react/Conversion.h‎

Lines changed: 49 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -16,18 +16,18 @@ namespace react {
1616
////////////////////////////////////////////////////////////////////////////////////////
1717
template
1818
<
19-
typename TDomain,
19+
typename D,
2020
typename E,
2121
typename S,
2222
typename TFunc,
2323
typename ... TArgs
2424
>
25-
inline auto Fold(const S& initialValue, const REvents<TDomain,E>& events,
26-
const TFunc& func, const RSignal<TDomain,TArgs>& ... args)
27-
-> RSignal<TDomain,S>
25+
inline auto Fold(const S& initialValue, const REvents<D,E>& events,
26+
const TFunc& func, const RSignal<D,TArgs>& ... args)
27+
-> RSignal<D,S>
2828
{
29-
return RSignal<TDomain,S>(
30-
std::make_shared<FoldNode<TDomain,S,E,TArgs ...>>(
29+
return RSignal<D,S>(
30+
std::make_shared<FoldNode<D,S,E,TArgs ...>>(
3131
initialValue, events.GetPtr(), args.GetPtr() ..., func, false));
3232
}
3333

@@ -36,18 +36,18 @@ inline auto Fold(const S& initialValue, const REvents<TDomain,E>& events,
3636
////////////////////////////////////////////////////////////////////////////////////////
3737
template
3838
<
39-
typename TDomain,
39+
typename D,
4040
typename E,
4141
typename S,
4242
typename TFunc,
4343
typename ... TArgs
4444
>
45-
inline auto Iterate(const S& initialValue, const REvents<TDomain,E>& events,
46-
const TFunc& func, const RSignal<TDomain,TArgs>& ... args)
47-
-> RSignal<TDomain,S>
45+
inline auto Iterate(const S& initialValue, const REvents<D,E>& events,
46+
const TFunc& func, const RSignal<D,TArgs>& ... args)
47+
-> RSignal<D,S>
4848
{
49-
return RSignal<TDomain,S>(
50-
std::make_shared<IterateNode<TDomain,S,E,TArgs ...>>(
49+
return RSignal<D,S>(
50+
std::make_shared<IterateNode<D,S,E,TArgs ...>>(
5151
initialValue, events.GetPtr(), args.GetPtr() ..., func, false));
5252
}
5353

@@ -56,14 +56,14 @@ inline auto Iterate(const S& initialValue, const REvents<TDomain,E>& events,
5656
////////////////////////////////////////////////////////////////////////////////////////
5757
template
5858
<
59-
typename TDomain,
59+
typename D,
6060
typename T
6161
>
62-
inline auto Hold(const T& initialValue, const REvents<TDomain,T>& events)
63-
-> RSignal<TDomain,T>
62+
inline auto Hold(const T& initialValue, const REvents<D,T>& events)
63+
-> RSignal<D,T>
6464
{
65-
return RSignal<TDomain,T>(
66-
std::make_shared<HoldNode<TDomain,T>>(
65+
return RSignal<D,T>(
66+
std::make_shared<HoldNode<D,T>>(
6767
initialValue, events.GetPtr(), false));
6868
}
6969

@@ -72,27 +72,27 @@ inline auto Hold(const T& initialValue, const REvents<TDomain,T>& events)
7272
////////////////////////////////////////////////////////////////////////////////////////
7373
template
7474
<
75-
typename TDomain,
75+
typename D,
7676
typename S,
7777
typename E
7878
>
79-
inline auto Snapshot(const RSignal<TDomain,S>& target, const REvents<TDomain,E>& trigger)
80-
-> RSignal<TDomain,S>
79+
inline auto Snapshot(const RSignal<D,S>& target, const REvents<D,E>& trigger)
80+
-> RSignal<D,S>
8181
{
82-
return RSignal<TDomain,S>(
83-
std::make_shared<SnapshotNode<TDomain,S,E>>(
82+
return RSignal<D,S>(
83+
std::make_shared<SnapshotNode<D,S,E>>(
8484
target.GetPtr(), trigger.GetPtr(), false));
8585
}
8686

8787
template
8888
<
89-
typename TDomain,
89+
typename D,
9090
typename S,
9191
typename E
9292
>
93-
inline auto operator&(const REvents<TDomain,E>& trigger,
94-
const RSignal<TDomain,S>& target)
95-
-> RSignal<TDomain,S>
93+
inline auto operator&(const REvents<D,E>& trigger,
94+
const RSignal<D,S>& target)
95+
-> RSignal<D,S>
9696
{
9797
return Snapshot(target,trigger);
9898
}
@@ -102,14 +102,14 @@ inline auto operator&(const REvents<TDomain,E>& trigger,
102102
////////////////////////////////////////////////////////////////////////////////////////
103103
template
104104
<
105-
typename TDomain,
105+
typename D,
106106
typename S
107107
>
108-
inline auto Monitor(const RSignal<TDomain,S>& target)
109-
-> REvents<TDomain,S>
108+
inline auto Monitor(const RSignal<D,S>& target)
109+
-> REvents<D,S>
110110
{
111-
return REvents<TDomain,S>(
112-
std::make_shared<MonitorNode<TDomain, S>>(
111+
return REvents<D,S>(
112+
std::make_shared<MonitorNode<D, S>>(
113113
target.GetPtr(), false));
114114
}
115115

@@ -118,11 +118,11 @@ inline auto Monitor(const RSignal<TDomain,S>& target)
118118
////////////////////////////////////////////////////////////////////////////////////////
119119
template
120120
<
121-
typename TDomain,
121+
typename D,
122122
typename S
123123
>
124-
inline auto Changed(const RSignal<TDomain,S>& target)
125-
-> REvents<TDomain,bool>
124+
inline auto Changed(const RSignal<D,S>& target)
125+
-> REvents<D,bool>
126126
{
127127
return Transform(Monitor(target), [] (const S& v) { return true; });
128128
}
@@ -132,11 +132,11 @@ inline auto Changed(const RSignal<TDomain,S>& target)
132132
////////////////////////////////////////////////////////////////////////////////////////
133133
template
134134
<
135-
typename TDomain,
135+
typename D,
136136
typename S
137137
>
138-
inline auto ChangedTo(const RSignal<TDomain,S>& target, const S& value)
139-
-> REvents<TDomain,bool>
138+
inline auto ChangedTo(const RSignal<D,S>& target, const S& value)
139+
-> REvents<D,bool>
140140
{
141141
auto transformFunc = [=] (const S& v) { return v == value; };
142142
auto filterFunc = [=] (bool v) { return v == true; };
@@ -149,15 +149,15 @@ inline auto ChangedTo(const RSignal<TDomain,S>& target, const S& value)
149149
////////////////////////////////////////////////////////////////////////////////////////
150150
template
151151
<
152-
typename TDomain,
152+
typename D,
153153
typename S,
154154
typename E
155155
>
156-
inline auto Pulse(const RSignal<TDomain,S>& target, const REvents<TDomain,E>& trigger)
157-
-> REvents<TDomain,S>
156+
inline auto Pulse(const RSignal<D,S>& target, const REvents<D,E>& trigger)
157+
-> REvents<D,S>
158158
{
159-
return REvents<TDomain,S>(
160-
std::make_shared<PulseNode<TDomain,S,E>>(
159+
return REvents<D,S>(
160+
std::make_shared<PulseNode<D,S,E>>(
161161
target.GetPtr(), trigger.GetPtr(), false));
162162
}
163163

@@ -166,18 +166,18 @@ inline auto Pulse(const RSignal<TDomain,S>& target, const REvents<TDomain,E>& tr
166166
////////////////////////////////////////////////////////////////////////////////////////
167167
template
168168
<
169-
typename TDomain,
169+
typename D,
170170
template <typename Domain_, typename Val_> class THandle,
171171
typename TInnerValue,
172172
class = std::enable_if<std::is_base_of<
173-
REvents<TDomain,TInnerValue>,
174-
THandle<TDomain,TInnerValue>>::value>::type
173+
REvents<D,TInnerValue>,
174+
THandle<D,TInnerValue>>::value>::type
175175
>
176-
inline auto Flatten(const RSignal<TDomain,THandle<TDomain,TInnerValue>>& node)
177-
-> REvents<TDomain,TInnerValue>
176+
inline auto Flatten(const RSignal<D,THandle<D,TInnerValue>>& node)
177+
-> REvents<D,TInnerValue>
178178
{
179-
return REvents<TDomain,TInnerValue>(
180-
std::make_shared<EventFlattenNode<TDomain, REvents<TDomain,TInnerValue>, TInnerValue>>(
179+
return REvents<D,TInnerValue>(
180+
std::make_shared<EventFlattenNode<D, REvents<D,TInnerValue>, TInnerValue>>(
181181
node.GetPtr(), node().GetPtr(), false));
182182
}
183183

‎include/react/EventStream.h‎

Lines changed: 35 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,13 @@ class Reactive;
1818
////////////////////////////////////////////////////////////////////////////////////////
1919
template
2020
<
21-
typename TDomain,
21+
typename D,
2222
typename E
2323
>
24-
class REvents : public Reactive<EventStreamNode<TDomain,E>>
24+
class REvents : public Reactive<EventStreamNode<D,E>>
2525
{
2626
private:
27-
typedef EventStreamNode<TDomain, E> NodeT;
27+
typedef EventStreamNode<D, E> NodeT;
2828

2929
public:
3030
REvents() :
@@ -43,13 +43,13 @@ class REvents : public Reactive<EventStreamNode<TDomain,E>>
4343
////////////////////////////////////////////////////////////////////////////////////////
4444
template
4545
<
46-
typename TDomain,
46+
typename D,
4747
typename E
4848
>
49-
class REventSource : public REvents<TDomain,E>
49+
class REventSource : public REvents<D,E>
5050
{
5151
private:
52-
typedef EventSourceNode<TDomain, E> NodeT;
52+
typedef EventSourceNode<D, E> NodeT;
5353

5454
public:
5555
REventSource() :
@@ -88,44 +88,44 @@ class REventSource : public REvents<TDomain,E>
8888
////////////////////////////////////////////////////////////////////////////////////////
8989
/// MakeEventSource
9090
////////////////////////////////////////////////////////////////////////////////////////
91-
template <typename TDomain, typename E>
91+
template <typename D, typename E>
9292
inline auto MakeEventSource()
93-
-> REventSource<TDomain,E>
93+
-> REventSource<D,E>
9494
{
95-
return REventSource<TDomain,E>(
96-
std::make_shared<EventSourceNode<TDomain,E>>(false));
95+
return REventSource<D,E>(
96+
std::make_shared<EventSourceNode<D,E>>(false));
9797
}
9898

9999
////////////////////////////////////////////////////////////////////////////////////////
100100
/// Merge
101101
////////////////////////////////////////////////////////////////////////////////////////
102102
template
103103
<
104-
typename TDomain,
104+
typename D,
105105
typename TArg1,
106106
typename TArg2,
107107
typename ... TArgs
108108
>
109-
inline auto Merge(const REvents<TDomain,TArg1>& arg1,
110-
const REvents<TDomain,TArg2>& arg2,
111-
const REvents<TDomain,TArgs>& ... args)
112-
-> REvents<TDomain,TArg1>
109+
inline auto Merge(const REvents<D,TArg1>& arg1,
110+
const REvents<D,TArg2>& arg2,
111+
const REvents<D,TArgs>& ... args)
112+
-> REvents<D,TArg1>
113113
{
114114
typedef TArg1 E;
115-
return REvents<TDomain,E>(
116-
std::make_shared<EventMergeNode<TDomain, E, TArg1, TArg2, TArgs ...>>(
115+
return REvents<D,E>(
116+
std::make_shared<EventMergeNode<D, E, TArg1, TArg2, TArgs ...>>(
117117
arg1.GetPtr(), arg2.GetPtr(), args.GetPtr() ..., false));
118118
}
119119

120120
template
121121
<
122-
typename TDomain,
122+
typename D,
123123
typename TLeftArg,
124124
typename TRightArg
125125
>
126-
inline auto operator|(const REvents<TDomain,TLeftArg>& lhs,
127-
const REvents<TDomain,TRightArg>& rhs)
128-
-> REvents<TDomain, TLeftArg>
126+
inline auto operator|(const REvents<D,TLeftArg>& lhs,
127+
const REvents<D,TRightArg>& rhs)
128+
-> REvents<D, TLeftArg>
129129
{
130130
return Merge(lhs,rhs);
131131
}
@@ -135,15 +135,15 @@ inline auto operator|(const REvents<TDomain,TLeftArg>& lhs,
135135
////////////////////////////////////////////////////////////////////////////////////////
136136
template
137137
<
138-
typename TDomain,
138+
typename D,
139139
typename E,
140140
typename F
141141
>
142-
inline auto Filter(const REvents<TDomain,E>& src, const F& filter)
143-
-> REvents<TDomain,E>
142+
inline auto Filter(const REvents<D,E>& src, const F& filter)
143+
-> REvents<D,E>
144144
{
145-
return REvents<TDomain,E>(
146-
std::make_shared<EventFilterNode<TDomain, E, F>>(src.GetPtr(), filter, false));
145+
return REvents<D,E>(
146+
std::make_shared<EventFilterNode<D, E, F>>(src.GetPtr(), filter, false));
147147
}
148148

149149
////////////////////////////////////////////////////////////////////////////////////////
@@ -153,11 +153,11 @@ inline auto Filter(const REvents<TDomain,E>& src, const F& filter)
153153
\
154154
template \
155155
< \
156-
typename TDomain, \
156+
typename D, \
157157
typename E \
158158
> \
159-
inline auto operator ## op(const REvents<TDomain,E>& lhs, const E& rhs) \
160-
-> REvents<TDomain,E> \
159+
inline auto operator ## op(const REvents<D,E>& lhs, const E& rhs) \
160+
-> REvents<D,E> \
161161
{ \
162162
return Filter(lhs, [=] (const E& e) { return e op rhs; }); \
163163
}
@@ -176,19 +176,18 @@ DECLARE_COMP_OP(>=);
176176
////////////////////////////////////////////////////////////////////////////////////////
177177
template
178178
<
179-
typename TDomain,
179+
typename D,
180180
typename TIn,
181181
typename F
182182
>
183-
inline auto Transform(const REvents<TDomain,TIn>& src, const F& func)
184-
-> REvents<TDomain, decltype(func(src.GetPtr()->Front()))>
183+
inline auto Transform(const REvents<D,TIn>& src, const F& func)
184+
-> REvents<D, decltype(func(src.GetPtr()->Front()))>
185185
{
186186
typedef decltype(func(src.GetPtr()->Front())) TOut;
187187

188-
return REvents<TDomain,TOut>(
189-
std::make_shared<EventTransformNode<TDomain, TIn, TOut, F>>(
188+
return REvents<D,TOut>(
189+
std::make_shared<EventTransformNode<D, TIn, TOut, F>>(
190190
src.GetPtr(), func, false));
191191
}
192192

193-
// ---
194-
}
193+
} // ~namespace react

0 commit comments

Comments
 (0)