Skip to content

A
abseil-cpp
Commit a13ef44b by Mike Kruskal Committed by Copybara-Service
Options

Prevent all CHECK functions from expanding macros for the error string. 

This was likely an unintentional behavior change made a while ago while trying to reduce duplication.  The new behavior will always include the unexpanded macro in the error string.  For example, `CHECK_EQ(MACRO(x), MACRO(y))` will now output "MACRO(x) == MACRO(y)" if it fails.  Before this change, CHECK and QCHECK were the only macros that had this behavior.

Not using function-like macro aliases is a possible alternative here, but unfortunately that would flood the macro namespace downstream with CHECK* and break existing code.

PiperOrigin-RevId: 495138582
Change-Id: I6a1afd89a6b9334003362e5d3e55da68f86eec98
parent 4cb6c389
Showing with 329 additions and 193 deletions
absl/log/BUILD.bazel
...@@ -294,6 +294,7 @@ cc_library( ...@@ -294,6 +294,7 @@ cc_library(
"//absl/base:config", "//absl/base:config",
"//absl/base:core_headers", "//absl/base:core_headers",
"//absl/log/internal:test_helpers", "//absl/log/internal:test_helpers",
"//absl/status",
"@com_google_googletest//:gtest", "@com_google_googletest//:gtest",
], ],
) )
......
absl/log/CMakeLists.txt
...@@ -686,6 +686,7 @@ absl_cc_test( ...@@ -686,6 +686,7 @@ absl_cc_test(
absl::config absl::config
absl::core_headers absl::core_headers
absl::log_internal_test_helpers absl::log_internal_test_helpers
absl::status
GTest::gmock GTest::gmock
GTest::gtest_main GTest::gtest_main
) )
...@@ -729,6 +730,7 @@ absl_cc_test( ...@@ -729,6 +730,7 @@ absl_cc_test(
absl::config absl::config
absl::core_headers absl::core_headers
absl::log_internal_test_helpers absl::log_internal_test_helpers
absl::status
GTest::gmock GTest::gmock
GTest::gtest_main GTest::gtest_main
) )
......
absl/log/absl_check.h
...@@ -37,45 +37,69 @@ ...@@ -37,45 +37,69 @@
#include "absl/log/internal/check_impl.h" #include "absl/log/internal/check_impl.h"
#define ABSL_CHECK(condition) ABSL_CHECK_IMPL(condition, #condition) #define ABSL_CHECK(condition) ABSL_CHECK_IMPL((condition), #condition)
#define ABSL_QCHECK(condition) ABSL_QCHECK_IMPL(condition, #condition) #define ABSL_QCHECK(condition) ABSL_QCHECK_IMPL((condition), #condition)
#define ABSL_PCHECK(condition) ABSL_PCHECK_IMPL(condition) #define ABSL_PCHECK(condition) ABSL_PCHECK_IMPL((condition), #condition)
#define ABSL_DCHECK(condition) ABSL_DCHECK_IMPL(condition) #define ABSL_DCHECK(condition) ABSL_DCHECK_IMPL((condition), #condition)
#define ABSL_CHECK_EQ(val1, val2) ABSL_CHECK_EQ_IMPL(val1, val2) #define ABSL_CHECK_EQ(val1, val2) \
#define ABSL_CHECK_NE(val1, val2) ABSL_CHECK_NE_IMPL(val1, val2) ABSL_CHECK_EQ_IMPL((val1), #val1, (val2), #val2)
#define ABSL_CHECK_LE(val1, val2) ABSL_CHECK_LE_IMPL(val1, val2) #define ABSL_CHECK_NE(val1, val2) \
#define ABSL_CHECK_LT(val1, val2) ABSL_CHECK_LT_IMPL(val1, val2) ABSL_CHECK_NE_IMPL((val1), #val1, (val2), #val2)
#define ABSL_CHECK_GE(val1, val2) ABSL_CHECK_GE_IMPL(val1, val2) #define ABSL_CHECK_LE(val1, val2) \
#define ABSL_CHECK_GT(val1, val2) ABSL_CHECK_GT_IMPL(val1, val2) ABSL_CHECK_LE_IMPL((val1), #val1, (val2), #val2)
#define ABSL_QCHECK_EQ(val1, val2) ABSL_QCHECK_EQ_IMPL(val1, val2) #define ABSL_CHECK_LT(val1, val2) \
#define ABSL_QCHECK_NE(val1, val2) ABSL_QCHECK_NE_IMPL(val1, val2) ABSL_CHECK_LT_IMPL((val1), #val1, (val2), #val2)
#define ABSL_QCHECK_LE(val1, val2) ABSL_QCHECK_LE_IMPL(val1, val2) #define ABSL_CHECK_GE(val1, val2) \
#define ABSL_QCHECK_LT(val1, val2) ABSL_QCHECK_LT_IMPL(val1, val2) ABSL_CHECK_GE_IMPL((val1), #val1, (val2), #val2)
#define ABSL_QCHECK_GE(val1, val2) ABSL_QCHECK_GE_IMPL(val1, val2) #define ABSL_CHECK_GT(val1, val2) \
#define ABSL_QCHECK_GT(val1, val2) ABSL_QCHECK_GT_IMPL(val1, val2) ABSL_CHECK_GT_IMPL((val1), #val1, (val2), #val2)
#define ABSL_DCHECK_EQ(val1, val2) ABSL_DCHECK_EQ_IMPL(val1, val2) #define ABSL_QCHECK_EQ(val1, val2) \
#define ABSL_DCHECK_NE(val1, val2) ABSL_DCHECK_NE_IMPL(val1, val2) ABSL_QCHECK_EQ_IMPL((val1), #val1, (val2), #val2)
#define ABSL_DCHECK_LE(val1, val2) ABSL_DCHECK_LE_IMPL(val1, val2) #define ABSL_QCHECK_NE(val1, val2) \
#define ABSL_DCHECK_LT(val1, val2) ABSL_DCHECK_LT_IMPL(val1, val2) ABSL_QCHECK_NE_IMPL((val1), #val1, (val2), #val2)
#define ABSL_DCHECK_GE(val1, val2) ABSL_DCHECK_GE_IMPL(val1, val2) #define ABSL_QCHECK_LE(val1, val2) \
#define ABSL_DCHECK_GT(val1, val2) ABSL_DCHECK_GT_IMPL(val1, val2) ABSL_QCHECK_LE_IMPL((val1), #val1, (val2), #val2)
#define ABSL_QCHECK_LT(val1, val2) \
ABSL_QCHECK_LT_IMPL((val1), #val1, (val2), #val2)
#define ABSL_QCHECK_GE(val1, val2) \
ABSL_QCHECK_GE_IMPL((val1), #val1, (val2), #val2)
#define ABSL_QCHECK_GT(val1, val2) \
ABSL_QCHECK_GT_IMPL((val1), #val1, (val2), #val2)
#define ABSL_DCHECK_EQ(val1, val2) \
ABSL_DCHECK_EQ_IMPL((val1), #val1, (val2), #val2)
#define ABSL_DCHECK_NE(val1, val2) \
ABSL_DCHECK_NE_IMPL((val1), #val1, (val2), #val2)
#define ABSL_DCHECK_LE(val1, val2) \
ABSL_DCHECK_LE_IMPL((val1), #val1, (val2), #val2)
#define ABSL_DCHECK_LT(val1, val2) \
ABSL_DCHECK_LT_IMPL((val1), #val1, (val2), #val2)
#define ABSL_DCHECK_GE(val1, val2) \
ABSL_DCHECK_GE_IMPL((val1), #val1, (val2), #val2)
#define ABSL_DCHECK_GT(val1, val2) \
ABSL_DCHECK_GT_IMPL((val1), #val1, (val2), #val2)
#define ABSL_CHECK_OK(status) ABSL_CHECK_OK_IMPL(status) #define ABSL_CHECK_OK(status) ABSL_CHECK_OK_IMPL((status), #status)
#define ABSL_QCHECK_OK(status) ABSL_QCHECK_OK_IMPL(status) #define ABSL_QCHECK_OK(status) ABSL_QCHECK_OK_IMPL((status), #status)
#define ABSL_DCHECK_OK(status) ABSL_DCHECK_OK_IMPL(status) #define ABSL_DCHECK_OK(status) ABSL_DCHECK_OK_IMPL((status), #status)
#define ABSL_CHECK_STREQ(s1, s2) ABSL_CHECK_STREQ_IMPL(s1, s2) #define ABSL_CHECK_STREQ(s1, s2) ABSL_CHECK_STREQ_IMPL((s1), #s1, (s2), #s2)
#define ABSL_CHECK_STRNE(s1, s2) ABSL_CHECK_STRNE_IMPL(s1, s2) #define ABSL_CHECK_STRNE(s1, s2) ABSL_CHECK_STRNE_IMPL((s1), #s1, (s2), #s2)
#define ABSL_CHECK_STRCASEEQ(s1, s2) ABSL_CHECK_STRCASEEQ_IMPL(s1, s2) #define ABSL_CHECK_STRCASEEQ(s1, s2) \
#define ABSL_CHECK_STRCASENE(s1, s2) ABSL_CHECK_STRCASENE_IMPL(s1, s2) ABSL_CHECK_STRCASEEQ_IMPL((s1), #s1, (s2), #s2)
#define ABSL_QCHECK_STREQ(s1, s2) ABSL_QCHECK_STREQ_IMPL(s1, s2) #define ABSL_CHECK_STRCASENE(s1, s2) \
#define ABSL_QCHECK_STRNE(s1, s2) ABSL_QCHECK_STRNE_IMPL(s1, s2) ABSL_CHECK_STRCASENE_IMPL((s1), #s1, (s2), #s2)
#define ABSL_QCHECK_STRCASEEQ(s1, s2) ABSL_QCHECK_STRCASEEQ_IMPL(s1, s2) #define ABSL_QCHECK_STREQ(s1, s2) ABSL_QCHECK_STREQ_IMPL((s1), #s1, (s2), #s2)
#define ABSL_QCHECK_STRCASENE(s1, s2) ABSL_QCHECK_STRCASENE_IMPL(s1, s2) #define ABSL_QCHECK_STRNE(s1, s2) ABSL_QCHECK_STRNE_IMPL((s1), #s1, (s2), #s2)
#define ABSL_DCHECK_STREQ(s1, s2) ABSL_DCHECK_STREQ_IMPL(s1, s2) #define ABSL_QCHECK_STRCASEEQ(s1, s2) \
#define ABSL_DCHECK_STRNE(s1, s2) ABSL_DCHECK_STRNE_IMPL(s1, s2) ABSL_QCHECK_STRCASEEQ_IMPL((s1), #s1, (s2), #s2)
#define ABSL_DCHECK_STRCASEEQ(s1, s2) ABSL_DCHECK_STRCASEEQ_IMPL(s1, s2) #define ABSL_QCHECK_STRCASENE(s1, s2) \
#define ABSL_DCHECK_STRCASENE(s1, s2) ABSL_DCHECK_STRCASENE_IMPL(s1, s2) ABSL_QCHECK_STRCASENE_IMPL((s1), #s1, (s2), #s2)
#define ABSL_DCHECK_STREQ(s1, s2) ABSL_DCHECK_STREQ_IMPL((s1), #s1, (s2), #s2)
#define ABSL_DCHECK_STRNE(s1, s2) ABSL_DCHECK_STRNE_IMPL((s1), #s1, (s2), #s2)
#define ABSL_DCHECK_STRCASEEQ(s1, s2) \
ABSL_DCHECK_STRCASEEQ_IMPL((s1), #s1, (s2), #s2)
#define ABSL_DCHECK_STRCASENE(s1, s2) \
ABSL_DCHECK_STRCASENE_IMPL((s1), #s1, (s2), #s2)
#endif // ABSL_LOG_ABSL_CHECK_H_ #endif // ABSL_LOG_ABSL_CHECK_H_
absl/log/absl_check_test.cc
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
#include "absl/log/absl_check.h" #include "absl/log/absl_check.h"
#define ABSL_TEST_CHECK ABSL_CHECK #define ABSL_TEST_CHECK ABSL_CHECK
#define ABSL_TEST_CHECK_OK ABSL_CHECK_OK
#define ABSL_TEST_CHECK_EQ ABSL_CHECK_EQ #define ABSL_TEST_CHECK_EQ ABSL_CHECK_EQ
#define ABSL_TEST_CHECK_NE ABSL_CHECK_NE #define ABSL_TEST_CHECK_NE ABSL_CHECK_NE
#define ABSL_TEST_CHECK_GE ABSL_CHECK_GE #define ABSL_TEST_CHECK_GE ABSL_CHECK_GE
...@@ -28,6 +29,7 @@ ...@@ -28,6 +29,7 @@
#define ABSL_TEST_CHECK_STRCASENE ABSL_CHECK_STRCASENE #define ABSL_TEST_CHECK_STRCASENE ABSL_CHECK_STRCASENE
#define ABSL_TEST_DCHECK ABSL_DCHECK #define ABSL_TEST_DCHECK ABSL_DCHECK
#define ABSL_TEST_DCHECK_OK ABSL_DCHECK_OK
#define ABSL_TEST_DCHECK_EQ ABSL_DCHECK_EQ #define ABSL_TEST_DCHECK_EQ ABSL_DCHECK_EQ
#define ABSL_TEST_DCHECK_NE ABSL_DCHECK_NE #define ABSL_TEST_DCHECK_NE ABSL_DCHECK_NE
#define ABSL_TEST_DCHECK_GE ABSL_DCHECK_GE #define ABSL_TEST_DCHECK_GE ABSL_DCHECK_GE
...@@ -40,6 +42,7 @@ ...@@ -40,6 +42,7 @@
#define ABSL_TEST_DCHECK_STRCASENE ABSL_DCHECK_STRCASENE #define ABSL_TEST_DCHECK_STRCASENE ABSL_DCHECK_STRCASENE
#define ABSL_TEST_QCHECK ABSL_QCHECK #define ABSL_TEST_QCHECK ABSL_QCHECK
#define ABSL_TEST_QCHECK_OK ABSL_QCHECK_OK
#define ABSL_TEST_QCHECK_EQ ABSL_QCHECK_EQ #define ABSL_TEST_QCHECK_EQ ABSL_QCHECK_EQ
#define ABSL_TEST_QCHECK_NE ABSL_QCHECK_NE #define ABSL_TEST_QCHECK_NE ABSL_QCHECK_NE
#define ABSL_TEST_QCHECK_GE ABSL_QCHECK_GE #define ABSL_TEST_QCHECK_GE ABSL_QCHECK_GE
......
absl/log/check.h
...@@ -54,7 +54,7 @@ ...@@ -54,7 +54,7 @@
// Might produce a message like: // Might produce a message like:
// //
// Check failed: !cheese.empty() Out of Cheese // Check failed: !cheese.empty() Out of Cheese
#define CHECK(condition) ABSL_CHECK_IMPL(condition, #condition) #define CHECK(condition) ABSL_CHECK_IMPL((condition), #condition)
// QCHECK() // QCHECK()
// //
...@@ -62,7 +62,7 @@ ...@@ -62,7 +62,7 @@
// not run registered error handlers (as `QFATAL`). It is useful when the // not run registered error handlers (as `QFATAL`). It is useful when the
// problem is definitely unrelated to program flow, e.g. when validating user // problem is definitely unrelated to program flow, e.g. when validating user
// input. // input.
#define QCHECK(condition) ABSL_QCHECK_IMPL(condition, #condition) #define QCHECK(condition) ABSL_QCHECK_IMPL((condition), #condition)
// PCHECK() // PCHECK()
// //
...@@ -77,7 +77,7 @@ ...@@ -77,7 +77,7 @@
// Might produce a message like: // Might produce a message like:
// //
// Check failed: fd != -1 posix is difficult: No such file or directory [2] // Check failed: fd != -1 posix is difficult: No such file or directory [2]
#define PCHECK(condition) ABSL_PCHECK_IMPL(condition) #define PCHECK(condition) ABSL_PCHECK_IMPL((condition), #condition)
// DCHECK() // DCHECK()
// //
...@@ -85,7 +85,7 @@ ...@@ -85,7 +85,7 @@
// `DLOG`). Unlike with `CHECK` (but as with `assert`), it is not safe to rely // `DLOG`). Unlike with `CHECK` (but as with `assert`), it is not safe to rely
// on evaluation of `condition`: when `NDEBUG` is enabled, DCHECK does not // on evaluation of `condition`: when `NDEBUG` is enabled, DCHECK does not
// evaluate the condition. // evaluate the condition.
#define DCHECK(condition) ABSL_DCHECK_IMPL(condition) #define DCHECK(condition) ABSL_DCHECK_IMPL((condition), #condition)
// `CHECK_EQ` and friends are syntactic sugar for `CHECK(x == y)` that // `CHECK_EQ` and friends are syntactic sugar for `CHECK(x == y)` that
// automatically output the expression being tested and the evaluated values on // automatically output the expression being tested and the evaluated values on
...@@ -113,24 +113,24 @@ ...@@ -113,24 +113,24 @@
// //
// WARNING: Passing `NULL` as an argument to `CHECK_EQ` and similar macros does // WARNING: Passing `NULL` as an argument to `CHECK_EQ` and similar macros does
// not compile. Use `nullptr` instead. // not compile. Use `nullptr` instead.
#define CHECK_EQ(val1, val2) ABSL_CHECK_EQ_IMPL(val1, val2) #define CHECK_EQ(val1, val2) ABSL_CHECK_EQ_IMPL((val1), #val1, (val2), #val2)
#define CHECK_NE(val1, val2) ABSL_CHECK_NE_IMPL(val1, val2) #define CHECK_NE(val1, val2) ABSL_CHECK_NE_IMPL((val1), #val1, (val2), #val2)
#define CHECK_LE(val1, val2) ABSL_CHECK_LE_IMPL(val1, val2) #define CHECK_LE(val1, val2) ABSL_CHECK_LE_IMPL((val1), #val1, (val2), #val2)
#define CHECK_LT(val1, val2) ABSL_CHECK_LT_IMPL(val1, val2) #define CHECK_LT(val1, val2) ABSL_CHECK_LT_IMPL((val1), #val1, (val2), #val2)
#define CHECK_GE(val1, val2) ABSL_CHECK_GE_IMPL(val1, val2) #define CHECK_GE(val1, val2) ABSL_CHECK_GE_IMPL((val1), #val1, (val2), #val2)
#define CHECK_GT(val1, val2) ABSL_CHECK_GT_IMPL(val1, val2) #define CHECK_GT(val1, val2) ABSL_CHECK_GT_IMPL((val1), #val1, (val2), #val2)
#define QCHECK_EQ(val1, val2) ABSL_QCHECK_EQ_IMPL(val1, val2) #define QCHECK_EQ(val1, val2) ABSL_QCHECK_EQ_IMPL((val1), #val1, (val2), #val2)
#define QCHECK_NE(val1, val2) ABSL_QCHECK_NE_IMPL(val1, val2) #define QCHECK_NE(val1, val2) ABSL_QCHECK_NE_IMPL((val1), #val1, (val2), #val2)
#define QCHECK_LE(val1, val2) ABSL_QCHECK_LE_IMPL(val1, val2) #define QCHECK_LE(val1, val2) ABSL_QCHECK_LE_IMPL((val1), #val1, (val2), #val2)
#define QCHECK_LT(val1, val2) ABSL_QCHECK_LT_IMPL(val1, val2) #define QCHECK_LT(val1, val2) ABSL_QCHECK_LT_IMPL((val1), #val1, (val2), #val2)
#define QCHECK_GE(val1, val2) ABSL_QCHECK_GE_IMPL(val1, val2) #define QCHECK_GE(val1, val2) ABSL_QCHECK_GE_IMPL((val1), #val1, (val2), #val2)
#define QCHECK_GT(val1, val2) ABSL_QCHECK_GT_IMPL(val1, val2) #define QCHECK_GT(val1, val2) ABSL_QCHECK_GT_IMPL((val1), #val1, (val2), #val2)
#define DCHECK_EQ(val1, val2) ABSL_DCHECK_EQ_IMPL(val1, val2) #define DCHECK_EQ(val1, val2) ABSL_DCHECK_EQ_IMPL((val1), #val1, (val2), #val2)
#define DCHECK_NE(val1, val2) ABSL_DCHECK_NE_IMPL(val1, val2) #define DCHECK_NE(val1, val2) ABSL_DCHECK_NE_IMPL((val1), #val1, (val2), #val2)
#define DCHECK_LE(val1, val2) ABSL_DCHECK_LE_IMPL(val1, val2) #define DCHECK_LE(val1, val2) ABSL_DCHECK_LE_IMPL((val1), #val1, (val2), #val2)
#define DCHECK_LT(val1, val2) ABSL_DCHECK_LT_IMPL(val1, val2) #define DCHECK_LT(val1, val2) ABSL_DCHECK_LT_IMPL((val1), #val1, (val2), #val2)
#define DCHECK_GE(val1, val2) ABSL_DCHECK_GE_IMPL(val1, val2) #define DCHECK_GE(val1, val2) ABSL_DCHECK_GE_IMPL((val1), #val1, (val2), #val2)
#define DCHECK_GT(val1, val2) ABSL_DCHECK_GT_IMPL(val1, val2) #define DCHECK_GT(val1, val2) ABSL_DCHECK_GT_IMPL((val1), #val1, (val2), #val2)
// `CHECK_OK` and friends validate that the provided `absl::Status` or // `CHECK_OK` and friends validate that the provided `absl::Status` or
// `absl::StatusOr<T>` is OK. If it isn't, they print a failure message that // `absl::StatusOr<T>` is OK. If it isn't, they print a failure message that
...@@ -146,9 +146,9 @@ ...@@ -146,9 +146,9 @@
// Might produce a message like: // Might produce a message like:
// //
// Check failed: FunctionReturnsStatus(x, y, z) is OK (ABORTED: timeout) oops! // Check failed: FunctionReturnsStatus(x, y, z) is OK (ABORTED: timeout) oops!
#define CHECK_OK(status) ABSL_CHECK_OK_IMPL(status) #define CHECK_OK(status) ABSL_CHECK_OK_IMPL((status), #status)
#define QCHECK_OK(status) ABSL_QCHECK_OK_IMPL(status) #define QCHECK_OK(status) ABSL_QCHECK_OK_IMPL((status), #status)
#define DCHECK_OK(status) ABSL_DCHECK_OK_IMPL(status) #define DCHECK_OK(status) ABSL_DCHECK_OK_IMPL((status), #status)
// `CHECK_STREQ` and friends provide `CHECK_EQ` functionality for C strings, // `CHECK_STREQ` and friends provide `CHECK_EQ` functionality for C strings,
// i.e., nul-terminated char arrays. The `CASE` versions are case-insensitive. // i.e., nul-terminated char arrays. The `CASE` versions are case-insensitive.
...@@ -163,17 +163,21 @@ ...@@ -163,17 +163,21 @@
// Example: // Example:
// //
// CHECK_STREQ(Foo().c_str(), Bar().c_str()); // CHECK_STREQ(Foo().c_str(), Bar().c_str());
#define CHECK_STREQ(s1, s2) ABSL_CHECK_STREQ_IMPL(s1, s2) #define CHECK_STREQ(s1, s2) ABSL_CHECK_STREQ_IMPL((s1), #s1, (s2), #s2)
#define CHECK_STRNE(s1, s2) ABSL_CHECK_STRNE_IMPL(s1, s2) #define CHECK_STRNE(s1, s2) ABSL_CHECK_STRNE_IMPL((s1), #s1, (s2), #s2)
#define CHECK_STRCASEEQ(s1, s2) ABSL_CHECK_STRCASEEQ_IMPL(s1, s2) #define CHECK_STRCASEEQ(s1, s2) ABSL_CHECK_STRCASEEQ_IMPL((s1), #s1, (s2), #s2)
#define CHECK_STRCASENE(s1, s2) ABSL_CHECK_STRCASENE_IMPL(s1, s2) #define CHECK_STRCASENE(s1, s2) ABSL_CHECK_STRCASENE_IMPL((s1), #s1, (s2), #s2)
#define QCHECK_STREQ(s1, s2) ABSL_QCHECK_STREQ_IMPL(s1, s2) #define QCHECK_STREQ(s1, s2) ABSL_QCHECK_STREQ_IMPL((s1), #s1, (s2), #s2)
#define QCHECK_STRNE(s1, s2) ABSL_QCHECK_STRNE_IMPL(s1, s2) #define QCHECK_STRNE(s1, s2) ABSL_QCHECK_STRNE_IMPL((s1), #s1, (s2), #s2)
#define QCHECK_STRCASEEQ(s1, s2) ABSL_QCHECK_STRCASEEQ_IMPL(s1, s2) #define QCHECK_STRCASEEQ(s1, s2) \
#define QCHECK_STRCASENE(s1, s2) ABSL_QCHECK_STRCASENE_IMPL(s1, s2) ABSL_QCHECK_STRCASEEQ_IMPL((s1), #s1, (s2), #s2)
#define DCHECK_STREQ(s1, s2) ABSL_DCHECK_STREQ_IMPL(s1, s2) #define QCHECK_STRCASENE(s1, s2) \
#define DCHECK_STRNE(s1, s2) ABSL_DCHECK_STRNE_IMPL(s1, s2) ABSL_QCHECK_STRCASENE_IMPL((s1), #s1, (s2), #s2)
#define DCHECK_STRCASEEQ(s1, s2) ABSL_DCHECK_STRCASEEQ_IMPL(s1, s2) #define DCHECK_STREQ(s1, s2) ABSL_DCHECK_STREQ_IMPL((s1), #s1, (s2), #s2)
#define DCHECK_STRCASENE(s1, s2) ABSL_DCHECK_STRCASENE_IMPL(s1, s2) #define DCHECK_STRNE(s1, s2) ABSL_DCHECK_STRNE_IMPL((s1), #s1, (s2), #s2)
#define DCHECK_STRCASEEQ(s1, s2) \
ABSL_DCHECK_STRCASEEQ_IMPL((s1), #s1, (s2), #s2)
#define DCHECK_STRCASENE(s1, s2) \
ABSL_DCHECK_STRCASENE_IMPL((s1), #s1, (s2), #s2)
#endif // ABSL_LOG_CHECK_H_ #endif // ABSL_LOG_CHECK_H_
absl/log/check_test.cc
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
#include "absl/log/check.h" #include "absl/log/check.h"
#define ABSL_TEST_CHECK CHECK #define ABSL_TEST_CHECK CHECK
#define ABSL_TEST_CHECK_OK CHECK_OK
#define ABSL_TEST_CHECK_EQ CHECK_EQ #define ABSL_TEST_CHECK_EQ CHECK_EQ
#define ABSL_TEST_CHECK_NE CHECK_NE #define ABSL_TEST_CHECK_NE CHECK_NE
#define ABSL_TEST_CHECK_GE CHECK_GE #define ABSL_TEST_CHECK_GE CHECK_GE
...@@ -28,6 +29,7 @@ ...@@ -28,6 +29,7 @@
#define ABSL_TEST_CHECK_STRCASENE CHECK_STRCASENE #define ABSL_TEST_CHECK_STRCASENE CHECK_STRCASENE
#define ABSL_TEST_DCHECK DCHECK #define ABSL_TEST_DCHECK DCHECK
#define ABSL_TEST_DCHECK_OK DCHECK_OK
#define ABSL_TEST_DCHECK_EQ DCHECK_EQ #define ABSL_TEST_DCHECK_EQ DCHECK_EQ
#define ABSL_TEST_DCHECK_NE DCHECK_NE #define ABSL_TEST_DCHECK_NE DCHECK_NE
#define ABSL_TEST_DCHECK_GE DCHECK_GE #define ABSL_TEST_DCHECK_GE DCHECK_GE
...@@ -40,6 +42,7 @@ ...@@ -40,6 +42,7 @@
#define ABSL_TEST_DCHECK_STRCASENE DCHECK_STRCASENE #define ABSL_TEST_DCHECK_STRCASENE DCHECK_STRCASENE
#define ABSL_TEST_QCHECK QCHECK #define ABSL_TEST_QCHECK QCHECK
#define ABSL_TEST_QCHECK_OK QCHECK_OK
#define ABSL_TEST_QCHECK_EQ QCHECK_EQ #define ABSL_TEST_QCHECK_EQ QCHECK_EQ
#define ABSL_TEST_QCHECK_NE QCHECK_NE #define ABSL_TEST_QCHECK_NE QCHECK_NE
#define ABSL_TEST_QCHECK_GE QCHECK_GE #define ABSL_TEST_QCHECK_GE QCHECK_GE
......
absl/log/check_test_impl.h
...@@ -30,6 +30,9 @@ ...@@ -30,6 +30,9 @@
#include "absl/base/attributes.h" #include "absl/base/attributes.h"
#include "absl/base/config.h" #include "absl/base/config.h"
#include "absl/log/internal/test_helpers.h" #include "absl/log/internal/test_helpers.h"
#include "absl/status/status.h"
// NOLINTBEGIN(misc-definitions-in-headers)
namespace absl_log_internal { namespace absl_log_internal {
...@@ -118,21 +121,82 @@ TEST(CHECKDeathTest, TestChecksWithSideEffects) { ...@@ -118,21 +121,82 @@ TEST(CHECKDeathTest, TestChecksWithSideEffects) {
#endif // GTEST_HAS_DEATH_TEST #endif // GTEST_HAS_DEATH_TEST
template <int a, int b>
constexpr int sum() {
return a + b;
}
#define MACRO_ONE 1
#define TEMPLATE_SUM(a, b) sum<a, b>()
#define CONCAT(a, b) a b
#define IDENTITY(x) x
TEST(CHECKTest, TestPassingMacroExpansion) {
ABSL_TEST_CHECK(IDENTITY(true));
ABSL_TEST_CHECK_EQ(TEMPLATE_SUM(MACRO_ONE, 2), 3);
ABSL_TEST_CHECK_STREQ(CONCAT("x", "y"), "xy");
}
#if GTEST_HAS_DEATH_TEST #if GTEST_HAS_DEATH_TEST
TEST(CHECKTest, TestMacroExpansionInMessage) { TEST(CHECKTest, TestMacroExpansionInMessage) {
#define MACRO(x) x auto MessageGen = []() { ABSL_TEST_CHECK(IDENTITY(false)); };
auto MessageGen = []() { ABSL_TEST_CHECK(MACRO(false)); }; EXPECT_DEATH(MessageGen(), HasSubstr("IDENTITY(false)"));
EXPECT_DEATH(MessageGen(), HasSubstr("MACRO(false)"));
#undef MACRO
} }
TEST(CHECKTest, TestNestedMacroExpansionInMessage) { TEST(CHECKTest, TestNestedMacroExpansionInMessage) {
#define MACRO(x) x EXPECT_DEATH(ABSL_TEST_CHECK(IDENTITY(false)), HasSubstr("IDENTITY(false)"));
EXPECT_DEATH(ABSL_TEST_CHECK(MACRO(false)), HasSubstr("MACRO(false)")); }
#undef MACRO
TEST(CHECKTest, TestMacroExpansionCompare) {
EXPECT_DEATH(ABSL_TEST_CHECK_EQ(IDENTITY(false), IDENTITY(true)),
HasSubstr("IDENTITY(false) == IDENTITY(true)"));
EXPECT_DEATH(ABSL_TEST_CHECK_GT(IDENTITY(1), IDENTITY(2)),
HasSubstr("IDENTITY(1) > IDENTITY(2)"));
}
TEST(CHECKTest, TestMacroExpansionStrCompare) {
EXPECT_DEATH(ABSL_TEST_CHECK_STREQ(IDENTITY("x"), IDENTITY("y")),
HasSubstr("IDENTITY(\"x\") == IDENTITY(\"y\")"));
EXPECT_DEATH(ABSL_TEST_CHECK_STRCASENE(IDENTITY("a"), IDENTITY("A")),
HasSubstr("IDENTITY(\"a\") != IDENTITY(\"A\")"));
}
TEST(CHECKTest, TestMacroExpansionStatus) {
EXPECT_DEATH(
ABSL_TEST_CHECK_OK(IDENTITY(absl::FailedPreconditionError("message"))),
HasSubstr("IDENTITY(absl::FailedPreconditionError(\"message\"))"));
}
TEST(CHECKTest, TestMacroExpansionComma) {
EXPECT_DEATH(ABSL_TEST_CHECK(TEMPLATE_SUM(MACRO_ONE, 2) == 4),
HasSubstr("TEMPLATE_SUM(MACRO_ONE, 2) == 4"));
}
TEST(CHECKTest, TestMacroExpansionCommaCompare) {
EXPECT_DEATH(
ABSL_TEST_CHECK_EQ(TEMPLATE_SUM(2, MACRO_ONE), TEMPLATE_SUM(3, 2)),
HasSubstr("TEMPLATE_SUM(2, MACRO_ONE) == TEMPLATE_SUM(3, 2)"));
EXPECT_DEATH(
ABSL_TEST_CHECK_GT(TEMPLATE_SUM(2, MACRO_ONE), TEMPLATE_SUM(3, 2)),
HasSubstr("TEMPLATE_SUM(2, MACRO_ONE) > TEMPLATE_SUM(3, 2)"));
}
TEST(CHECKTest, TestMacroExpansionCommaStrCompare) {
EXPECT_DEATH(ABSL_TEST_CHECK_STREQ(CONCAT("x", "y"), "z"),
HasSubstr("CONCAT(\"x\", \"y\") == \"z\""));
EXPECT_DEATH(ABSL_TEST_CHECK_STRNE(CONCAT("x", "y"), "xy"),
HasSubstr("CONCAT(\"x\", \"y\") != \"xy\""));
} }
#endif // GTEST_HAS_DEATH_TEST
#undef TEMPLATE_SUM
#undef CONCAT
#undef MACRO
#undef ONE
#if GTEST_HAS_DEATH_TEST
TEST(CHECKDeachTest, TestOrderOfInvocationsBetweenCheckAndMessage) { TEST(CHECKDeachTest, TestOrderOfInvocationsBetweenCheckAndMessage) {
int counter = 0; int counter = 0;
...@@ -459,4 +523,6 @@ TEST(CHECKDeathTest, TestUserDefinedStreaming) { ...@@ -459,4 +523,6 @@ TEST(CHECKDeathTest, TestUserDefinedStreaming) {
} // namespace absl_log_internal } // namespace absl_log_internal
// NOLINTEND(misc-definitions-in-headers)
#endif // ABSL_LOG_CHECK_TEST_IMPL_H_ #endif // ABSL_LOG_CHECK_TEST_IMPL_H_
absl/log/internal/check_impl.h
...@@ -22,103 +22,129 @@ ...@@ -22,103 +22,129 @@
#include "absl/log/internal/strip.h" #include "absl/log/internal/strip.h"
// CHECK // CHECK
#define ABSL_CHECK_IMPL(condition, condition_str) \ #define ABSL_CHECK_IMPL(condition, condition_text) \
ABSL_LOG_INTERNAL_CONDITION_FATAL(STATELESS, \ ABSL_LOG_INTERNAL_CONDITION_FATAL(STATELESS, \
ABSL_PREDICT_FALSE(!(condition))) \ ABSL_PREDICT_FALSE(!(condition))) \
ABSL_LOG_INTERNAL_CHECK(condition_str).InternalStream() ABSL_LOG_INTERNAL_CHECK(condition_text).InternalStream()
#define ABSL_QCHECK_IMPL(condition, condition_str) \ #define ABSL_QCHECK_IMPL(condition, condition_text) \
ABSL_LOG_INTERNAL_CONDITION_QFATAL(STATELESS, \ ABSL_LOG_INTERNAL_CONDITION_QFATAL(STATELESS, \
ABSL_PREDICT_FALSE(!(condition))) \ ABSL_PREDICT_FALSE(!(condition))) \
ABSL_LOG_INTERNAL_QCHECK(condition_str).InternalStream() ABSL_LOG_INTERNAL_QCHECK(condition_text).InternalStream()
#define ABSL_PCHECK_IMPL(condition) \ #define ABSL_PCHECK_IMPL(condition, condition_text) \
ABSL_CHECK_IMPL(condition, #condition).WithPerror() ABSL_CHECK_IMPL(condition, condition_text).WithPerror()
#ifndef NDEBUG #ifndef NDEBUG
#define ABSL_DCHECK_IMPL(condition) ABSL_CHECK_IMPL(condition, #condition) #define ABSL_DCHECK_IMPL(condition, condition_text) \
ABSL_CHECK_IMPL(condition, condition_text)
#else #else
#define ABSL_DCHECK_IMPL(condition) ABSL_CHECK_IMPL(true || (condition), "true") #define ABSL_DCHECK_IMPL(condition, condition_text) \
ABSL_CHECK_IMPL(true || (condition), "true")
#endif #endif
// CHECK_EQ // CHECK_EQ
#define ABSL_CHECK_EQ_IMPL(val1, val2) \ #define ABSL_CHECK_EQ_IMPL(val1, val1_text, val2, val2_text) \
ABSL_LOG_INTERNAL_CHECK_OP(Check_EQ, ==, val1, val2) ABSL_LOG_INTERNAL_CHECK_OP(Check_EQ, ==, val1, val1_text, val2, val2_text)
#define ABSL_CHECK_NE_IMPL(val1, val2) \ #define ABSL_CHECK_NE_IMPL(val1, val1_text, val2, val2_text) \
ABSL_LOG_INTERNAL_CHECK_OP(Check_NE, !=, val1, val2) ABSL_LOG_INTERNAL_CHECK_OP(Check_NE, !=, val1, val1_text, val2, val2_text)
#define ABSL_CHECK_LE_IMPL(val1, val2) \ #define ABSL_CHECK_LE_IMPL(val1, val1_text, val2, val2_text) \
ABSL_LOG_INTERNAL_CHECK_OP(Check_LE, <=, val1, val2) ABSL_LOG_INTERNAL_CHECK_OP(Check_LE, <=, val1, val1_text, val2, val2_text)
#define ABSL_CHECK_LT_IMPL(val1, val2) \ #define ABSL_CHECK_LT_IMPL(val1, val1_text, val2, val2_text) \
ABSL_LOG_INTERNAL_CHECK_OP(Check_LT, <, val1, val2) ABSL_LOG_INTERNAL_CHECK_OP(Check_LT, <, val1, val1_text, val2, val2_text)
#define ABSL_CHECK_GE_IMPL(val1, val2) \ #define ABSL_CHECK_GE_IMPL(val1, val1_text, val2, val2_text) \
ABSL_LOG_INTERNAL_CHECK_OP(Check_GE, >=, val1, val2) ABSL_LOG_INTERNAL_CHECK_OP(Check_GE, >=, val1, val1_text, val2, val2_text)
#define ABSL_CHECK_GT_IMPL(val1, val2) \ #define ABSL_CHECK_GT_IMPL(val1, val1_text, val2, val2_text) \
ABSL_LOG_INTERNAL_CHECK_OP(Check_GT, >, val1, val2) ABSL_LOG_INTERNAL_CHECK_OP(Check_GT, >, val1, val1_text, val2, val2_text)
#define ABSL_QCHECK_EQ_IMPL(val1, val2) \ #define ABSL_QCHECK_EQ_IMPL(val1, val1_text, val2, val2_text) \
ABSL_LOG_INTERNAL_QCHECK_OP(Check_EQ, ==, val1, val2) ABSL_LOG_INTERNAL_QCHECK_OP(Check_EQ, ==, val1, val1_text, val2, val2_text)
#define ABSL_QCHECK_NE_IMPL(val1, val2) \ #define ABSL_QCHECK_NE_IMPL(val1, val1_text, val2, val2_text) \
ABSL_LOG_INTERNAL_QCHECK_OP(Check_NE, !=, val1, val2) ABSL_LOG_INTERNAL_QCHECK_OP(Check_NE, !=, val1, val1_text, val2, val2_text)
#define ABSL_QCHECK_LE_IMPL(val1, val2) \ #define ABSL_QCHECK_LE_IMPL(val1, val1_text, val2, val2_text) \
ABSL_LOG_INTERNAL_QCHECK_OP(Check_LE, <=, val1, val2) ABSL_LOG_INTERNAL_QCHECK_OP(Check_LE, <=, val1, val1_text, val2, val2_text)
#define ABSL_QCHECK_LT_IMPL(val1, val2) \ #define ABSL_QCHECK_LT_IMPL(val1, val1_text, val2, val2_text) \
ABSL_LOG_INTERNAL_QCHECK_OP(Check_LT, <, val1, val2) ABSL_LOG_INTERNAL_QCHECK_OP(Check_LT, <, val1, val1_text, val2, val2_text)
#define ABSL_QCHECK_GE_IMPL(val1, val2) \ #define ABSL_QCHECK_GE_IMPL(val1, val1_text, val2, val2_text) \
ABSL_LOG_INTERNAL_QCHECK_OP(Check_GE, >=, val1, val2) ABSL_LOG_INTERNAL_QCHECK_OP(Check_GE, >=, val1, val1_text, val2, val2_text)
#define ABSL_QCHECK_GT_IMPL(val1, val2) \ #define ABSL_QCHECK_GT_IMPL(val1, val1_text, val2, val2_text) \
ABSL_LOG_INTERNAL_QCHECK_OP(Check_GT, >, val1, val2) ABSL_LOG_INTERNAL_QCHECK_OP(Check_GT, >, val1, val1_text, val2, val2_text)
#ifndef NDEBUG #ifndef NDEBUG
#define ABSL_DCHECK_EQ_IMPL(val1, val2) ABSL_CHECK_EQ_IMPL(val1, val2) #define ABSL_DCHECK_EQ_IMPL(val1, val1_text, val2, val2_text) \
#define ABSL_DCHECK_NE_IMPL(val1, val2) ABSL_CHECK_NE_IMPL(val1, val2) ABSL_CHECK_EQ_IMPL(val1, val1_text, val2, val2_text)
#define ABSL_DCHECK_LE_IMPL(val1, val2) ABSL_CHECK_LE_IMPL(val1, val2) #define ABSL_DCHECK_NE_IMPL(val1, val1_text, val2, val2_text) \
#define ABSL_DCHECK_LT_IMPL(val1, val2) ABSL_CHECK_LT_IMPL(val1, val2) ABSL_CHECK_NE_IMPL(val1, val1_text, val2, val2_text)
#define ABSL_DCHECK_GE_IMPL(val1, val2) ABSL_CHECK_GE_IMPL(val1, val2) #define ABSL_DCHECK_LE_IMPL(val1, val1_text, val2, val2_text) \
#define ABSL_DCHECK_GT_IMPL(val1, val2) ABSL_CHECK_GT_IMPL(val1, val2) ABSL_CHECK_LE_IMPL(val1, val1_text, val2, val2_text)
#define ABSL_DCHECK_LT_IMPL(val1, val1_text, val2, val2_text) \
ABSL_CHECK_LT_IMPL(val1, val1_text, val2, val2_text)
#define ABSL_DCHECK_GE_IMPL(val1, val1_text, val2, val2_text) \
ABSL_CHECK_GE_IMPL(val1, val1_text, val2, val2_text)
#define ABSL_DCHECK_GT_IMPL(val1, val1_text, val2, val2_text) \
ABSL_CHECK_GT_IMPL(val1, val1_text, val2, val2_text)
#else // ndef NDEBUG #else // ndef NDEBUG
#define ABSL_DCHECK_EQ_IMPL(val1, val2) ABSL_LOG_INTERNAL_DCHECK_NOP(val1, val2) #define ABSL_DCHECK_EQ_IMPL(val1, val1_text, val2, val2_text) \
#define ABSL_DCHECK_NE_IMPL(val1, val2) ABSL_LOG_INTERNAL_DCHECK_NOP(val1, val2) ABSL_LOG_INTERNAL_DCHECK_NOP(val1, val2)
#define ABSL_DCHECK_LE_IMPL(val1, val2) ABSL_LOG_INTERNAL_DCHECK_NOP(val1, val2) #define ABSL_DCHECK_NE_IMPL(val1, val1_text, val2, val2_text) \
#define ABSL_DCHECK_LT_IMPL(val1, val2) ABSL_LOG_INTERNAL_DCHECK_NOP(val1, val2) ABSL_LOG_INTERNAL_DCHECK_NOP(val1, val2)
#define ABSL_DCHECK_GE_IMPL(val1, val2) ABSL_LOG_INTERNAL_DCHECK_NOP(val1, val2) #define ABSL_DCHECK_LE_IMPL(val1, val1_text, val2, val2_text) \
#define ABSL_DCHECK_GT_IMPL(val1, val2) ABSL_LOG_INTERNAL_DCHECK_NOP(val1, val2) ABSL_LOG_INTERNAL_DCHECK_NOP(val1, val2)
#define ABSL_DCHECK_LT_IMPL(val1, val1_text, val2, val2_text) \
ABSL_LOG_INTERNAL_DCHECK_NOP(val1, val2)
#define ABSL_DCHECK_GE_IMPL(val1, val1_text, val2, val2_text) \
ABSL_LOG_INTERNAL_DCHECK_NOP(val1, val2)
#define ABSL_DCHECK_GT_IMPL(val1, val1_text, val2, val2_text) \
ABSL_LOG_INTERNAL_DCHECK_NOP(val1, val2)
#endif // def NDEBUG #endif // def NDEBUG
// CHECK_OK // CHECK_OK
#define ABSL_CHECK_OK_IMPL(status) ABSL_LOG_INTERNAL_CHECK_OK(status) #define ABSL_CHECK_OK_IMPL(status, status_text) \
#define ABSL_QCHECK_OK_IMPL(status) ABSL_LOG_INTERNAL_QCHECK_OK(status) ABSL_LOG_INTERNAL_CHECK_OK(status, status_text)
#define ABSL_QCHECK_OK_IMPL(status, status_text) \
ABSL_LOG_INTERNAL_QCHECK_OK(status, status_text)
#ifndef NDEBUG #ifndef NDEBUG
#define ABSL_DCHECK_OK_IMPL(status) ABSL_LOG_INTERNAL_CHECK_OK(status) #define ABSL_DCHECK_OK_IMPL(status, status_text) \
ABSL_LOG_INTERNAL_CHECK_OK(status, status_text)
#else #else
#define ABSL_DCHECK_OK_IMPL(status) \ #define ABSL_DCHECK_OK_IMPL(status, status_text) \
ABSL_LOG_INTERNAL_DCHECK_NOP(status, nullptr) ABSL_LOG_INTERNAL_DCHECK_NOP(status, nullptr)
#endif #endif
// CHECK_STREQ // CHECK_STREQ
#define ABSL_CHECK_STREQ_IMPL(s1, s2) \ #define ABSL_CHECK_STREQ_IMPL(s1, s1_text, s2, s2_text) \
ABSL_LOG_INTERNAL_CHECK_STROP(strcmp, ==, true, s1, s2) ABSL_LOG_INTERNAL_CHECK_STROP(strcmp, ==, true, s1, s1_text, s2, s2_text)
#define ABSL_CHECK_STRNE_IMPL(s1, s2) \ #define ABSL_CHECK_STRNE_IMPL(s1, s1_text, s2, s2_text) \
ABSL_LOG_INTERNAL_CHECK_STROP(strcmp, !=, false, s1, s2) ABSL_LOG_INTERNAL_CHECK_STROP(strcmp, !=, false, s1, s1_text, s2, s2_text)
#define ABSL_CHECK_STRCASEEQ_IMPL(s1, s2) \ #define ABSL_CHECK_STRCASEEQ_IMPL(s1, s1_text, s2, s2_text) \
ABSL_LOG_INTERNAL_CHECK_STROP(strcasecmp, ==, true, s1, s2) ABSL_LOG_INTERNAL_CHECK_STROP(strcasecmp, ==, true, s1, s1_text, s2, s2_text)
#define ABSL_CHECK_STRCASENE_IMPL(s1, s2) \ #define ABSL_CHECK_STRCASENE_IMPL(s1, s1_text, s2, s2_text) \
ABSL_LOG_INTERNAL_CHECK_STROP(strcasecmp, !=, false, s1, s2) ABSL_LOG_INTERNAL_CHECK_STROP(strcasecmp, !=, false, s1, s1_text, s2, s2_text)
#define ABSL_QCHECK_STREQ_IMPL(s1, s2) \ #define ABSL_QCHECK_STREQ_IMPL(s1, s1_text, s2, s2_text) \
ABSL_LOG_INTERNAL_QCHECK_STROP(strcmp, ==, true, s1, s2) ABSL_LOG_INTERNAL_QCHECK_STROP(strcmp, ==, true, s1, s1_text, s2, s2_text)
#define ABSL_QCHECK_STRNE_IMPL(s1, s2) \ #define ABSL_QCHECK_STRNE_IMPL(s1, s1_text, s2, s2_text) \
ABSL_LOG_INTERNAL_QCHECK_STROP(strcmp, !=, false, s1, s2) ABSL_LOG_INTERNAL_QCHECK_STROP(strcmp, !=, false, s1, s1_text, s2, s2_text)
#define ABSL_QCHECK_STRCASEEQ_IMPL(s1, s2) \ #define ABSL_QCHECK_STRCASEEQ_IMPL(s1, s1_text, s2, s2_text) \
ABSL_LOG_INTERNAL_QCHECK_STROP(strcasecmp, ==, true, s1, s2) ABSL_LOG_INTERNAL_QCHECK_STROP(strcasecmp, ==, true, s1, s1_text, s2, s2_text)
#define ABSL_QCHECK_STRCASENE_IMPL(s1, s2) \ #define ABSL_QCHECK_STRCASENE_IMPL(s1, s1_text, s2, s2_text) \
ABSL_LOG_INTERNAL_QCHECK_STROP(strcasecmp, !=, false, s1, s2) ABSL_LOG_INTERNAL_QCHECK_STROP(strcasecmp, !=, false, s1, s1_text, s2, \
s2_text)
#ifndef NDEBUG #ifndef NDEBUG
#define ABSL_DCHECK_STREQ_IMPL(s1, s2) ABSL_CHECK_STREQ_IMPL(s1, s2) #define ABSL_DCHECK_STREQ_IMPL(s1, s1_text, s2, s2_text) \
#define ABSL_DCHECK_STRCASEEQ_IMPL(s1, s2) ABSL_CHECK_STRCASEEQ_IMPL(s1, s2) ABSL_CHECK_STREQ_IMPL(s1, s1_text, s2, s2_text)
#define ABSL_DCHECK_STRNE_IMPL(s1, s2) ABSL_CHECK_STRNE_IMPL(s1, s2) #define ABSL_DCHECK_STRCASEEQ_IMPL(s1, s1_text, s2, s2_text) \
#define ABSL_DCHECK_STRCASENE_IMPL(s1, s2) ABSL_CHECK_STRCASENE_IMPL(s1, s2) ABSL_CHECK_STRCASEEQ_IMPL(s1, s1_text, s2, s2_text)
#define ABSL_DCHECK_STRNE_IMPL(s1, s1_text, s2, s2_text) \
ABSL_CHECK_STRNE_IMPL(s1, s1_text, s2, s2_text)
#define ABSL_DCHECK_STRCASENE_IMPL(s1, s1_text, s2, s2_text) \
ABSL_CHECK_STRCASENE_IMPL(s1, s1_text, s2, s2_text)
#else // ndef NDEBUG #else // ndef NDEBUG
#define ABSL_DCHECK_STREQ_IMPL(s1, s2) ABSL_LOG_INTERNAL_DCHECK_NOP(s1, s2) #define ABSL_DCHECK_STREQ_IMPL(s1, s1_text, s2, s2_text) \
#define ABSL_DCHECK_STRCASEEQ_IMPL(s1, s2) ABSL_LOG_INTERNAL_DCHECK_NOP(s1, s2) ABSL_LOG_INTERNAL_DCHECK_NOP(s1, s2)
#define ABSL_DCHECK_STRNE_IMPL(s1, s2) ABSL_LOG_INTERNAL_DCHECK_NOP(s1, s2) #define ABSL_DCHECK_STRCASEEQ_IMPL(s1, s1_text, s2, s2_text) \
#define ABSL_DCHECK_STRCASENE_IMPL(s1, s2) ABSL_LOG_INTERNAL_DCHECK_NOP(s1, s2) ABSL_LOG_INTERNAL_DCHECK_NOP(s1, s2)
#define ABSL_DCHECK_STRNE_IMPL(s1, s1_text, s2, s2_text) \
ABSL_LOG_INTERNAL_DCHECK_NOP(s1, s2)
#define ABSL_DCHECK_STRCASENE_IMPL(s1, s1_text, s2, s2_text) \
ABSL_LOG_INTERNAL_DCHECK_NOP(s1, s2)
#endif // def NDEBUG #endif // def NDEBUG
#endif // ABSL_LOG_INTERNAL_CHECK_IMPL_H_ #endif // ABSL_LOG_INTERNAL_CHECK_IMPL_H_
absl/log/internal/check_op.h
...@@ -57,35 +57,40 @@ ...@@ -57,35 +57,40 @@
::absl::log_internal::NullStream().InternalStream() ::absl::log_internal::NullStream().InternalStream()
#endif #endif
#define ABSL_LOG_INTERNAL_CHECK_OP(name, op, val1, val2) \ #define ABSL_LOG_INTERNAL_CHECK_OP(name, op, val1, val1_text, val2, val2_text) \
while ( \ while ( \
::std::string* absl_log_internal_check_op_result ABSL_ATTRIBUTE_UNUSED = \ ::std::string* absl_log_internal_check_op_result ABSL_ATTRIBUTE_UNUSED = \
::absl::log_internal::name##Impl( \ ::absl::log_internal::name##Impl( \
::absl::log_internal::GetReferenceableValue(val1), \ ::absl::log_internal::GetReferenceableValue(val1), \
::absl::log_internal::GetReferenceableValue(val2), \ ::absl::log_internal::GetReferenceableValue(val2), \
ABSL_LOG_INTERNAL_STRIP_STRING_LITERAL(#val1 " " #op \ ABSL_LOG_INTERNAL_STRIP_STRING_LITERAL(val1_text \
" " #val2))) \ " " #op " " val2_text))) \
ABSL_LOG_INTERNAL_CHECK(*absl_log_internal_check_op_result).InternalStream() ABSL_LOG_INTERNAL_CHECK(*absl_log_internal_check_op_result).InternalStream()
#define ABSL_LOG_INTERNAL_QCHECK_OP(name, op, val1, val2) \ #define ABSL_LOG_INTERNAL_QCHECK_OP(name, op, val1, val1_text, val2, \
while (::std::string* absl_log_internal_qcheck_op_result = \ val2_text) \
::absl::log_internal::name##Impl( \ while (::std::string* absl_log_internal_qcheck_op_result = \
::absl::log_internal::GetReferenceableValue(val1), \ ::absl::log_internal::name##Impl( \
::absl::log_internal::GetReferenceableValue(val2), \ ::absl::log_internal::GetReferenceableValue(val1), \
ABSL_LOG_INTERNAL_STRIP_STRING_LITERAL(#val1 " " #op \ ::absl::log_internal::GetReferenceableValue(val2), \
" " #val2))) \ ABSL_LOG_INTERNAL_STRIP_STRING_LITERAL( \
val1_text " " #op " " val2_text))) \
ABSL_LOG_INTERNAL_QCHECK(*absl_log_internal_qcheck_op_result).InternalStream() ABSL_LOG_INTERNAL_QCHECK(*absl_log_internal_qcheck_op_result).InternalStream()
#define ABSL_LOG_INTERNAL_CHECK_STROP(func, op, expected, s1, s2) \ #define ABSL_LOG_INTERNAL_CHECK_STROP(func, op, expected, s1, s1_text, s2, \
s2_text) \
while (::std::string* absl_log_internal_check_strop_result = \ while (::std::string* absl_log_internal_check_strop_result = \
::absl::log_internal::Check##func##expected##Impl( \ ::absl::log_internal::Check##func##expected##Impl( \
(s1), (s2), \ (s1), (s2), \
ABSL_LOG_INTERNAL_STRIP_STRING_LITERAL(#s1 " " #op " " #s2))) \ ABSL_LOG_INTERNAL_STRIP_STRING_LITERAL(s1_text " " #op \
" " s2_text))) \
ABSL_LOG_INTERNAL_CHECK(*absl_log_internal_check_strop_result) \ ABSL_LOG_INTERNAL_CHECK(*absl_log_internal_check_strop_result) \
.InternalStream() .InternalStream()
#define ABSL_LOG_INTERNAL_QCHECK_STROP(func, op, expected, s1, s2) \ #define ABSL_LOG_INTERNAL_QCHECK_STROP(func, op, expected, s1, s1_text, s2, \
s2_text) \
while (::std::string* absl_log_internal_qcheck_strop_result = \ while (::std::string* absl_log_internal_qcheck_strop_result = \
::absl::log_internal::Check##func##expected##Impl( \ ::absl::log_internal::Check##func##expected##Impl( \
(s1), (s2), \ (s1), (s2), \
ABSL_LOG_INTERNAL_STRIP_STRING_LITERAL(#s1 " " #op " " #s2))) \ ABSL_LOG_INTERNAL_STRIP_STRING_LITERAL(s1_text " " #op \
" " s2_text))) \
ABSL_LOG_INTERNAL_QCHECK(*absl_log_internal_qcheck_strop_result) \ ABSL_LOG_INTERNAL_QCHECK(*absl_log_internal_qcheck_strop_result) \
.InternalStream() .InternalStream()
// This one is tricky: // This one is tricky:
...@@ -108,33 +113,35 @@ ...@@ -108,33 +113,35 @@
// * As usual, no braces so we can stream into the expansion with `operator<<`. // * As usual, no braces so we can stream into the expansion with `operator<<`.
// * Also as usual, it must expand to a single (partial) statement with no // * Also as usual, it must expand to a single (partial) statement with no
// ambiguous-else problems. // ambiguous-else problems.
#define ABSL_LOG_INTERNAL_CHECK_OK(val) \ #define ABSL_LOG_INTERNAL_CHECK_OK(val, val_text) \
for (::std::pair<const ::absl::Status*, ::std::string*> \ for (::std::pair<const ::absl::Status*, ::std::string*> \
absl_log_internal_check_ok_goo; \ absl_log_internal_check_ok_goo; \
absl_log_internal_check_ok_goo.first = \ absl_log_internal_check_ok_goo.first = \
::absl::log_internal::AsStatus(val), \ ::absl::log_internal::AsStatus(val), \
absl_log_internal_check_ok_goo.second = \ absl_log_internal_check_ok_goo.second = \
ABSL_PREDICT_TRUE(absl_log_internal_check_ok_goo.first->ok()) \ ABSL_PREDICT_TRUE(absl_log_internal_check_ok_goo.first->ok()) \
? nullptr \ ? nullptr \
: ::absl::status_internal::MakeCheckFailString( \ : ::absl::status_internal::MakeCheckFailString( \
absl_log_internal_check_ok_goo.first, \ absl_log_internal_check_ok_goo.first, \
ABSL_LOG_INTERNAL_STRIP_STRING_LITERAL(#val " is OK")), \ ABSL_LOG_INTERNAL_STRIP_STRING_LITERAL(val_text \
!ABSL_PREDICT_TRUE(absl_log_internal_check_ok_goo.first->ok());) \ " is OK")), \
ABSL_LOG_INTERNAL_CHECK(*absl_log_internal_check_ok_goo.second) \ !ABSL_PREDICT_TRUE(absl_log_internal_check_ok_goo.first->ok());) \
ABSL_LOG_INTERNAL_CHECK(*absl_log_internal_check_ok_goo.second) \
.InternalStream() .InternalStream()
#define ABSL_LOG_INTERNAL_QCHECK_OK(val) \ #define ABSL_LOG_INTERNAL_QCHECK_OK(val, val_text) \
for (::std::pair<const ::absl::Status*, ::std::string*> \ for (::std::pair<const ::absl::Status*, ::std::string*> \
absl_log_internal_check_ok_goo; \ absl_log_internal_check_ok_goo; \
absl_log_internal_check_ok_goo.first = \ absl_log_internal_check_ok_goo.first = \
::absl::log_internal::AsStatus(val), \ ::absl::log_internal::AsStatus(val), \
absl_log_internal_check_ok_goo.second = \ absl_log_internal_check_ok_goo.second = \
ABSL_PREDICT_TRUE(absl_log_internal_check_ok_goo.first->ok()) \ ABSL_PREDICT_TRUE(absl_log_internal_check_ok_goo.first->ok()) \
? nullptr \ ? nullptr \
: ::absl::status_internal::MakeCheckFailString( \ : ::absl::status_internal::MakeCheckFailString( \
absl_log_internal_check_ok_goo.first, \ absl_log_internal_check_ok_goo.first, \
ABSL_LOG_INTERNAL_STRIP_STRING_LITERAL(#val " is OK")), \ ABSL_LOG_INTERNAL_STRIP_STRING_LITERAL(val_text \
!ABSL_PREDICT_TRUE(absl_log_internal_check_ok_goo.first->ok());) \ " is OK")), \
ABSL_LOG_INTERNAL_QCHECK(*absl_log_internal_check_ok_goo.second) \ !ABSL_PREDICT_TRUE(absl_log_internal_check_ok_goo.first->ok());) \
ABSL_LOG_INTERNAL_QCHECK(*absl_log_internal_check_ok_goo.second) \
.InternalStream() .InternalStream()
namespace absl { namespace absl {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment