3rd-party/catch2
1
0
Fork 0
mirror of https://github.com/catchorg/Catch2.git synced 2024-11-22 21:36:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Small defensive tweak on checking expression

Browse Source
This commit is contained in:
Phil Nash 2011-03-01 09:55:17 +00:00
parent e401601ac1
commit 01234172a9
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
internal/catch_resultinfo.hpp
View File

@ -44,7 +44,7 @@ namespace Catch
m_filename( filename ), m_filename( filename ),
m_line( line ), m_line( line ),
m_expr( expr ), m_expr( expr ),
m_op( m_expr[0] == '!' ? "!" : "" ), m_op( isNotExpression( expr ) ? "!" : "" ),
m_result( result ), m_result( result ),
m_isNot( isNot ), m_isNot( isNot ),
m_expressionIncomplete( false ) m_expressionIncomplete( false )
@ -152,6 +152,15 @@ namespace Catch
else else
return "{can't expand - use " + m_macroName + "_NOT( " + m_expr.substr(1) + " ) instead of " + m_macroName + "( " + m_expr + " ) for better diagnostics}"; return "{can't expand - use " + m_macroName + "_NOT( " + m_expr.substr(1) + " ) instead of " + m_macroName + "( " + m_expr + " ) for better diagnostics}";
} }
///////////////////////////////////////////////////////////////////////////
bool isNotExpression
(
const char* expr
)
{
return expr && expr[0] == '!';
}
protected: protected:
std::string m_macroName; std::string m_macroName;