added wxScopeGuard; test it in the sample

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21694 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/scopeguard.h b/include/wx/scopeguard.h
new file mode 100644 (file)
index 0000000..2b794dc
--- /dev/null
+++ b/include/wx/scopeguard.h
@@ -0,0 +1,325 @@
+///////////////////////////////////////////////////////////////////////////////
+// Name:        wx/scopeguard.h
+// Purpose:     declares wxwxScopeGuard and related macros
+// Author:      Vadim Zeitlin
+// Modified by:
+// Created:     03.07.2003
+// RCS-ID:      $Id$
+// Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwindows.org>
+// Licence:     wxWindows licence
+///////////////////////////////////////////////////////////////////////////////
+
+/*
+    Acknowledgements: this header is heavily based on (well, almost the exact
+    copy of) wxScopeGuard.h by Andrei Alexandrescu and Petru Marginean published
+    in December 2000 issue of C/C++ Users Journal.
+ */
+
+#ifndef _WX_SCOPEGUARD_H_
+#define _WX_SCOPEGUARD_H_
+
+#include "wx/defs.h"
+
+// ----------------------------------------------------------------------------
+// helpers
+// ----------------------------------------------------------------------------
+
+namespace wxPrivate
+{
+    // in the original implementation this was a member template function of
+    // ScopeGuardImplBase but gcc 2.8 which is still used for OS/2 doesn't
+    // support member templates and so we must make it global
+    template <typename ScopeGuardImpl>
+    void OnScopeExit(ScopeGuardImpl& guard) 
+    {
+        if ( !guard.WasDismissed() )
+        {
+            // we're called from ScopeGuardImpl dtor and so we must not throw
+#if wxUSE_EXCEPTIONS
+            try
+#endif // wxUSE_EXCEPTIONS
+            {
+                guard.Execute();
+            }
+#if wxUSE_EXCEPTIONS
+            catch ( ... )
+            {
+            }
+#endif // wxUSE_EXCEPTIONS
+        }
+    }
+
+    // just to avoid the warning about unused variables
+    template <typename T>
+    void Use(const T& WXUNUSED(t))
+    {
+    }
+} // namespace wxPrivate
+    
+// ============================================================================
+// wxScopeGuard for functions and functors
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// wxScopeGuardImplBase: used by wxScopeGuardImpl[0..N] below
+// ----------------------------------------------------------------------------
+
+class wxScopeGuardImplBase
+{
+public:
+    wxScopeGuardImplBase() : m_wasDismissed(false) { }
+
+    void Dismiss() const { m_wasDismissed = true; }
+
+    // for OnScopeExit() only we can't make it friend, unfortunately)!
+    bool WasDismissed() const { return m_wasDismissed; }
+
+protected:
+    ~wxScopeGuardImplBase() { }
+
+    wxScopeGuardImplBase(const wxScopeGuardImplBase& other) 
+        : m_wasDismissed(other.m_wasDismissed)
+    {
+        other.Dismiss();
+    }
+
+    // must be mutable for copy ctor to work
+    mutable bool m_wasDismissed;
+
+private:
+    wxScopeGuardImplBase& operator=(const wxScopeGuardImplBase&);
+};
+
+// ----------------------------------------------------------------------------
+// wxScopeGuardImpl0: scope guard for actions without parameters
+// ----------------------------------------------------------------------------
+
+template <typename F>
+class wxScopeGuardImpl0 : public wxScopeGuardImplBase
+{
+public:
+    static wxScopeGuardImpl0<F> MakeGuard(F fun)
+    {
+        return wxScopeGuardImpl0<F>(fun);
+    }
+
+    ~wxScopeGuardImpl0() { wxPrivate::OnScopeExit(*this); }
+
+    void Execute() { m_fun(); }
+
+protected:
+    wxScopeGuardImpl0(F fun) : m_fun(fun) { }
+
+    F m_fun;
+
+    wxScopeGuardImpl0& operator=(const wxScopeGuardImpl0&);
+};
+
+template <typename F> 
+inline wxScopeGuardImpl0<F> wxMakeGuard(F fun)
+{
+    return wxScopeGuardImpl0<F>::MakeGuard(fun);
+}
+
+// ----------------------------------------------------------------------------
+// wxScopeGuardImpl1: scope guard for actions with 1 parameter
+// ----------------------------------------------------------------------------
+
+template <typename F, typename P1>
+class wxScopeGuardImpl1 : public wxScopeGuardImplBase
+{
+public:
+    static wxScopeGuardImpl1<F, P1> MakeGuard(F fun, P1 p1)
+    {
+        return wxScopeGuardImpl1<F, P1>(fun, p1);
+    }
+
+    ~wxScopeGuardImpl1() { wxPrivate::OnScopeExit(*this); }
+
+    void Execute() { m_fun(m_p1); }
+
+protected:
+    wxScopeGuardImpl1(F fun, P1 p1) : m_fun(fun), m_p1(p1) { }
+
+    F m_fun;
+    const P1 m_p1;
+
+    wxScopeGuardImpl1& operator=(const wxScopeGuardImpl1&);
+};
+
+template <typename F, typename P1> 
+inline wxScopeGuardImpl1<F, P1> wxMakeGuard(F fun, P1 p1)
+{
+    return wxScopeGuardImpl1<F, P1>::MakeGuard(fun, p1);
+}
+
+// ----------------------------------------------------------------------------
+// wxScopeGuardImpl2: scope guard for actions with 2 parameters
+// ----------------------------------------------------------------------------
+
+template <typename F, typename P1, typename P2>
+class wxScopeGuardImpl2 : public wxScopeGuardImplBase
+{
+public:
+    static wxScopeGuardImpl2<F, P1, P2> MakeGuard(F fun, P1 p1, P2 p2)
+    {
+        return wxScopeGuardImpl2<F, P1, P2>(fun, p1, p2);
+    }
+
+    ~wxScopeGuardImpl2() { wxPrivate::OnScopeExit(*this); }
+
+    void Execute() { m_fun(m_p1, m_p2); }
+
+protected:
+    wxScopeGuardImpl2(F fun, P1 p1, P2 p2) : m_fun(fun), m_p1(p1), m_p2(p2) { }
+
+    F m_fun;
+    const P1 m_p1;
+    const P2 m_p2;
+
+    wxScopeGuardImpl2& operator=(const wxScopeGuardImpl2&);
+};
+
+template <typename F, typename P1, typename P2>
+inline wxScopeGuardImpl2<F, P1, P2> wxMakeGuard(F fun, P1 p1, P2 p2)
+{
+    return wxScopeGuardImpl2<F, P1, P2>::MakeGuard(fun, p1, p2);
+}
+
+// ============================================================================
+// wxScopeGuards for object methods
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// wxObjScopeGuardImpl0
+// ----------------------------------------------------------------------------
+
+template <class Obj, typename MemFun>
+class wxObjScopeGuardImpl0 : public wxScopeGuardImplBase
+{
+public:
+    static wxObjScopeGuardImpl0<Obj, MemFun>
+        MakeObjGuard(Obj& obj, MemFun memFun)
+    {
+        return wxObjScopeGuardImpl0<Obj, MemFun>(obj, memFun);
+    }
+
+    ~wxObjScopeGuardImpl0() { wxPrivate::OnScopeExit(*this); }
+
+    void Execute() { (m_obj.*m_memfun)(); }
+
+protected:
+    wxObjScopeGuardImpl0(Obj& obj, MemFun memFun)
+        : m_obj(obj), m_memfun(memFun) { }
+
+    Obj& m_obj;
+    MemFun m_memfun;
+};
+
+template <class Obj, typename MemFun>
+inline wxObjScopeGuardImpl0<Obj, MemFun> wxMakeObjGuard(Obj& obj, MemFun memFun)
+{
+    return wxObjScopeGuardImpl0<Obj, MemFun>::MakeObjGuard(obj, memFun);
+}
+
+template <class Obj, typename MemFun, typename P1>
+class wxObjScopeGuardImpl1 : public wxScopeGuardImplBase
+{
+public:
+    static wxObjScopeGuardImpl1<Obj, MemFun, P1>
+        MakeObjGuard(Obj& obj, MemFun memFun, P1 p1)
+    {
+        return wxObjScopeGuardImpl1<Obj, MemFun, P1>(obj, memFun, p1);
+    }
+
+    ~wxObjScopeGuardImpl1() { wxPrivate::OnScopeExit(*this); }
+
+    void Execute() { (m_obj.*m_memfun)(m_p1); }
+
+protected:
+    wxObjScopeGuardImpl1(Obj& obj, MemFun memFun, P1 p1) 
+        : m_obj(obj), m_memfun(memFun), m_p1(p1) { }
+
+    Obj& m_obj;
+    MemFun m_memfun;
+    const P1 m_p1;
+};
+
+template <class Obj, typename MemFun, typename P1>
+inline wxObjScopeGuardImpl1<Obj, MemFun, P1>
+wxMakeObjGuard(Obj& obj, MemFun memFun, P1 p1)
+{
+    return wxObjScopeGuardImpl1<Obj, MemFun, P1>::MakeObjGuard(obj, memFun, p1);
+}
+
+template <class Obj, typename MemFun, typename P1, typename P2>
+class wxObjScopeGuardImpl2 : public wxScopeGuardImplBase
+{
+public:
+    static wxObjScopeGuardImpl2<Obj, MemFun, P1, P2>
+        MakeObjGuard(Obj& obj, MemFun memFun, P1 p1, P2 p2)
+    {
+        return wxObjScopeGuardImpl2<Obj, MemFun, P1, P2>(obj, memFun, p1, p2);
+    }
+
+    ~wxObjScopeGuardImpl2() { wxPrivate::OnScopeExit(*this); }
+
+    void Execute() { (m_obj.*m_memfun)(m_p1, m_p2); }
+
+protected:
+    wxObjScopeGuardImpl2(Obj& obj, MemFun memFun, P1 p1, P2 p2) 
+        : m_obj(obj), m_memfun(memFun), m_p1(p1), m_p2(p2) { }
+
+    Obj& m_obj;
+    MemFun m_memfun;
+    const P1 m_p1;
+    const P2 m_p2;
+};
+
+template <class Obj, typename MemFun, typename P1, typename P2>
+inline wxObjScopeGuardImpl2<Obj, MemFun, P1, P2>
+wxMakeObjGuard(Obj& obj, MemFun memFun, P1 p1, P2 p2)
+{
+    return wxObjScopeGuardImpl2<Obj, MemFun, P1, P2>::
+                                            MakeObjGuard(obj, memFun, p1, p2);
+}
+
+// ============================================================================
+// public stuff
+// ============================================================================
+
+// wxScopeGuard is just a reference, see the explanation in CUJ article
+typedef const wxScopeGuardImplBase& wxScopeGuard;
+
+// when an unnamed scope guard is needed, the macros below may be used
+//
+// NB: the original code has a single (and much nicer) ON_BLOCK_EXIT macro
+//     but this results in compiler warnings about unused variables and I
+//     didn't find a way to work around this other than by having different
+//     macros with different names
+#define ON_BLOCK_EXIT0(f) \
+    wxScopeGuard wxMAKE_UNIQUE_NAME(scopeGuard) = wxMakeGuard(f); \
+    wxPrivate::Use(wxMAKE_UNIQUE_NAME(scopeGuard))
+
+#define ON_BLOCK_EXIT_OBJ0(o, m) \
+    wxScopeGuard wxMAKE_UNIQUE_NAME(scopeGuard) = wxMakeObjGuard(o, m); \
+    wxPrivate::Use(wxMAKE_UNIQUE_NAME(scopeGuard))
+
+#define ON_BLOCK_EXIT1(f, p1) \
+    wxScopeGuard wxMAKE_UNIQUE_NAME(scopeGuard) = wxMakeGuard(f, p1); \
+    wxPrivate::Use(wxMAKE_UNIQUE_NAME(scopeGuard))
+
+#define ON_BLOCK_EXIT_OBJ1(o, m, p1) \
+    wxScopeGuard wxMAKE_UNIQUE_NAME(scopeGuard) = wxMakeObjGuard(o, m, p1); \
+    wxPrivate::Use(wxMAKE_UNIQUE_NAME(scopeGuard))
+
+#define ON_BLOCK_EXIT2(f, p1, p2) \
+    wxScopeGuard wxMAKE_UNIQUE_NAME(scopeGuard) = wxMakeGuard(f, p1, p2); \
+    wxPrivate::Use(wxMAKE_UNIQUE_NAME(scopeGuard))
+
+#define ON_BLOCK_EXIT_OBJ2(o, m, p1, p2) \
+    wxScopeGuard wxMAKE_UNIQUE_NAME(scopeGuard) = wxMakeObjGuard(o, m, p1, p2); \
+    wxPrivate::Use(wxMAKE_UNIQUE_NAME(scopeGuard))
+
+#endif // _WX_SCOPEGUARD_H_
+

diff --git a/samples/console/console.cpp b/samples/console/console.cpp
index 8f932dcdd74fa19456eba10ebfc2f23b5cecb6d4..7fbf76d4642d4b3d95cf4067f52cd47b43ba54d9 100644 (file)
--- a/samples/console/console.cpp
+++ b/samples/console/console.cpp
@@ -95,7 +95,7 @@
     #undef TEST_ALL
     static const bool TEST_ALL = true;
 #else
-    #define TEST_FILECONF
+    #define TEST_LOG
 
     static const bool TEST_ALL = false;
 #endif
@@ -2985,6 +2985,38 @@ static void TestRegistryAssociation()
 
 #endif // TEST_REGISTRY
 
+// ----------------------------------------------------------------------------
+// scope guard
+// ----------------------------------------------------------------------------
+
+#include "wx/scopeguard.h"
+
+static void function0() { puts("function0()"); }
+static void function1(int n) { printf("function1(%d)\n", n); }
+static void function2(double x, char c) { printf("function2(%g, %c)\n", x, c); }
+
+struct Object
+{
+    void method0() { printf("method0()\n"); }
+    void method1(int n) { printf("method1(%d)\n", n); }
+    void method2(double x, char c) { printf("method2(%g, %c)\n", x, c); }
+};
+
+static void TestScopeGuard()
+{
+    ON_BLOCK_EXIT0(function0);
+    ON_BLOCK_EXIT1(function1, 17);
+    ON_BLOCK_EXIT2(function2, 3.14, 'p');
+
+    Object obj;
+    ON_BLOCK_EXIT_OBJ0(obj, Object::method0);
+    ON_BLOCK_EXIT_OBJ1(obj, Object::method1, 7);
+    ON_BLOCK_EXIT_OBJ2(obj, Object::method2, 2.71, 'e');
+
+    wxScopeGuard dismissed = wxMakeGuard(function0);
+    dismissed.Dismiss();
+}
+
 // ----------------------------------------------------------------------------
 // sockets
 // ----------------------------------------------------------------------------