mirror of
https://github.com/loot/libloot.git
synced 2026-07-27 14:16:01 -07:00
Remove ConditionSyntaxError
It's not usefully different from throwing std::runtime_error.
This commit is contained in:
@@ -232,7 +232,6 @@ set(LIBLOOT_INCLUDE_H_FILES
|
||||
"${CMAKE_SOURCE_DIR}/include/loot/api_decorator.h"
|
||||
"${CMAKE_SOURCE_DIR}/include/loot/database_interface.h"
|
||||
"${CMAKE_SOURCE_DIR}/include/loot/exception/error_categories.h"
|
||||
"${CMAKE_SOURCE_DIR}/include/loot/exception/condition_syntax_error.h"
|
||||
"${CMAKE_SOURCE_DIR}/include/loot/exception/cyclic_interaction_error.h"
|
||||
"${CMAKE_SOURCE_DIR}/include/loot/exception/undefined_group_error.h"
|
||||
"${CMAKE_SOURCE_DIR}/include/loot/enum/edge_type.h"
|
||||
|
||||
@@ -95,9 +95,6 @@ Exceptions
|
||||
.. doxygenclass:: loot::CyclicInteractionError
|
||||
:members:
|
||||
|
||||
.. doxygenclass:: loot::ConditionSyntaxError
|
||||
:members:
|
||||
|
||||
.. doxygenclass:: loot::UndefinedGroupError
|
||||
:members:
|
||||
|
||||
|
||||
@@ -34,7 +34,6 @@
|
||||
#include "loot/api_decorator.h"
|
||||
#include "loot/enum/game_type.h"
|
||||
#include "loot/enum/log_level.h"
|
||||
#include "loot/exception/condition_syntax_error.h"
|
||||
#include "loot/exception/cyclic_interaction_error.h"
|
||||
#include "loot/exception/error_categories.h"
|
||||
#include "loot/exception/undefined_group_error.h"
|
||||
|
||||
@@ -1,41 +0,0 @@
|
||||
/* LOOT
|
||||
|
||||
A load order optimisation tool for Oblivion, Skyrim, Fallout 3 and
|
||||
Fallout: New Vegas.
|
||||
|
||||
Copyright (C) 2012-2016 WrinklyNinja
|
||||
|
||||
This file is part of LOOT.
|
||||
|
||||
LOOT is free software: you can redistribute
|
||||
it and/or modify it under the terms of the GNU General Public License
|
||||
as published by the Free Software Foundation, either version 3 of
|
||||
the License, or (at your option) any later version.
|
||||
|
||||
LOOT is distributed in the hope that it will
|
||||
be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with LOOT. If not, see
|
||||
<https://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#ifndef LOOT_EXCEPTION_CONDITION_SYNTAX_ERROR
|
||||
#define LOOT_EXCEPTION_CONDITION_SYNTAX_ERROR
|
||||
|
||||
#include <system_error>
|
||||
|
||||
namespace loot {
|
||||
/**
|
||||
* @brief An exception class thrown if invalid syntax is encountered when
|
||||
* parsing a metadata condition.
|
||||
*/
|
||||
class ConditionSyntaxError : public std::system_error {
|
||||
public:
|
||||
using std::system_error::system_error;
|
||||
};
|
||||
}
|
||||
|
||||
#endif
|
||||
@@ -45,14 +45,6 @@ LOOT_API const std::error_category& esplugin_category();
|
||||
* derived from std::error_category.
|
||||
*/
|
||||
LOOT_API const std::error_category& libloadorder_category();
|
||||
|
||||
/**
|
||||
* @brief Get the error category that can be used to identify system_error
|
||||
* exceptions that are due to loot condition interpreter errors.
|
||||
* @returns A reference to the static object of unspecified runtime type,
|
||||
* derived from std::error_category.
|
||||
*/
|
||||
LOOT_API const std::error_category& loot_condition_interpreter_category();
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
@@ -47,16 +47,6 @@ class libloadorder_category : public std::error_category {
|
||||
return code.category().name() == name();
|
||||
}
|
||||
};
|
||||
|
||||
class loot_condition_interpreter_category : public std::error_category {
|
||||
const char* name() const noexcept override { return "loot condition interpreter"; }
|
||||
|
||||
std::string message(int) const override { return "loot condition interpreter error"; }
|
||||
|
||||
bool equivalent(const std::error_code& code, int) const noexcept override {
|
||||
return code.category().name() == name();
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
LOOT_API const std::error_category& esplugin_category() {
|
||||
@@ -68,9 +58,4 @@ LOOT_API const std::error_category& libloadorder_category() {
|
||||
static detail::libloadorder_category instance;
|
||||
return instance;
|
||||
}
|
||||
|
||||
LOOT_API const std::error_category& loot_condition_interpreter_category() {
|
||||
static detail::loot_condition_interpreter_category instance;
|
||||
return instance;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -25,11 +25,10 @@
|
||||
#include "api/metadata/condition_evaluator.h"
|
||||
|
||||
#include <sstream>
|
||||
#include <stdexcept>
|
||||
|
||||
#include "api/helpers/crc.h"
|
||||
#include "api/helpers/logging.h"
|
||||
#include "loot/exception/condition_syntax_error.h"
|
||||
#include "loot/exception/error_categories.h"
|
||||
|
||||
namespace loot {
|
||||
void HandleError(std::string_view operation, int returnCode) {
|
||||
@@ -41,7 +40,7 @@ void HandleError(std::string_view operation, int returnCode) {
|
||||
std::string err;
|
||||
lci_get_error_message(&message);
|
||||
if (message == nullptr) {
|
||||
err = fmt::format("Failed to {}. Error code: {}", operation, returnCode);
|
||||
err = fmt::format("Failed to {}. loot-condition-interpreter error code: {}", operation, returnCode);
|
||||
} else {
|
||||
err = fmt::format("Failed to {}. Details: {}", operation, message);
|
||||
}
|
||||
@@ -51,8 +50,7 @@ void HandleError(std::string_view operation, int returnCode) {
|
||||
logger->error(err);
|
||||
}
|
||||
|
||||
throw ConditionSyntaxError(
|
||||
returnCode, loot_condition_interpreter_category(), err);
|
||||
throw std::runtime_error(err);
|
||||
}
|
||||
|
||||
int mapGameType(GameType gameType) {
|
||||
|
||||
@@ -25,8 +25,9 @@ along with LOOT. If not, see
|
||||
#ifndef LOOT_TESTS_API_INTERNALS_METADATA_CONDITION_EVALUATOR_TEST
|
||||
#define LOOT_TESTS_API_INTERNALS_METADATA_CONDITION_EVALUATOR_TEST
|
||||
|
||||
#include <stdexcept>
|
||||
|
||||
#include "api/metadata/condition_evaluator.h"
|
||||
#include "loot/exception/condition_syntax_error.h"
|
||||
#include "tests/common_game_test_fixture.h"
|
||||
|
||||
namespace loot {
|
||||
@@ -90,7 +91,7 @@ TEST_P(ConditionEvaluatorTest,
|
||||
}
|
||||
|
||||
TEST_P(ConditionEvaluatorTest, evaluateShouldThrowForAnInvalidConditionString) {
|
||||
EXPECT_THROW(evaluator_.Evaluate("condition"), ConditionSyntaxError);
|
||||
EXPECT_THROW(evaluator_.Evaluate("condition"), std::runtime_error);
|
||||
}
|
||||
|
||||
TEST_P(ConditionEvaluatorTest,
|
||||
|
||||
Reference in New Issue
Block a user