From d9a587065dd11e525030e07e9b36011b3d0762cc Mon Sep 17 00:00:00 2001 From: Oliver Hamlet Date: Thu, 20 Apr 2023 18:14:17 +0100 Subject: [PATCH] Remove unused MetadataList::EvalAllConditions() --- src/api/metadata_list.cpp | 35 ------------------- src/api/metadata_list.h | 7 ---- src/tests/api/internals/metadata_list_test.h | 36 -------------------- 3 files changed, 78 deletions(-) diff --git a/src/api/metadata_list.cpp b/src/api/metadata_list.cpp index 7e03d203..9cfcea50 100644 --- a/src/api/metadata_list.cpp +++ b/src/api/metadata_list.cpp @@ -277,10 +277,6 @@ void MetadataList::Clear() { plugins_.clear(); regexPlugins_.clear(); messages_.clear(); - - unevaluatedPlugins_.clear(); - unevaluatedRegexPlugins_.clear(); - unevaluatedMessages_.clear(); } std::vector MetadataList::Plugins() const { @@ -376,35 +372,4 @@ void MetadataList::ErasePlugin(const std::string& pluginName) { void MetadataList::AppendMessage(const Message& message) { messages_.push_back(message); } - -void MetadataList::EvalAllConditions(ConditionEvaluator& conditionEvaluator) { - if (unevaluatedPlugins_.empty()) - unevaluatedPlugins_.swap(plugins_); - else - plugins_.clear(); - - for (const auto& plugin : unevaluatedPlugins_) { - plugins_.emplace(plugin.first, - conditionEvaluator.EvaluateAll(plugin.second)); - } - - if (unevaluatedRegexPlugins_.empty()) - unevaluatedRegexPlugins_ = regexPlugins_; - else - regexPlugins_ = unevaluatedRegexPlugins_; - - for (auto& plugin : regexPlugins_) { - plugin = conditionEvaluator.EvaluateAll(plugin); - } - - if (unevaluatedMessages_.empty()) - unevaluatedMessages_.swap(messages_); - else - messages_.clear(); - - for (const auto& message : unevaluatedMessages_) { - if (conditionEvaluator.Evaluate(message.GetCondition())) - messages_.push_back(message); - } -} } diff --git a/src/api/metadata_list.h b/src/api/metadata_list.h index ba46a722..44146691 100644 --- a/src/api/metadata_list.h +++ b/src/api/metadata_list.h @@ -78,9 +78,6 @@ public: void AppendMessage(const Message& message); - // Eval plugin conditions. - void EvalAllConditions(ConditionEvaluator& conditionEvaluator); - private: std::vector groups_; std::vector bashTags_; @@ -88,10 +85,6 @@ private: std::vector regexPlugins_; std::vector messages_; - std::unordered_map unevaluatedPlugins_; - std::vector unevaluatedRegexPlugins_; - std::vector unevaluatedMessages_; - void Load(std::istream& istream, const std::filesystem::path& source_path); }; } diff --git a/src/tests/api/internals/metadata_list_test.h b/src/tests/api/internals/metadata_list_test.h index 5054f158..8eeb5896 100644 --- a/src/tests/api/internals/metadata_list_test.h +++ b/src/tests/api/internals/metadata_list_test.h @@ -451,42 +451,6 @@ TEST_P(MetadataListTest, EXPECT_FALSE(metadataList.FindPlugin(plugin.GetName())); } -TEST_P( - MetadataListTest, - evalAllConditionsShouldEvaluateTheConditionsForThePluginsStoredInTheMetadataList) { - Game game(GetParam(), dataPath.parent_path(), localPath); - ConditionEvaluator evaluator(game.Type(), game.DataPath()); - - MetadataList metadataList; - ASSERT_NO_THROW(metadataList.Load(metadataPath)); - - PluginMetadata plugin = metadataList.FindPlugin(blankEsm).value(); - ASSERT_EQ( - std::vector({ - Message(MessageType::warn, "This is a warning."), - Message(MessageType::say, - "This message should be removed when evaluating conditions.", - "active(\"Blank - Different.esm\")"), - }), - plugin.GetMessages()); - - plugin = metadataList.FindPlugin(blankEsp).value(); - ASSERT_EQ(blankEsp, plugin.GetName()); - ASSERT_FALSE(plugin.HasNameOnly()); - - EXPECT_NO_THROW(metadataList.EvalAllConditions(evaluator)); - - plugin = metadataList.FindPlugin(blankEsm).value(); - EXPECT_EQ(std::vector({ - Message(MessageType::warn, "This is a warning."), - }), - plugin.GetMessages()); - - plugin = metadataList.FindPlugin(blankEsp).value(); - EXPECT_EQ(blankEsp, plugin.GetName()); - EXPECT_TRUE(plugin.GetDirtyInfo().empty()); -} - TEST(ReplaceMetadataListPrelude, shouldReturnAnEmptyStringIfGivenEmptyStrings) { std::string prelude = ""; std::string masterlist = "";