LLVMInstructionList: Add predicate-based contains method

Author: adazem009

src/engine/internal/llvm/llvminstructionlist.cpp

@@ -31,6 +31,20 @@ bool LLVMInstructionList::containsInstruction(LLVMInstruction *ins) const
     return false;
 }
 
+bool LLVMInstructionList::containsInstruction(std::function<bool(const LLVMInstruction *)> func) const
+{
+    LLVMInstruction *ptr = m_first.get();
+
+    while (ptr) {
+        if (func(ptr))
+            return true;
+
+        ptr = ptr->next;
+    }
+
+    return false;
+}
+
 void LLVMInstructionList::addInstruction(std::shared_ptr<LLVMInstruction> ins)
 {
     if (!(m_first && m_last)) {

src/engine/internal/llvm/llvminstructionlist.h

@@ -3,6 +3,7 @@
 #pragma once
 
 #include <memory>
+#include <functional>
 
 namespace libscratchcpp
 {
@@ -19,6 +20,8 @@ class LLVMInstructionList
         LLVMInstruction *last() const;
 
         bool containsInstruction(LLVMInstruction *ins) const;
+        bool containsInstruction(std::function<bool(const LLVMInstruction *)> func) const;
+
         void addInstruction(std::shared_ptr<LLVMInstruction> ins);
 
     private:

test/llvm/llvminstructionlist_test.cpp

@@ -23,6 +23,13 @@ TEST(LLVMInstructionListTest, EmptyList_ContainsNull)
     ASSERT_FALSE(list.containsInstruction(nullptr));
 }
 
+TEST(LLVMInstructionListTest, EmptyList_ContainsFunc)
+{
+    LLVMInstructionList list;
+    auto ins = std::make_shared<LLVMInstruction>(LLVMInstruction::Type::FunctionCall, nullptr, false);
+    ASSERT_FALSE(list.containsInstruction([](const LLVMInstruction *) { return true; }));
+}
+
 TEST(LLVMInstructionListTest, EmptyList_Contains)
 {
     LLVMInstructionList list;
@@ -61,6 +68,27 @@ TEST(LLVMInstructionListTest, SingleInstructionList_ContainsNull)
     ASSERT_FALSE(list.containsInstruction(nullptr));
 }
 
+TEST(LLVMInstructionListTest, SingleInstructionList_ContainsFuncTrue)
+{
+    LLVMInstructionList list;
+
+    auto ins1 = std::make_shared<LLVMInstruction>(LLVMInstruction::Type::FunctionCall, nullptr, false);
+    list.addInstruction(ins1);
+
+    ASSERT_TRUE(list.containsInstruction([](const LLVMInstruction *) { return true; }));
+}
+
+TEST(LLVMInstructionListTest, SingleInstructionList_ContainsFuncFalse)
+{
+    LLVMInstructionList list;
+
+    auto ins1 = std::make_shared<LLVMInstruction>(LLVMInstruction::Type::FunctionCall, nullptr, false);
+    list.addInstruction(ins1);
+
+    auto ins = std::make_shared<LLVMInstruction>(LLVMInstruction::Type::FunctionCall, nullptr, false);
+    ASSERT_FALSE(list.containsInstruction([](const LLVMInstruction *) { return false; }));
+}
+
 TEST(LLVMInstructionListTest, MultipleInstructionList_ContainsExistent)
 {
     LLVMInstructionList list;
@@ -110,6 +138,38 @@ TEST(LLVMInstructionListTest, MultipleInstructionList_ContainsNull)
     ASSERT_FALSE(list.containsInstruction(nullptr));
 }
 
+TEST(LLVMInstructionListTest, MultipleInstructionList_ContainsExistentFunc)
+{
+    LLVMInstructionList list;
+
+    auto ins1 = std::make_shared<LLVMInstruction>(LLVMInstruction::Type::FunctionCall, nullptr, false);
+    list.addInstruction(ins1);
+
+    auto ins2 = std::make_shared<LLVMInstruction>(LLVMInstruction::Type::Stop, nullptr, false);
+    list.addInstruction(ins2);
+
+    auto ins3 = std::make_shared<LLVMInstruction>(LLVMInstruction::Type::FunctionCall, nullptr, false);
+    list.addInstruction(ins3);
+
+    ASSERT_TRUE(list.containsInstruction([](const LLVMInstruction *ins) { return ins->type == LLVMInstruction::Type::Stop; }));
+}
+
+TEST(LLVMInstructionListTest, MultipleInstructionList_ContainsNonExistentFunc)
+{
+    LLVMInstructionList list;
+
+    auto ins1 = std::make_shared<LLVMInstruction>(LLVMInstruction::Type::FunctionCall, nullptr, false);
+    list.addInstruction(ins1);
+
+    auto ins2 = std::make_shared<LLVMInstruction>(LLVMInstruction::Type::FunctionCall, nullptr, false);
+    list.addInstruction(ins2);
+
+    auto ins3 = std::make_shared<LLVMInstruction>(LLVMInstruction::Type::FunctionCall, nullptr, false);
+    list.addInstruction(ins3);
+
+    ASSERT_FALSE(list.containsInstruction([](const LLVMInstruction *ins) { return ins->type == LLVMInstruction::Type::Stop; }));
+}
+
 TEST(LLVMInstructionListTest, AddSingleInstruction_First)
 {
     LLVMInstructionList list;