iqbalrifai
/
Aegisub
mirror of https://github.com/odrling/Aegisub
1
0
Fork 0
Code Issues Releases Wiki Activity

Fixes for internal logical consistency of exception.h. (Make sure we can actually support inner exceptions in all cases.) 

Also make it follow the AGI_PRE pattern.

Originally committed to SVN as r3526.
This commit is contained in:
Niels Martin Hansen 2009-09-11 02:46:01 +00:00
parent 774fb0f674
commit a3bf534b5e
1 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
aegisub/src/include/aegisub/exception.h
View File

@ -108,7 +108,13 @@ namespace Aegisub {
/// ///
/// Deriving classes should always use this constructor for initialising /// Deriving classes should always use this constructor for initialising
/// the base class. /// the base class.
Exception(const wxString &msg, Exception *inr = 0) : message(msg), inner(inr) { } Exception(const wxString &msg, const Exception *inr = 0)
: message(msg)
, inner(0)
{
if (inr)
inner = inr->Copy();
}
/// @brief Default constructor, not implemented /// @brief Default constructor, not implemented
/// ///
@ -118,9 +124,12 @@ namespace Aegisub {
/// @brief Destructor /// @brief Destructor
/// ///
/// The inner exception is expected to live on the stack or a similar place /// The inner exception is expected to have been duplicated in our constructor
/// and it must not be deleted. /// and thus be owned by us.
virtual ~Exception() { } virtual ~Exception()
{
delete inner;
}
public: public:
@ -155,6 +164,13 @@ namespace Aegisub {
/// @brief Convert to wxString as the error message /// @brief Convert to wxString as the error message
/// @return The error message /// @return The error message
operator wxString () { return GetMessage(); } operator wxString () { return GetMessage(); }
/// @brief Create a copy of the exception allocated on the heap
/// @return A heap-allocated exception object
///
/// All deriving classes must implement this explicitly to avoid losing
/// information in the duplication.
virtual Exception *Copy() const = 0;
}; };
@ -179,6 +195,7 @@ namespace Aegisub {
public: \ public: \
classname(const wxString &msg) : baseclass(msg) { } \ classname(const wxString &msg) : baseclass(msg) { } \
const wxChar * GetName() const { return _T(displayname); } \ const wxChar * GetName() const { return _T(displayname); } \
Exception * Copy() const { return new classname(*this); } \
}; };
/// @brief Convenience macro for declaring exceptions supporting inner exceptions /// @brief Convenience macro for declaring exceptions supporting inner exceptions
@ -193,6 +210,7 @@ namespace Aegisub {
public: \ public: \
classname(const wxString &msg, Exception *inner) : baseclass(msg, inner) { } \ classname(const wxString &msg, Exception *inner) : baseclass(msg, inner) { } \
const wxChar * GetName() const { return _T(displayname); } \ const wxChar * GetName() const { return _T(displayname); } \
Exception * Copy() const { return new classname(*this); } \
}; };
/// @brief Macro for declaring non-instantiable exception base classes /// @brief Macro for declaring non-instantiable exception base classes
@ -276,6 +294,9 @@ namespace Aegisub {
// Not documented, see Aegisub::Exception class // Not documented, see Aegisub::Exception class
const wxChar * GetName() const { return _T("filesystem/not_accessible/not_found"); } const wxChar * GetName() const { return _T("filesystem/not_accessible/not_found"); }
// Not documented, see Aegisub::Exception class
Exception * Copy() const { return new FileNotFoundError(*this); } \
}; };