JDBtracker
/
libostd
forked from OctaForge/libostd
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

signal.hh -> event.hh, Event -> Signal

master
Daniel Kolesa 2015-07-17 19:00:25 +01:00
parent e9cf0c67ed
commit a6584020a3
1 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
ostd/signal.hh → ostd/event.hh
View File

@ -3,8 +3,8 @@
* This file is part of OctaSTD. See COPYING.md for futher information. * This file is part of OctaSTD. See COPYING.md for futher information.
*/ */
#ifndef OSTD_SIGNAL_HH #ifndef OSTD_EVENT_HH
#define OSTD_SIGNAL_HH #define OSTD_EVENT_HH
#include "ostd/functional.hh" #include "ostd/functional.hh"
#include "ostd/utility.hh" #include "ostd/utility.hh"
@ -13,10 +13,10 @@ namespace ostd {
namespace detail { namespace detail {
template<typename C, typename ...A> template<typename C, typename ...A>
struct EventBase { struct SignalBase {
EventBase(C *cl): p_class(cl), p_funcs(nullptr), p_nfuncs(0) {} SignalBase(C *cl): p_class(cl), p_funcs(nullptr), p_nfuncs(0) {}
EventBase(const EventBase &ev): p_class(ev.p_class), SignalBase(const SignalBase &ev): p_class(ev.p_class),
p_nfuncs(ev.p_nfuncs) { p_nfuncs(ev.p_nfuncs) {
using Func = Function<void(C &, A...)>; using Func = Function<void(C &, A...)>;
Func *nbuf = (Func *)new byte[sizeof(Func) * p_nfuncs]; Func *nbuf = (Func *)new byte[sizeof(Func) * p_nfuncs];
@ -25,12 +25,12 @@ namespace detail {
p_funcs = nbuf; p_funcs = nbuf;
} }
EventBase(EventBase &&ev): p_class(nullptr), p_funcs(nullptr), SignalBase(SignalBase &&ev): p_class(nullptr), p_funcs(nullptr),
p_nfuncs(0) { p_nfuncs(0) {
swap(ev); swap(ev);
} }
EventBase &operator=(const EventBase &ev) { SignalBase &operator=(const SignalBase &ev) {
using Func = Function<void(C &, A...)>; using Func = Function<void(C &, A...)>;
p_class = ev.p_class; p_class = ev.p_class;
p_nfuncs = ev.p_nfuncs; p_nfuncs = ev.p_nfuncs;
@ -41,12 +41,12 @@ namespace detail {
return *this; return *this;
} }
EventBase &operator=(EventBase &&ev) { SignalBase &operator=(SignalBase &&ev) {
swap(ev); swap(ev);
return *this; return *this;
} }
~EventBase() { clear(); } ~SignalBase() { clear(); }
void clear() { void clear() {
for (Size i = 0; i < p_nfuncs; ++i) for (Size i = 0; i < p_nfuncs; ++i)
@ -98,7 +98,7 @@ namespace detail {
return ocl; return ocl;
} }
void swap(EventBase &ev) { void swap(SignalBase &ev) {
detail::swap_adl(p_class, ev.p_class); detail::swap_adl(p_class, ev.p_class);
detail::swap_adl(p_funcs, ev.p_funcs); detail::swap_adl(p_funcs, ev.p_funcs);
detail::swap_adl(p_nfuncs, ev.p_nfuncs); detail::swap_adl(p_nfuncs, ev.p_nfuncs);
@ -112,21 +112,21 @@ namespace detail {
} /* namespace detail */ } /* namespace detail */
template<typename C, typename ...A> template<typename C, typename ...A>
struct Event { struct Signal {
private: private:
using Base = detail::EventBase<C, A...>; using Base = detail::SignalBase<C, A...>;
Base p_base; Base p_base;
public: public:
Event(C *cl): p_base(cl) {} Signal(C *cl): p_base(cl) {}
Event(const Event &ev): p_base(ev.p_base) {} Signal(const Signal &ev): p_base(ev.p_base) {}
Event(Event &&ev): p_base(move(ev.p_base)) {} Signal(Signal &&ev): p_base(move(ev.p_base)) {}
Event &operator=(const Event &ev) { Signal &operator=(const Signal &ev) {
p_base = ev.p_base; p_base = ev.p_base;
return *this; return *this;
} }
Event &operator=(Event &&ev) { Signal &operator=(Signal &&ev) {
p_base = move(ev.p_base); p_base = move(ev.p_base);
return *this; return *this;
} }
@ -147,25 +147,25 @@ public:
C *get_class() const { return p_base.get_class(); } C *get_class() const { return p_base.get_class(); }
C *set_class(C *cl) { return p_base.set_class(cl); } C *set_class(C *cl) { return p_base.set_class(cl); }
void swap(Event &ev) { p_base.swap(ev.p_base); } void swap(Signal &ev) { p_base.swap(ev.p_base); }
}; };
template<typename C, typename ...A> template<typename C, typename ...A>
struct Event<const C, A...> { struct Signal<const C, A...> {
private: private:
using Base = detail::EventBase<const C, A...>; using Base = detail::SignalBase<const C, A...>;
Base p_base; Base p_base;
public: public:
Event(C *cl): p_base(cl) {} Signal(C *cl): p_base(cl) {}
Event(const Event &ev): p_base(ev.p_base) {} Signal(const Signal &ev): p_base(ev.p_base) {}
Event(Event &&ev): p_base(move(ev.p_base)) {} Signal(Signal &&ev): p_base(move(ev.p_base)) {}
Event &operator=(const Event &ev) { Signal &operator=(const Signal &ev) {
p_base = ev.p_base; p_base = ev.p_base;
return *this; return *this;
} }
Event &operator=(Event &&ev) { Signal &operator=(Signal &&ev) {
p_base = move(ev.p_base); p_base = move(ev.p_base);
return *this; return *this;
} }
@ -186,7 +186,7 @@ public:
C *get_class() const { return p_base.get_class(); } C *get_class() const { return p_base.get_class(); }
C *set_class(C *cl) { return p_base.set_class(cl); } C *set_class(C *cl) { return p_base.set_class(cl); }
void swap(Event &ev) { p_base.swap(ev.p_base); } void swap(Signal &ev) { p_base.swap(ev.p_base); }
}; };
} /* namespace ostd */ } /* namespace ostd */