drinkingtea/nostalgia
drinkingtea/nostalgia
2
0
Fork 0
Code Issues 6 Pull Requests Actions Releases 6 Activity

[ox/std] Remove unnecessary template parameters from assert functions

Browse Source
This commit is contained in:
Gary Talent 2021-04-20 22:08:57 -05:00
parent 6ece0b6f9b
commit a16b56325d
2 changed files with 9 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
deps/ox/src/ox/std/assert.cpp vendored
View File

@ -17,8 +17,7 @@
namespace ox {
template<>
void assertFunc<bool>([[maybe_unused]]const char *file, [[maybe_unused]]int line, [[maybe_unused]]bool pass, [[maybe_unused]]const char *msg) noexcept {
void assertFunc([[maybe_unused]]const char *file, [[maybe_unused]]int line, [[maybe_unused]]bool pass, [[maybe_unused]]const char *msg) noexcept {
if (!pass) {
#if defined(OX_USE_STDLIB)
std::cerr << "\033[31;1;1mASSERT FAILURE:\033[0m (" << file << ':' << line << "): " << msg << std::endl;
@ -31,8 +30,7 @@ void assertFunc<bool>([[maybe_unused]]const char *file, [[maybe_unused]]int line
}
}
template<>
void assertFunc<Error>(const char *file, int line, Error err, const char *assertMsg) noexcept {
void assertFunc(const char *file, int line, const Error &err, const char *assertMsg) noexcept {
if (err) {
#if defined(OX_USE_STDLIB)
std::cerr << "\033[31;1;1mASSERT FAILURE:\033[0m (" << file << ':' << line << "): " << assertMsg << '\n';
@ -41,7 +39,7 @@ void assertFunc<Error>(const char *file, int line, Error err, const char *assert
}
std::cerr << "\tError Code:\t" << err << '\n';
if (err.file != nullptr) {
std::cerr << "\tError Location:\t" << reinterpret_cast<const char*>(err.file) << ':' << err.line << '\n';
std::cerr << "\tError Location:\t" << err.file << ':' << err.line << '\n';
}
printStackTrace(2);
oxTrace("panic").del("") << "Panic: " << assertMsg << " (" << file << ":" << line << ")";
@ -53,14 +51,14 @@ void assertFunc<Error>(const char *file, int line, Error err, const char *assert
}
#if defined(OX_USE_STDLIB)
void panic(const char *file, int line, const char *panicMsg, Error err) noexcept {
void panic(const char *file, int line, const char *panicMsg, const Error &err) noexcept {
std::cerr << "\033[31;1;1mPANIC:\033[0m (" << file << ':' << line << "): " << panicMsg << '\n';
if (err.msg) {
std::cerr << "\tError Message:\t" << err.msg << '\n';
}
std::cerr << "\tError Code:\t" << err << '\n';
if (err.file != nullptr) {
std::cerr << "\tError Location:\t" << reinterpret_cast<const char*>(err.file) << ':' << err.line << '\n';
std::cerr << "\tError Location:\t" << err.file << ':' << err.line << '\n';
}
printStackTrace(2);
oxTrace("panic").del("") << "Panic: " << panicMsg << " (" << file << ":" << line << ")";

14
deps/ox/src/ox/std/assert.hpp vendored
View File

@ -13,23 +13,17 @@
namespace ox {
template<typename T>
void assertFunc(const char*, int, T, const char*) noexcept {
}
void assertFunc(const char *file, int line, bool pass, const char *msg) noexcept;
template<>
void assertFunc<bool>(const char *file, int line, bool pass, const char *msg) noexcept;
void assertFunc(const char *file, int line, const Error &err, const char *msg) noexcept;
template<>
void assertFunc<Error>(const char *file, int line, Error err, const char*) noexcept;
void panic([[maybe_unused]]const char *file, [[maybe_unused]]int line, [[maybe_unused]]const char *msg, [[maybe_unused]]Error err = OxError(0)) noexcept;
void panic([[maybe_unused]]const char *file, [[maybe_unused]]int line, [[maybe_unused]]const char *msg, [[maybe_unused]]const Error &err = OxError(0)) noexcept;
}
#define oxPanic(errCode, msg) ox::panic(__FILE__, __LINE__, msg, errCode)
#ifndef NDEBUG
#define oxAssert(pass, msg) ox::assertFunc<decltype(pass)>(__FILE__, __LINE__, pass, msg)
#define oxAssert(pass, msg) ox::assertFunc(__FILE__, __LINE__, pass, msg)
#else
inline void oxAssert(bool, const char*) {}
inline void oxAssert(ox::Error, const char*) {}