3rd-party/catch2
1
0
Fork 0
mirror of https://github.com/catchorg/Catch2.git synced 2025-08-01 12:55:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

Final set of fixes for floating matchers approvals

Browse Source
This commit is contained in:
Martin Hořeňovský
2017-11-10 21:43:23 +01:00
parent a0dbc62955
commit 8dbaac61ff
5 changed files with 70 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
include/internal/catch_matchers_floating.cpp
View File

@@ -6,8 +6,9 @@
*/
#include "catch_matchers_floating.h"
#include "catch_tostring.h"
#include <cmath>
#include <cstdlib>
#include <cstdint>
#include <cstring>
#include <stdexcept>
@@ -87,7 +88,7 @@ namespace Floating {
}
std::string WithinAbsMatcher::describe() const {
return "is within " + std::to_string(m_margin) + " of " + std::to_string(m_target);
return "is within " + ::Catch::Detail::stringify(m_margin) + " of " + ::Catch::Detail::stringify(m_target);
}
@@ -110,7 +111,7 @@ namespace Floating {
}
std::string WithinUlpsMatcher::describe() const {
return "is within " + std::to_string(m_ulps) + " ULPs of " + std::to_string(m_target) + ((m_type == FloatingPointKind::Float)? "f" : "");
return "is within " + std::to_string(m_ulps) + " ULPs of " + ::Catch::Detail::stringify(m_target) + ((m_type == FloatingPointKind::Float)? "f" : "");
}
}// namespace Floating

5
include/internal/catch_tostring.cpp
View File

@@ -17,6 +17,7 @@
#include "catch_interfaces_config.h"
#include "catch_context.h"
#include <cmath>
#include <iomanip>
namespace Catch {
@@ -63,6 +64,10 @@ namespace Detail {
template<typename T>
std::string fpToString( T value, int precision ) {
if (std::isnan(value)) {
return "nan";
}
ReusableStringStream rss;
rss << std::setprecision( precision )
<< std::fixed