AIR/cpp-peglib
1
0
Fork 0
mirror of https://github.com/yhirose/cpp-peglib.git synced 2024-12-22 20:05:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #58 from yhirose/remove-enabler

Browse Source 
Removed enabler
This commit is contained in:
yhirose 2019-01-11 18:33:33 -05:00 committed by GitHub
commit 5c167f413e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
peglib.h
View File

@ -41,12 +41,6 @@
namespace peg { namespace peg {
#if __clang__ == 1 && __clang_major__ <= 5
static void* enabler = nullptr; // workaround for Clang version <= 5.0.0
#else
extern void* enabler;
#endif
/*----------------------------------------------------------------------------- /*-----------------------------------------------------------------------------
* any * any
*---------------------------------------------------------------------------*/ *---------------------------------------------------------------------------*/
@ -96,7 +90,7 @@ public:
template < template <
typename T, typename T,
typename std::enable_if<!std::is_same<T, any>::value>::type*& = enabler typename std::enable_if<!std::is_same<T, any>::value, std::nullptr_t>::type = nullptr
> >
T& get() { T& get() {
if (!content_) { if (!content_) {
@ -112,7 +106,7 @@ public:
template < template <
typename T, typename T,
typename std::enable_if<std::is_same<T, any>::value>::type*& = enabler typename std::enable_if<std::is_same<T, any>::value, std::nullptr_t>::type = nullptr
> >
T& get() { T& get() {
return *this; return *this;
@ -120,7 +114,7 @@ public:
template < template <
typename T, typename T,
typename std::enable_if<!std::is_same<T, any>::value>::type*& = enabler typename std::enable_if<!std::is_same<T, any>::value, std::nullptr_t>::type = nullptr
> >
const T& get() const { const T& get() const {
assert(content_); assert(content_);
@ -134,7 +128,7 @@ public:
template < template <
typename T, typename T,
typename std::enable_if<std::is_same<T, any>::value>::type*& = enabler typename std::enable_if<std::is_same<T, any>::value, std::nullptr_t>::type = nullptr
> >
const any& get() const { const any& get() const {
return *this; return *this;
@ -555,7 +549,7 @@ private:
*/ */
template < template <
typename R, typename F, typename R, typename F,
typename std::enable_if<std::is_void<R>::value>::type*& = enabler, typename std::enable_if<std::is_void<R>::value, std::nullptr_t>::type = nullptr,
typename... Args> typename... Args>
any call(F fn, Args&&... args) { any call(F fn, Args&&... args) {
fn(std::forward<Args>(args)...); fn(std::forward<Args>(args)...);
@ -564,7 +558,7 @@ any call(F fn, Args&&... args) {
template < template <
typename R, typename F, typename R, typename F,
typename std::enable_if<std::is_same<typename std::remove_cv<R>::type, any>::value>::type*& = enabler, typename std::enable_if<std::is_same<typename std::remove_cv<R>::type, any>::value, std::nullptr_t>::type = nullptr,
typename... Args> typename... Args>
any call(F fn, Args&&... args) { any call(F fn, Args&&... args) {
return fn(std::forward<Args>(args)...); return fn(std::forward<Args>(args)...);
@ -574,7 +568,7 @@ template <
typename R, typename F, typename R, typename F,
typename std::enable_if< typename std::enable_if<
!std::is_void<R>::value && !std::is_void<R>::value &&
!std::is_same<typename std::remove_cv<R>::type, any>::value>::type*& = enabler, !std::is_same<typename std::remove_cv<R>::type, any>::value, std::nullptr_t>::type = nullptr,
typename... Args> typename... Args>
any call(F fn, Args&&... args) { any call(F fn, Args&&... args) {
return any(fn(std::forward<Args>(args)...)); return any(fn(std::forward<Args>(args)...));
@ -587,26 +581,26 @@ public:
Action(const Action& rhs) : fn_(rhs.fn_) {} Action(const Action& rhs) : fn_(rhs.fn_) {}
template <typename F, typename std::enable_if<!std::is_pointer<F>::value && !std::is_same<F, std::nullptr_t>::value>::type*& = enabler> template <typename F, typename std::enable_if<!std::is_pointer<F>::value && !std::is_same<F, std::nullptr_t>::value, std::nullptr_t>::type = nullptr>
Action(F fn) : fn_(make_adaptor(fn, &F::operator())) {} Action(F fn) : fn_(make_adaptor(fn, &F::operator())) {}
template <typename F, typename std::enable_if<std::is_pointer<F>::value>::type*& = enabler> template <typename F, typename std::enable_if<std::is_pointer<F>::value, std::nullptr_t>::type = nullptr>
Action(F fn) : fn_(make_adaptor(fn, fn)) {} Action(F fn) : fn_(make_adaptor(fn, fn)) {}
template <typename F, typename std::enable_if<std::is_same<F, std::nullptr_t>::value>::type*& = enabler> template <typename F, typename std::enable_if<std::is_same<F, std::nullptr_t>::value, std::nullptr_t>::type = nullptr>
Action(F /*fn*/) {} Action(F /*fn*/) {}
template <typename F, typename std::enable_if<!std::is_pointer<F>::value && !std::is_same<F, std::nullptr_t>::value>::type*& = enabler> template <typename F, typename std::enable_if<!std::is_pointer<F>::value && !std::is_same<F, std::nullptr_t>::value, std::nullptr_t>::type = nullptr>
void operator=(F fn) { void operator=(F fn) {
fn_ = make_adaptor(fn, &F::operator()); fn_ = make_adaptor(fn, &F::operator());
} }
template <typename F, typename std::enable_if<std::is_pointer<F>::value>::type*& = enabler> template <typename F, typename std::enable_if<std::is_pointer<F>::value, std::nullptr_t>::type = nullptr>
void operator=(F fn) { void operator=(F fn) {
fn_ = make_adaptor(fn, fn); fn_ = make_adaptor(fn, fn);
} }
template <typename F, typename std::enable_if<std::is_same<F, std::nullptr_t>::value>::type*& = enabler> template <typename F, typename std::enable_if<std::is_same<F, std::nullptr_t>::value, std::nullptr_t>::type = nullptr>
void operator=(F /*fn*/) {} void operator=(F /*fn*/) {}
Action& operator=(const Action& rhs) = default; Action& operator=(const Action& rhs) = default;