Deukhoofd
/
Arbutils
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Throw all exceptions with Arbutils exception.

This commit is contained in:
Deukhoofd 2020-08-15 14:50:17 +02:00
parent 3e96d2fd76
commit f158dbf8a2
Signed by: Deukhoofd
GPG Key ID: F63E044490819F6F
6 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Assert.hpp
View File

@ -1,6 +1,7 @@
#include <sstream>
#include <stdexcept>
#include <string.h>
#include "Exception.hpp"
#define __FILENAME__ (strrchr(__FILE__, '/') ? strrchr(__FILE__, '/') + 1 : __FILE__)
@ -10,7 +11,7 @@
std::stringstream ss; \
ss << "ASSERTION FAILED: [" << __FILENAME__ << " (" << __LINE__ << ")] \""; \
ss << #expr << "\""; \
throw std::logic_error(ss.str()); \
throw ArbUt::Exception(ss.str()); \
}
#define AssertForEach(iterator, assertion) \
{ \

2
src/Collections/Dictionary.hpp
View File

@ -23,7 +23,7 @@ namespace ArbUt {
[[maybe_unused]] const auto& v = _map.insert({key, value});
#ifndef NO_ASSERT
if (!v.second)
throw std::logic_error("Key already exists");
throw ArbUt::Exception("Key already exists");
#endif
}

7
src/Collections/List.hpp
View File

@ -4,6 +4,7 @@
#include <sstream>
#include <stdexcept>
#include <vector>
#include "../Exception.hpp"
namespace ArbUt {
template <class ValueT> class List {
@ -27,7 +28,7 @@ namespace ArbUt {
if (index >= _vector.size() || index < 0) {
std::stringstream ss;
ss << "Index " << index << " is out of bounds.";
throw std::logic_error(ss.str());
throw ArbUt::Exception(ss.str());
}
#endif
return _vector.at(index);
@ -38,7 +39,7 @@ namespace ArbUt {
if (index >= _vector.size() || index < 0) {
std::stringstream ss;
ss << "Index " << index << " is out of bounds.";
throw std::logic_error(ss.str());
throw ArbUt::Exception(ss.str());
}
#endif
return _vector.at(index);
@ -49,7 +50,7 @@ namespace ArbUt {
if (index >= _vector.size() || index < 0) {
std::stringstream ss;
ss << "Index " << index << " is out of bounds.";
throw std::logic_error(ss.str());
throw ArbUt::Exception(ss.str());
}
#endif
const auto& prev = _vector.at(index);

8
src/Exception.hpp
View File

@ -11,20 +11,20 @@
#endif
namespace ArbUt {
class Exception : std::exception {
std::string _msg;
class Exception : std::logic_error {
#if !WINDOWS
backward::StackTrace _stack;
#endif
public:
explicit Exception(std::string msg) : _msg(std::move(msg)) {
explicit Exception(const std::string& msg) : std::logic_error(msg) {
#if !WINDOWS
_stack.load_here(9);
#endif
}
[[nodiscard]] const char* what() const _GLIBCXX_TXN_SAFE_DYN _GLIBCXX_NOTHROW override { return _msg.c_str(); }
public:
const char* what() const _GLIBCXX_TXN_SAFE_DYN _GLIBCXX_NOTHROW override { return logic_error::what(); }
[[nodiscard]] std::string GetStacktrace([[maybe_unused]] size_t depth = 6,
[[maybe_unused]] bool include_addr = true) const {

4
src/Memory/UniquePtrList.hpp
View File

@ -36,7 +36,7 @@ namespace ArbUt {
if (index >= _vector.size()) {
std::stringstream ss;
ss << "Index " << index << " is out of bounds.";
throw std::logic_error(ss.str());
throw ArbUt::Exception(ss.str());
}
#endif
return _vector[index];
@ -61,7 +61,7 @@ namespace ArbUt {
if (index >= _vector.size()) {
std::stringstream ss;
ss << "Index " << index << " is out of bounds.";
throw std::logic_error(ss.str());
throw ArbUt::Exception(ss.str());
}
#endif
delete _vector[index];

10
tests/AssertTests.cpp
View File

@ -8,8 +8,14 @@ TEST_CASE("Assert succeeds if true", "[Utilities]") { REQUIRE_NOTHROW(TestWrappe
TEST_CASE("Assert throws if false", "[Utilities]") { REQUIRE_THROWS(TestWrapper(false)); }
TEST_CASE("Assert throws if false with message", "[Utilities]") {
REQUIRE_THROWS_WITH(TestWrapper(false),
Catch::Matchers::Equals("ASSERTION FAILED: [AssertTests.cpp (3)] \"wrapperExpression\""));
try {
TestWrapper(false);
}
catch (const ArbUt::Exception& e) {
REQUIRE(strcmp(e.what(), "ASSERTION FAILED: [AssertTests.cpp (3)] \"wrapperExpression\"") == 0);
return;
}
throw ArbUt::Exception("Didn't throw.");
}
TEST_CASE("Multiple asserts", "[Utilities]") {