3rd-party/catch2
1
0
Fork 0
mirror of https://github.com/catchorg/Catch2.git synced 2025-10-31 20:27:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Introduce stubs for throwing specific exception types

Browse Source 
This allows us to move <stdexcept> out of the common path, and replace
it with just <exception>. The difference between these two headers is
~13k lines after preprocessing on libstdc++ (16k vs 3k) and ~17k lines
for MS's STL(33k vs 16k).

Note that this is only beneficial if no other stdlib header we use
includes <stdexcept>. AFAIK this is true for the newest MS's STL,
but I have no idea of the applicability for libstdc++ and libc++.
This commit is contained in:
Martin Hořeňovský
2019-06-14 14:59:19 +02:00
parent f0b7b0ca11
commit 1967feac49
2 changed files with 44 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
include/internal/catch_enforce.cpp
View File

@@ -7,6 +7,9 @@
#include "catch_enforce.h" #include "catch_enforce.h"
#include <stdexcept>
namespace Catch { namespace Catch {
#if defined(CATCH_CONFIG_DISABLE_EXCEPTIONS) && !defined(CATCH_CONFIG_DISABLE_EXCEPTIONS_CUSTOM_HANDLER) #if defined(CATCH_CONFIG_DISABLE_EXCEPTIONS) && !defined(CATCH_CONFIG_DISABLE_EXCEPTIONS_CUSTOM_HANDLER)
[[noreturn]] [[noreturn]]
@@ -16,4 +19,22 @@ namespace Catch {
std::terminate(); std::terminate();
} }
#endif #endif
[[noreturn]]
void throw_logic_error(std::string const& msg) {
throw_exception(std::logic_error(msg));
}
[[noreturn]]
void throw_domain_error(std::string const& msg) {
throw_exception(std::domain_error(msg));
}
[[noreturn]]
void throw_runtime_error(std::string const& msg) {
throw_exception(std::runtime_error(msg));
}
} // namespace Catch; } // namespace Catch;

35
include/internal/catch_enforce.h
View File

@@ -11,8 +11,7 @@
#include "catch_compiler_capabilities.h" #include "catch_compiler_capabilities.h"
#include "catch_stream.h" #include "catch_stream.h"
#include <exception>
#include <stdexcept>
namespace Catch { namespace Catch {
#if !defined(CATCH_CONFIG_DISABLE_EXCEPTIONS) #if !defined(CATCH_CONFIG_DISABLE_EXCEPTIONS)
@@ -25,18 +24,30 @@ namespace Catch {
[[noreturn]] [[noreturn]]
void throw_exception(std::exception const& e); void throw_exception(std::exception const& e);
#endif #endif
[[noreturn]]
void throw_logic_error(std::string const& msg);
[[noreturn]]
void throw_domain_error(std::string const& msg);
[[noreturn]]
void throw_runtime_error(std::string const& msg);
} // namespace Catch; } // namespace Catch;
#define CATCH_PREPARE_EXCEPTION( type, msg ) \ #define CATCH_MAKE_MSG(...) \
type( ( Catch::ReusableStringStream() << msg ).str() ) (Catch::ReusableStringStream() << __VA_ARGS__).str()
#define CATCH_INTERNAL_ERROR( msg ) \
Catch::throw_exception(CATCH_PREPARE_EXCEPTION( std::logic_error, CATCH_INTERNAL_LINEINFO << ": Internal Catch error: " << msg)) #define CATCH_INTERNAL_ERROR(...) \
#define CATCH_ERROR( msg ) \ Catch::throw_logic_error(CATCH_MAKE_MSG( CATCH_INTERNAL_LINEINFO << ": Internal Catch2 error: " << __VA_ARGS__));
Catch::throw_exception(CATCH_PREPARE_EXCEPTION( std::domain_error, msg ))
#define CATCH_RUNTIME_ERROR( msg ) \ #define CATCH_ERROR(...) \
Catch::throw_exception(CATCH_PREPARE_EXCEPTION( std::runtime_error, msg )) Catch::throw_domain_error(CATCH_MAKE_MSG( __VA_ARGS__ ));
#define CATCH_ENFORCE( condition, msg ) \
do{ if( !(condition) ) CATCH_ERROR( msg ); } while(false) #define CATCH_RUNTIME_ERROR(...) \
Catch::throw_runtime_error(CATCH_MAKE_MSG( __VA_ARGS__ ));
#define CATCH_ENFORCE( condition, ... ) \
do{ if( !(condition) ) CATCH_ERROR( __VA_ARGS__ ); } while(false)
#endif // TWOBLUECUBES_CATCH_ENFORCE_H_INCLUDED #endif // TWOBLUECUBES_CATCH_ENFORCE_H_INCLUDED