fmtlib/fmt
1
0
Fork 1
mirror of https://github.com/fmtlib/fmt.git synced 2025-07-29 18:27:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

Don't include <cassert>. (#2148)

Browse Source 
This commit replaces use of the assert() macro in format-inl.h with
FMT_ASSERT(). This allows us to drop the cassert include.
This commit is contained in:
John Steele Scott
2021-02-25 21:27:59 +10:30
parent 640acba850
commit 2f699d2cdb
2 changed files with 24 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
include/fmt/format-inl.h
View File

@ -9,7 +9,6 @@
#define FMT_FORMAT_INL_H_ #define FMT_FORMAT_INL_H_
#include <algorithm> #include <algorithm>
#include <cassert>
#include <cctype> #include <cctype>
#include <climits> #include <climits>
#include <cmath> #include <cmath>
@ -148,7 +147,7 @@ FMT_FUNC void format_error_code(detail::buffer<char>& out, int error_code,
if (message.size() <= inline_buffer_size - error_code_size) if (message.size() <= inline_buffer_size - error_code_size)
format_to(it, FMT_STRING("{}{}"), message, SEP); format_to(it, FMT_STRING("{}{}"), message, SEP);
format_to(it, FMT_STRING("{}{}"), ERROR_STR, error_code); format_to(it, FMT_STRING("{}{}"), ERROR_STR, error_code);
assert(out.size() <= inline_buffer_size); FMT_ASSERT(out.size() <= inline_buffer_size, "must not require dynamic alloc");
} }
FMT_FUNC void report_error(format_func func, int error_code, FMT_FUNC void report_error(format_func func, int error_code,
@ -1219,7 +1218,7 @@ struct accumulator {
if (lower < n) ++upper; if (lower < n) ++upper;
} }
void operator>>=(int shift) { void operator>>=(int shift) {
assert(shift == 32); FMT_ASSERT(shift == 32, "only 32-bit shift is supported");
(void)shift; (void)shift;
lower = (upper << 32) | (lower >> 32); lower = (upper << 32) | (lower >> 32);
upper >>= 32; upper >>= 32;
@ -1298,7 +1297,7 @@ class bigint {
public: public:
bigint() : exp_(0) {} bigint() : exp_(0) {}
explicit bigint(uint64_t n) { assign(n); } explicit bigint(uint64_t n) { assign(n); }
~bigint() { assert(bigits_.capacity() <= bigits_capacity); } ~bigint() { FMT_ASSERT(bigits_.capacity() <= bigits_capacity, ""); }
bigint(const bigint&) = delete; bigint(const bigint&) = delete;
void operator=(const bigint&) = delete; void operator=(const bigint&) = delete;
@ -1324,7 +1323,7 @@ class bigint {
int num_bigits() const { return static_cast<int>(bigits_.size()) + exp_; } int num_bigits() const { return static_cast<int>(bigits_.size()) + exp_; }
FMT_NOINLINE bigint& operator<<=(int shift) { FMT_NOINLINE bigint& operator<<=(int shift) {
assert(shift >= 0); FMT_ASSERT(shift >= 0, "shift must be non-negative");
exp_ += shift / bigit_bits; exp_ += shift / bigit_bits;
shift %= bigit_bits; shift %= bigit_bits;
if (shift == 0) return *this; if (shift == 0) return *this;
@ -1386,7 +1385,7 @@ class bigint {
// Assigns pow(10, exp) to this bigint. // Assigns pow(10, exp) to this bigint.
void assign_pow10(int exp) { void assign_pow10(int exp) {
assert(exp >= 0); FMT_ASSERT(exp >= 0, "exponent must be non-negative");
if (exp == 0) return assign(1); if (exp == 0) return assign(1);
// Find the top bit. // Find the top bit.
int bitmask = 1; int bitmask = 1;
@ -2557,11 +2556,11 @@ int snprintf_float(T value, int precision, float_specs specs,
--exp_pos; --exp_pos;
} while (*exp_pos != 'e'); } while (*exp_pos != 'e');
char sign = exp_pos[1]; char sign = exp_pos[1];
assert(sign == '+' || sign == '-'); FMT_ASSERT(sign == '+' || sign == '-', "expect valid sign character");
int exp = 0; int exp = 0;
auto p = exp_pos + 2; // Skip 'e' and sign. auto p = exp_pos + 2; // Skip 'e' and sign.
do { do {
assert(is_digit(*p)); FMT_ASSERT(is_digit(*p), "expect digit");
exp = exp * 10 + (*p++ - '0'); exp = exp * 10 + (*p++ - '0');
} while (p != end); } while (p != end);
if (sign == '-') exp = -exp; if (sign == '-') exp = -exp;

18
test/test-assert.h
View File

@ -22,8 +22,24 @@ class assertion_failure : public std::logic_error {
void assertion_failure::avoid_weak_vtable() {} void assertion_failure::avoid_weak_vtable() {}
inline void throw_assertion_failure (const char *message)
{
# if FMT_GCC_VERSION >= 600
// Avoid warnings when FMT_ASSERT is used in a destructor.
# pragma GCC diagnostic push
# pragma GCC diagnostic ignored "-Wterminate"
# endif
throw assertion_failure(message);
# if FMT_GCC_VERSION >= 600
# pragma GCC diagnostic pop
# endif
}
#define FMT_ASSERT(condition, message) \ #define FMT_ASSERT(condition, message) \
if (!(condition)) throw assertion_failure(message); if (!(condition)) throw_assertion_failure(message);
// Expects an assertion failure. // Expects an assertion failure.
#define EXPECT_ASSERT(stmt, message) \ #define EXPECT_ASSERT(stmt, message) \