Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Catch Switch Added #815

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Catch Switch Added #815

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c9c7a85
try catch blocks inside if statements
CodeMaxx Feb 26, 2016
9e220c1
Merge remote-tracking branch 'upstream/master' into catch
CodeMaxx Feb 26, 2016
ec28c85
Added Catch Swith
CodeMaxx Feb 26, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
14 changes: 14 additions & 0 deletions CMakeLists.txt
View file
Open in desktop
Expand Up @@ -135,6 +135,10 @@ if (WITH_PRIMESIEVE)
set(PKGS ${PKGS} "PRIMESIEVE")
endif()

# CATCH
set(WITH_CATCH no
CACHE BOOL "Build with Catch")

# FLINT
set(WITH_FLINT no
CACHE BOOL "Build with Flint")
Expand All @@ -155,6 +159,14 @@ set(WITH_MPC no
CACHE BOOL "Build with MPC")
set(HAVE_SYMENGINE_MPC False)

if (WITH_CATCH)
set(HAVE_SYMENGINE_CATCH True)
endif()

if (DEFINED HAVE_SYENGINE_CATCH)
add_definitions( -DHAVE_SYMENGINE_CATCH=$(HAVE_SYMENGINE_CATCH) )
endif()

if (WITH_FLINT)
find_package(FLINT REQUIRED)
include_directories(${FLINT_INCLUDE_DIRS})
Expand Down Expand Up @@ -484,6 +496,8 @@ if (WITH_PRIMESIEVE)
message("PRIMESIEVE_LIBRARIES: ${PRIMESIEVE_LIBRARIES}")
endif()

message("WITH_CATCH: ${WITH_CATCH}")

message("WITH_FLINT: ${WITH_FLINT}")
if (WITH_FLINT)
message("FLINT_INCLUDE_DIRS: ${FLINT_INCLUDE_DIRS}")
Expand Down
43 changes: 38 additions & 5 deletions symengine/utilities/catch/catch.hpp
View file
Open in desktop
Expand Up @@ -1619,14 +1619,15 @@ namespace Catch {
#define INTERNAL_CATCH_THROWS( expr, resultDisposition, macroName ) \
do { \
Catch::ResultBuilder __catchResult( macroName, CATCH_INTERNAL_LINEINFO, #expr, resultDisposition ); \
if( __catchResult.allowThrows() ) \
if( __catchResult.allowThrows() ) { \
try { \
expr; \
__catchResult.captureResult( Catch::ResultWas::DidntThrowException ); \
} \
catch( ... ) { \
__catchResult.captureResult( Catch::ResultWas::Ok ); \
} \
} \
else \
__catchResult.captureResult( Catch::ResultWas::Ok ); \
INTERNAL_CATCH_REACT( __catchResult ) \
Expand All @@ -1636,7 +1637,7 @@ namespace Catch {
#define INTERNAL_CATCH_THROWS_AS( expr, exceptionType, resultDisposition, macroName ) \
do { \
Catch::ResultBuilder __catchResult( macroName, CATCH_INTERNAL_LINEINFO, #expr, resultDisposition ); \
if( __catchResult.allowThrows() ) \
if( __catchResult.allowThrows() ) { \
try { \
expr; \
__catchResult.captureResult( Catch::ResultWas::DidntThrowException ); \
Expand All @@ -1647,6 +1648,7 @@ namespace Catch {
catch( ... ) { \
__catchResult.useActiveException( resultDisposition ); \
} \
} \
else \
__catchResult.captureResult( Catch::ResultWas::Ok ); \
INTERNAL_CATCH_REACT( __catchResult ) \
Expand Down Expand Up @@ -2086,12 +2088,16 @@ namespace Catch {
{}

virtual std::string translate() const {
#ifdef HAVE_SYMENGINE_CATCH
try {
#endif
throw;
#ifdef HAVE_SYMENGINE_CATCH
}
catch( T& ex ) {
return m_translateFunction( ex );
}
#endif
}

protected:
Expand Down Expand Up @@ -4030,8 +4036,9 @@ namespace Clara {
typename std::vector<Arg>::const_iterator it = m_options.begin(), itEnd = m_options.end();
for(; it != itEnd; ++it ) {
Arg const& arg = *it;

#ifdef HAVE_SYMENGINE_CATCH
try {
#endif
if( ( token.type == Parser::Token::ShortOpt && arg.hasShortName( token.data ) ) ||
( token.type == Parser::Token::LongOpt && arg.hasLongName( token.data ) ) ) {
if( arg.takesArg() ) {
Expand All @@ -4045,10 +4052,12 @@ namespace Clara {
}
break;
}
#ifdef HAVE_SYMENGINE_CATCH
}
catch( std::exception& ex ) {
errors.push_back( std::string( ex.what() ) + "\n- while parsing: (" + arg.commands() + ")" );
}
#endif
}
if( it == itEnd ) {
if( token.type == Parser::Token::Positional || !m_throwOnUnrecognisedTokens )
Expand Down Expand Up @@ -5378,7 +5387,9 @@ namespace Catch {
m_reporter->sectionStarting( testCaseSection );
Counts prevAssertions = m_totals.assertions;
double duration = 0;
#ifdef HAVE_SYMENGINE_CATCH
try {
#endif
m_lastAssertionInfo = AssertionInfo( "TEST_CASE", testCaseInfo.lineInfo, "", ResultDisposition::Normal );
TestCaseTracker::Guard guard( *m_testCaseTracker );

Expand All @@ -5393,13 +5404,15 @@ namespace Catch {
invokeActiveTestCase();
}
duration = timer.getElapsedSeconds();
#ifdef HAVE_SYMENGINE_CATCH
}
catch( TestFailureException& ) {
// This just means the test was aborted due to failure
}
catch(...) {
makeUnexpectedResultBuilder().useActiveException();
}
#endif
handleUnfinishedSections();
m_messages.clear();

Expand Down Expand Up @@ -5630,12 +5643,15 @@ namespace Catch {
}

int applyCommandLine( int argc, char* const argv[], OnUnusedOptions::DoWhat unusedOptionBehaviour = OnUnusedOptions::Fail ) {
#ifdef HAVE_SYMENGINE_CATCH
try {
#endif
m_cli.setThrowOnUnrecognisedTokens( unusedOptionBehaviour == OnUnusedOptions::Fail );
m_unusedTokens = m_cli.parseInto( argc, argv, m_configData );
if( m_configData.showHelp )
showHelp( m_configData.processName );
m_config.reset();
#ifdef HAVE_SYMENGINE_CATCH
}
catch( std::exception& ex ) {
{
Expand All @@ -5647,6 +5663,7 @@ namespace Catch {
m_cli.usage( Catch::cout(), m_configData.processName );
return (std::numeric_limits<int>::max)();
}
#endif
return 0;
}

Expand All @@ -5666,9 +5683,10 @@ namespace Catch {
int run() {
if( m_configData.showHelp )
return 0;

#ifdef HAVE_SYMENGINE_CATCH
try
{
#endif
config(); // Force config to be constructed

std::srand( m_configData.rngSeed );
Expand All @@ -5680,11 +5698,14 @@ namespace Catch {
return static_cast<int>( *listed );

return static_cast<int>( runner.runTests().assertions.failed );
#ifdef HAVE_SYMENGINE_CATCH
}
catch( std::exception& ex ) {
Catch::cerr() << ex.what() << std::endl;
return (std::numeric_limits<int>::max)();
}
#endif
return 0;
}

Clara::CommandLine<ConfigData> const& cli() const {
Expand Down Expand Up @@ -5921,7 +5942,9 @@ namespace Catch {
}

virtual std::string translateActiveException() const {
#ifdef HAVE_SYMENGINE_CATCH
try {
#endif
#ifdef __OBJC__
// In Objective-C try objective-c exceptions first
@try {
Expand All @@ -5933,6 +5956,7 @@ namespace Catch {
#else
throw;
#endif
#ifdef HAVE_SYMENGINE_CATCH
}
catch( TestFailureException& ) {
throw;
Expand All @@ -5949,18 +5973,23 @@ namespace Catch {
catch(...) {
return tryTranslators( m_translators.begin() );
}
#endif
return "";
}

std::string tryTranslators( std::vector<const IExceptionTranslator*>::const_iterator it ) const {
if( it == m_translators.end() )
return "Unknown exception";

#ifdef HAVE_SYMENGINE_CATCH
try {
#endif
return (*it)->translate();
#ifdef HAVE_SYMENGINE_CATCH
}
catch(...) {
return tryTranslators( it+1 );
}
#endif
}

private:
Expand Down Expand Up @@ -7553,14 +7582,18 @@ namespace Catch {
ITagAliasRegistry const& ITagAliasRegistry::get() { return TagAliasRegistry::get(); }

RegistrarForTagAliases::RegistrarForTagAliases( char const* alias, char const* tag, SourceLineInfo const& lineInfo ) {
#ifdef HAVE_SYMENGINE_CATCH
try {
#endif
TagAliasRegistry::get().add( alias, tag, lineInfo );
#ifdef HAVE_SYMENGINE_CATCH
}
catch( std::exception& ex ) {
Colour colourGuard( Colour::Red );
Catch::cerr() << ex.what() << std::endl;
exit(1);
}
#endif
}

} // end namespace Catch
Expand Down