scope_success implemented. Until C++17 is used,

std::uncaught_exception() must be used instead of
std::uncaught_exceptions() (#46).

include/scope_success.h

@@ -0,0 +1,118 @@
+/*
+ * Scope Guard
+ * Copyright (C) 2017  offa
+ *
+ * This file is part of Scope Guard.
+ *
+ * Scope Guard is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Scope Guard is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Scope Guard.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include <utility>
+#include <type_traits>
+#include <exception>
+
+namespace sr
+{
+
+    template<class Deleter>
+    class scope_success
+    {
+    public:
+
+        template<class D,
+            std::enable_if_t<std::is_constructible<Deleter, D>::value, int> = 0,
+            std::enable_if_t<(!std::is_lvalue_reference<D>::value)
+                                && std::is_nothrow_constructible<Deleter, D>::value, int> = 0
+            >
+        explicit scope_success(D&& deleter) : m_deleter(std::move(deleter)),
+                                            m_execute_on_destruction(true)
+        {
+        }
+
+        template<class D,
+            std::enable_if_t<std::is_constructible<Deleter, D>::value, int> = 0,
+            std::enable_if_t<std::is_lvalue_reference<D>::value, int> = 0
+            >
+        explicit scope_success(D&& deleter) try : m_deleter(deleter),
+                                            m_execute_on_destruction(true)
+        {
+        }
+        catch( ... )
+        {
+            throw;
+        }
+
+        scope_success(const scope_success&) = delete;
+
+        template<class T = Deleter,
+            std::enable_if_t<std::is_nothrow_move_constructible<T>::value, int> = 0
+            >
+        scope_success(scope_success&& other) : m_deleter(std::move(other.m_deleter)),
+                                        m_execute_on_destruction(other.m_execute_on_destruction),
+                                        m_uncaught_on_creation(uncaught_exceptions())
+        {
+            other.release();
+        }
+
+        template<class T = Deleter,
+            std::enable_if_t<!std::is_nothrow_move_constructible<T>::value, int> = 0
+            >
+        scope_success(scope_success&& other) : m_deleter(other.m_deleter),
+                                        m_execute_on_destruction(other.m_execute_on_destruction)
+        {
+            other.release();
+        }
+
+        ~scope_success() noexcept(noexcept(std::declval<Deleter>()))
+        {
+            if( (m_execute_on_destruction == true) && ( uncaught_exceptions() <= m_uncaught_on_creation ) )
+            {
+                m_deleter();
+            }
+        }
+
+
+        void release() noexcept
+        {
+            m_execute_on_destruction = false;
+        }
+
+
+        scope_success& operator=(const scope_success&) = delete;
+        scope_success& operator=(scope_success&&) = delete;
+
+
+    private:
+
+        int uncaught_exceptions() const noexcept
+        {
+            return ( std::uncaught_exception() == true ? 1 : 0 );
+        }
+
+        Deleter m_deleter;
+        bool m_execute_on_destruction;
+        int m_uncaught_on_creation;
+    };
+
+
+    template<class Deleter>
+    scope_success<std::decay_t<Deleter>> make_scope_success(Deleter&& deleter) noexcept
+    {
+        return scope_success<std::decay_t<Deleter>>{std::forward<Deleter>(deleter)};
+    }
+
+}
+

test/CMakeLists.txt

@@ -18,10 +18,12 @@ endfunction()
 
 
 add_test_suite(ScopeExitTest)
+add_test_suite(ScopeSuccessTest)
 add_test_suite(UniqueResourceTest)
 
 
 add_custom_target(unittest ScopeExitTest
+                    COMMAND ScopeSuccessTest
                     COMMAND UniqueResourceTest
                     COMMENT "Running unittests\n\n"
                     VERBATIM

test/ScopeSuccessTest.cpp

@@ -0,0 +1,157 @@
+/*
+ * Scope Guard
+ * Copyright (C) 2017  offa
+ *
+ * This file is part of Scope Guard.
+ *
+ * Scope Guard is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Scope Guard is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Scope Guard.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "scope_success.h"
+#include <catch.hpp>
+#include <trompeloeil.hpp>
+
+using namespace trompeloeil;
+
+namespace
+{
+    struct CallMock
+    {
+        MAKE_MOCK0(deleter, void());
+    };
+
+
+    struct ThrowOnCopyMock
+    {
+        ThrowOnCopyMock() {  }
+
+        ThrowOnCopyMock(const ThrowOnCopyMock&)
+        {
+            throw std::exception{};
+        }
+
+        MAKE_CONST_MOCK0(deleter, void());
+
+        void operator()() const
+        {
+            this->deleter();
+        }
+
+        ThrowOnCopyMock& operator=(const ThrowOnCopyMock&)
+        {
+            throw std::exception{};
+        }
+    };
+
+
+    struct NotNothrowMoveMock
+    {
+        NotNothrowMoveMock(CallMock* m) : m_mock(m) { }
+        NotNothrowMoveMock(const NotNothrowMoveMock& other) : m_mock(other.m_mock)  { }
+        NotNothrowMoveMock(NotNothrowMoveMock&& other) noexcept(false) : m_mock(other.m_mock) { }
+
+        void operator()() const
+        {
+            m_mock->deleter();
+        }
+
+        NotNothrowMoveMock& operator=(const NotNothrowMoveMock&)
+        {
+            throw "Not implemented";
+        }
+
+        NotNothrowMoveMock& operator=(NotNothrowMoveMock&&)
+        {
+            throw "Not implemented";
+        }
+
+        CallMock* m_mock;
+
+    };
+
+
+    CallMock m;
+
+
+    void deleter()
+    {
+        m.deleter();
+    }
+}
+
+
+TEST_CASE("deleter called on destruction", "[ScopeSuccess]")
+{
+    REQUIRE_CALL(m, deleter());
+    auto guard = sr::make_scope_success(deleter);
+    static_cast<void>(guard);
+}
+
+TEST_CASE("deleter lambda called on destruction", "[ScopeSuccess]")
+{
+    CallMock cm;
+    REQUIRE_CALL(cm, deleter());
+    auto guard = sr::make_scope_success([&cm] { cm.deleter(); });
+    static_cast<void>(guard);
+}
+
+TEST_CASE("deleter called and rethrow on copy exception", "[ScopeSuccess]")
+{
+    REQUIRE_THROWS([] {
+        const ThrowOnCopyMock noMove;
+        sr::scope_success<decltype(noMove)> guard{noMove};
+        }());
+}
+
+TEST_CASE("deleter is not called if released", "[ScopeSuccess]")
+{
+   REQUIRE_CALL(m, deleter()).TIMES(0);
+   auto guard = sr::make_scope_success(deleter);
+   guard.release();
+}
+
+TEST_CASE("move releases moved-from object", "[ScopeSuccess]")
+{
+    REQUIRE_CALL(m, deleter());
+    auto movedFrom = sr::make_scope_success(deleter);
+    auto guard = std::move(movedFrom);
+    static_cast<void>(guard);
+}
+
+TEST_CASE("move with copy init releases moved-from object", "[ScopeSuccess]")
+{
+    CallMock mock;
+    const NotNothrowMoveMock notNothrow{&mock};
+    REQUIRE_CALL(mock, deleter());
+    sr::scope_success<decltype(notNothrow)> movedFrom{notNothrow};
+    auto guard = std::move(movedFrom);
+}
+
+TEST_CASE("move transfers state", "[ScopeSuccess]")
+{
+    REQUIRE_CALL(m, deleter());
+    auto movedFrom = sr::make_scope_success(deleter);
+    auto guard = std::move(movedFrom);
+    static_cast<void>(guard);
+}
+
+TEST_CASE("move transfers state if released", "[ScopeSuccess]")
+{
+    REQUIRE_CALL(m, deleter()).TIMES(0);
+    auto movedFrom = sr::make_scope_success(deleter);
+    movedFrom.release();
+    auto guard = std::move(movedFrom);
+    static_cast<void>(guard);
+}
+