Add topBlock property to Script

Author: adazem009

include/scratchcpp/script.h

@@ -12,6 +12,7 @@ namespace libscratchcpp
 {
 
 class Target;
+class Block;
 class IEngine;
 class Value;
 class VirtualMachine;
@@ -23,10 +24,11 @@ class ScriptPrivate;
 class LIBSCRATCHCPP_EXPORT Script
 {
     public:
-        Script(Target *target, IEngine *engine);
+        Script(Target *target, std::shared_ptr<Block> topBlock, IEngine *engine);
         Script(const Script &) = delete;
 
         Target *target() const;
+        std::shared_ptr<Block> topBlock() const;
 
         unsigned int *bytecode() const;
         const std::vector<unsigned int> &bytecodeVector() const;

src/engine/internal/engine.cpp

@@ -120,7 +120,7 @@ void Engine::compile()
             if (block->topLevel() && !block->shadow()) {
                 auto section = blockSection(block->opcode());
                 if (section) {
-                    auto script = std::make_shared<Script>(target.get(), this);
+                    auto script = std::make_shared<Script>(target.get(), block, this);
                     m_scripts[block] = script;
 
                     compiler.compile(block);
@@ -581,11 +581,8 @@ bool Engine::broadcastByPtrRunning(Broadcast *broadcast)
 
         for (auto thread : m_threads) {
             if (!thread->atEnd()) {
-                // TODO: Store the top block in Script
                 Script *script = thread->script();
-                auto it = std::find_if(m_scripts.begin(), m_scripts.end(), [script](const std::pair<std::shared_ptr<Block>, std::shared_ptr<Script>> pair) { return pair.second.get() == script; });
-                assert(it != m_scripts.end());
-                auto topBlock = it->first;
+                auto topBlock = script->topBlock();
 
                 const auto &scripts = m_backdropChangeHats[script->target()];
                 auto scriptIt = std::find(scripts.begin(), scripts.end(), script);
@@ -1301,10 +1298,7 @@ std::vector<std::shared_ptr<VirtualMachine>> Engine::startHats(HatType hatType,
     allScriptsByOpcodeDo(
         hatType,
         [this, hatType, &optMatchFields, &newThreads](Script *script, Target *target) {
-            // TODO: Store the top block in Script
-            auto it = std::find_if(m_scripts.begin(), m_scripts.end(), [script](const std::pair<std::shared_ptr<Block>, std::shared_ptr<Script>> pair) { return pair.second.get() == script; });
-            assert(it != m_scripts.end());
-            auto topBlock = it->first;
+            auto topBlock = script->topBlock();
 
             if (!optMatchFields.empty()) {
                 // Get the field map for this script

src/engine/script.cpp

@@ -13,8 +13,8 @@
 using namespace libscratchcpp;
 
 /*! Constructs Script. */
-Script::Script(Target *target, IEngine *engine) :
-    impl(spimpl::make_unique_impl<ScriptPrivate>(target, engine))
+Script::Script(Target *target, std::shared_ptr<Block> topBlock, IEngine *engine) :
+    impl(spimpl::make_unique_impl<ScriptPrivate>(target, topBlock, engine))
 {
 }
 
@@ -24,6 +24,11 @@ Target *Script::target() const
     return impl->target;
 }
 
+std::shared_ptr<Block> Script::topBlock() const
+{
+    return impl->topBlock;
+}
+
 /*! Returns the bytecode array. */
 unsigned int *Script::bytecode() const
 {

src/engine/script_p.cpp

@@ -4,8 +4,9 @@
 
 using namespace libscratchcpp;
 
-ScriptPrivate::ScriptPrivate(Target *target, IEngine *engine) :
+ScriptPrivate::ScriptPrivate(Target *target, std::shared_ptr<Block> topBlock, IEngine *engine) :
     target(target),
+    topBlock(topBlock),
     engine(engine)
 {
 }

src/engine/script_p.h

@@ -3,25 +3,28 @@
 #pragma once
 
 #include <vector>
+#include <memory>
 #include <scratchcpp/value.h>
 
 namespace libscratchcpp
 {
 
 class Target;
+class Block;
 class IEngine;
 class Variable;
 class List;
 
 struct ScriptPrivate
 {
-        ScriptPrivate(Target *target, IEngine *engine);
+        ScriptPrivate(Target *target, std::shared_ptr<Block> topBlock, IEngine *engine);
         ScriptPrivate(const ScriptPrivate &) = delete;
 
         unsigned int *bytecode = nullptr;
         std::vector<unsigned int> bytecodeVector;
 
         Target *target = nullptr;
+        std::shared_ptr<Block> topBlock;
         IEngine *engine = nullptr;
 
         unsigned int **procedures = nullptr;

test/script/script_test.cpp

@@ -1,4 +1,5 @@
 #include <scratchcpp/script.h>
+#include <scratchcpp/block.h>
 #include <scratchcpp/virtualmachine.h>
 #include <scratchcpp/target.h>
 #include <scratchcpp/sprite.h>
@@ -22,13 +23,15 @@ class ScriptTest : public testing::Test
 
 TEST_F(ScriptTest, Constructors)
 {
-    Script script(&m_target, &m_engine);
+    auto block = std::make_shared<Block>("", "");
+    Script script(&m_target, block, &m_engine);
     ASSERT_EQ(script.target(), &m_target);
+    ASSERT_EQ(script.topBlock(), block);
 }
 
 TEST_F(ScriptTest, Bytecode)
 {
-    Script script(nullptr, nullptr);
+    Script script(nullptr, nullptr, nullptr);
     ASSERT_EQ(script.bytecode(), nullptr);
     ASSERT_TRUE(script.bytecodeVector().empty());
 
@@ -58,7 +61,7 @@ TEST_F(ScriptTest, Start)
     std::shared_ptr<List> list2 = std::make_unique<List>("d", "");
     static std::vector<List *> lists = { list1.get(), list2.get() };
 
-    Script script1(nullptr, nullptr);
+    Script script1(nullptr, nullptr, nullptr);
 
     std::shared_ptr<VirtualMachine> vm = script1.start();
     ASSERT_TRUE(vm);
@@ -71,14 +74,14 @@ TEST_F(ScriptTest, Start)
     ASSERT_EQ(vm->variables(), nullptr);
     ASSERT_EQ(vm->lists(), nullptr);
 
-    Script script2(&m_target, &m_engine);
+    Script script2(&m_target, nullptr, &m_engine);
 
     vm = script2.start();
     ASSERT_TRUE(vm);
     ASSERT_EQ(vm->target(), &m_target);
     ASSERT_EQ(vm->engine(), &m_engine);
 
-    Script script3(&m_target, &m_engine);
+    Script script3(&m_target, nullptr, &m_engine);
     script3.setBytecode(bytecode);
     script3.setProcedures(procedures);
     script3.setFunctions(functions);
@@ -120,7 +123,7 @@ TEST_F(ScriptTest, Start)
     EXPECT_CALL(m_engine, requestRedraw());
     auto clone = root.clone();
 
-    Script script4(&root, &m_engine);
+    Script script4(&root, nullptr, &m_engine);
     script4.setBytecode(bytecode);
     script4.setProcedures(procedures);
     script4.setFunctions(functions);

test/virtual_machine/virtual_machine_test.cpp

@@ -23,7 +23,7 @@ TEST(VirtualMachineTest, Constructors)
 
     Target target;
     Engine engine;
-    Script script(&target, &engine);
+    Script script(&target, nullptr, &engine);
     VirtualMachine vm2(&target, &engine, &script);
     ASSERT_EQ(vm2.target(), &target);
     ASSERT_EQ(vm2.engine(), &engine);