diff --git a/lib/libimhex/include/hex/pattern_language/log_console.hpp b/lib/libimhex/include/hex/pattern_language/log_console.hpp index e956ae041..443be1a31 100644 --- a/lib/libimhex/include/hex/pattern_language/log_console.hpp +++ b/lib/libimhex/include/hex/pattern_language/log_console.hpp @@ -16,7 +16,8 @@ namespace hex::pl { class LogConsole { public: - enum Level { + enum Level + { Debug, Info, Warning, @@ -27,9 +28,7 @@ namespace hex::pl { void log(Level level, const std::string &message); - [[noreturn]] static void abortEvaluation(const std::string &message); - - [[noreturn]] static void abortEvaluation(const std::string &message, const ASTNode *node); + [[noreturn]] static void abortEvaluation(const std::string &message, const ASTNode *node = nullptr); void clear(); diff --git a/lib/libimhex/source/pattern_language/log_console.cpp b/lib/libimhex/source/pattern_language/log_console.cpp index 1a28bbfa4..f40bb6d1e 100644 --- a/lib/libimhex/source/pattern_language/log_console.cpp +++ b/lib/libimhex/source/pattern_language/log_console.cpp @@ -8,15 +8,11 @@ namespace hex::pl { this->m_consoleLog.emplace_back(level, message); } - [[noreturn]] void LogConsole::abortEvaluation(const std::string &message) { - throw PatternLanguageError(0, message); - } - [[noreturn]] void LogConsole::abortEvaluation(const std::string &message, const ASTNode *node) { if (node == nullptr) - abortEvaluation(message); + throw PatternLanguageError(0, "Evaluator: " + message); else - throw PatternLanguageError(node->getLineNumber(), message); + throw PatternLanguageError(node->getLineNumber(), "Evaluator: " + message); } void LogConsole::clear() {