erki/skullc-peripherals
1
0
Fork 0
Code Issues Pull Requests Actions Projects Releases Wiki Activity

Make assert library print out assert expressions

Browse Source
This commit is contained in:
Erki 2022-06-30 19:44:50 +03:00
parent c0a622c5e4
commit eef2e1318c
4 changed files with 24 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Tests/assert.cpp
View File

@ -5,14 +5,14 @@
#include <catch2/catch.hpp> #include <catch2/catch.hpp>
#ifdef NDEBUG #ifdef NDEBUG
# undef NDEBUG #undef NDEBUG
# define NDEBUG_WAS_SET #define NDEBUG_WAS_SET
#endif #endif
#include "utility_assert.hpp" #include "utility_assert.hpp"
#ifdef NDEBUG_WAS_SET #ifdef NDEBUG_WAS_SET
# define NDEBUG #define NDEBUG
#endif #endif
namespace namespace
@ -20,12 +20,12 @@ namespace
bool assert_flag = false; bool assert_flag = false;
void assertCallback(const char*, const int) void assertCallback(const char*, const char*, const int)
{ {
assert_flag = true; assert_flag = true;
} }
} }// namespace
TEST_CASE("Assert debug without NDEBUG gets triggered if check is false.", "[utility],[assert]") TEST_CASE("Assert debug without NDEBUG gets triggered if check is false.", "[utility],[assert]")
{ {

10
Tests/assert_ndebug.cpp
View File

@ -5,14 +5,14 @@
#include <catch2/catch.hpp> #include <catch2/catch.hpp>
#ifndef NDEBUG #ifndef NDEBUG
# define NDEBUG #define NDEBUG
# define NDEBUG_WAS_NOT_DEFINED #define NDEBUG_WAS_NOT_DEFINED
#endif #endif
#include "utility_assert.hpp" #include "utility_assert.hpp"
#ifdef NDEBUG_WAS_NOT_DEFINED #ifdef NDEBUG_WAS_NOT_DEFINED
# undef NDEBUG #undef NDEBUG
#endif #endif
namespace namespace
@ -20,12 +20,12 @@ namespace
bool assert_flag = false; bool assert_flag = false;
void assertCallback(const char*, const int) void assertCallback(const char*, const char*, const int)
{ {
assert_flag = true; assert_flag = true;
} }
} }// namespace
TEST_CASE("Assert debug with NDEBUG is a null-opt.", "[utility],[assert]") TEST_CASE("Assert debug with NDEBUG is a null-opt.", "[utility],[assert]")
{ {

14
Utility/Inc/utility_assert.hpp
View File

@ -8,26 +8,26 @@
namespace Utility::Assert::Detail namespace Utility::Assert::Detail
{ {
void assertImpl(const bool expr, const char* file, const int line); void assertImpl(const char* expression, const char* file, const int line);
} }
#ifndef NDEBUG #ifndef NDEBUG
# define SKULLC_ASSERT_DEBUG(e) Utility::Assert::Detail::assertImpl(e, __FILE__, __LINE__) #define SKULLC_ASSERT_DEBUG(e) (!(e) ? Utility::Assert::Detail::assertImpl(#e, __FILE__, __LINE__) : ((void) 0))
#else #else
# define SKULLC_ASSERT_DEBUG(e) #define SKULLC_ASSERT_DEBUG(e)
#endif #endif
#define SKULLC_ASSERT_SAFE(e) Utility::Assert::Detail::assertImpl(e, __FILE__, __LINE__) #define SKULLC_ASSERT_SAFE(e) (!(e) ? Utility::Assert::Detail::assertImpl(#e, __FILE__, __LINE__) : ((void) 0))
namespace Utility::Assert namespace Utility::Assert
{ {
using assert_cb = void (*)(const char* file, const int line); using assert_cb = void (*)(const char* expression, const char* file, const int line);
void setHandler(assert_cb callback); void setHandler(assert_cb callback);
assert_cb getHandler(); assert_cb getHandler();
} }// namespace Utility::Assert
#endif // SKULLC_UTILITY_ASSERT_HPP_ #endif// SKULLC_UTILITY_ASSERT_HPP_

17
Utility/Src/utility_assert.cpp
View File

@ -19,18 +19,15 @@ namespace Utility::Assert
namespace Detail namespace Detail
{ {
void assertImpl(const bool expr, const char* file, const int line) void assertImpl(const char* expression, const char* file, const int line)
{ {
if (!expr) if (INSTALLED_HANDLER)
{ INSTALLED_HANDLER(expression, file, line);
if (INSTALLED_HANDLER) else
INSTALLED_HANDLER(file, line); std::terminate();
else
std::terminate();
}
} }
} }// namespace Detail
void setHandler(assert_cb callback) void setHandler(assert_cb callback)
{ {
@ -42,4 +39,4 @@ assert_cb getHandler()
return INSTALLED_HANDLER; return INSTALLED_HANDLER;
} }
} }// namespace Utility::Assert