Ver código fonte

Scope Success refactored.

main
offa 7 anos atrás
pai
commit
579235c232
2 arquivos alterados com 23 adições e 71 exclusões
  1. +4
    -2
      include/scope_guard_base.h
  2. +19
    -69
      include/scope_success.h

+ 4
- 2
include/scope_guard_base.h Ver arquivo

@@ -62,7 +62,8 @@ namespace detail
>
scope_guard_base(scope_guard_base&& other) noexcept(std::is_nothrow_move_constructible<T>::value
|| std::is_nothrow_copy_constructible<T>::value)
: m_exitFunction(std::move(other.m_exitFunction)),
: Strategy(other),
m_exitFunction(std::move(other.m_exitFunction)),
m_execute_on_destruction(other.m_execute_on_destruction)
{
other.release();
@@ -73,7 +74,8 @@ namespace detail
>
scope_guard_base(scope_guard_base&& other) noexcept(std::is_nothrow_move_constructible<T>::value
|| std::is_nothrow_copy_constructible<T>::value)
: m_exitFunction(other.m_exitFunction),
: Strategy(other),
m_exitFunction(other.m_exitFunction),
m_execute_on_destruction(other.m_execute_on_destruction)
{
other.release();

+ 19
- 69
include/scope_success.h Ver arquivo

@@ -20,92 +20,42 @@

#pragma once

#include <utility>
#include <type_traits>
#include "scope_guard_base.h"
#include <exception>

namespace sr
{

template<class EF>
class scope_success
namespace detail
{
public:

template<class EFP,
std::enable_if_t<std::is_constructible<EF, EFP>::value, int> = 0,
std::enable_if_t<(!std::is_lvalue_reference<EFP>::value)
&& std::is_nothrow_constructible<EF, EFP>::value, int> = 0
>
explicit scope_success(EFP&& exitFunction) : m_exitFunction(std::move(exitFunction)),
m_execute_on_destruction(true),
m_uncaught_on_creation(uncaught_exceptions())
{
}

template<class EFP,
std::enable_if_t<std::is_constructible<EF, EFP>::value, int> = 0,
std::enable_if_t<std::is_lvalue_reference<EFP>::value, int> = 0
>
explicit scope_success(EFP&& exitFunction) : m_exitFunction(exitFunction),
m_execute_on_destruction(true),
m_uncaught_on_creation(uncaught_exceptions())
struct scope_success_strategy
{
}

scope_success(const scope_success&) = delete;

template<class T = EF,
std::enable_if_t<std::is_nothrow_move_constructible<T>::value, int> = 0
>
scope_success(scope_success&& other) noexcept(std::is_nothrow_move_constructible<T>::value || std::is_nothrow_copy_constructible<T>::value)
: m_exitFunction(std::move(other.m_exitFunction)),
m_execute_on_destruction(other.m_execute_on_destruction),
m_uncaught_on_creation(uncaught_exceptions())
{
other.release();
}

template<class T = EF,
std::enable_if_t<!std::is_nothrow_move_constructible<T>::value, int> = 0
>
scope_success(scope_success&& other) noexcept(std::is_nothrow_move_constructible<T>::value || std::is_nothrow_copy_constructible<T>::value)
: m_exitFunction(other.m_exitFunction),
m_execute_on_destruction(other.m_execute_on_destruction),
m_uncaught_on_creation(other.m_uncaught_on_creation)
{
other.release();
}
bool should_execute() const
{
return uncaught_exceptions() <= m_uncaught_on_creation;
}

~scope_success() noexcept(noexcept(std::declval<EF>()()))
{
if( ( m_execute_on_destruction == true ) && ( uncaught_exceptions() <= m_uncaught_on_creation ) )
int uncaught_exceptions() const noexcept
{
m_exitFunction();
return ( std::uncaught_exception() == true ? 1 : 0 );
}
}


void release() noexcept
{
m_execute_on_destruction = false;
}
int m_uncaught_on_creation = uncaught_exceptions();
};

}


template<class EF>
class scope_success : public detail::scope_guard_base<EF, detail::scope_success_strategy>
{
public:

scope_success& operator=(const scope_success&) = delete;
scope_success& operator=(scope_success&&) = delete;
using detail::scope_guard_base<EF, detail::scope_success_strategy>::scope_guard_base;


private:

int uncaught_exceptions() const noexcept
{
return ( std::uncaught_exception() == true ? 1 : 0 );
}

EF m_exitFunction;
bool m_execute_on_destruction;
int m_uncaught_on_creation;
};



Carregando…
Cancelar
Salvar