ScriptBuilder: Rewrite run()

Author: adazem009

src/test/scriptbuilder.cpp

@@ -12,6 +12,7 @@
 #include <scratchcpp/variable.h>
 #include <scratchcpp/list.h>
 #include <scratchcpp/broadcast.h>
+#include <scratchcpp/thread.h>
 
 #include "scriptbuilder_p.h"
 
@@ -37,6 +38,7 @@ ScriptBuilder::ScriptBuilder(IExtension *extension, IEngine *engine, std::shared
             return nullptr;
         });
         addBlockToList(block);
+        impl->hatBlock = block.get();
     }
 
     // Add compile function for return value capture block
@@ -275,7 +277,11 @@ void ScriptBuilder::build()
 /*! Runs the built script. */
 void ScriptBuilder::run()
 {
-    impl->engine->run();
+    impl->engine->startScript(impl->hatBlock, impl->target.get());
+
+    do {
+        impl->engine->step();
+    } while (impl->engine->isRunning());
 }
 
 /*! Returns the list of captured block return values. */

src/test/scriptbuilder_p.h

@@ -27,6 +27,7 @@ class ScriptBuilderPrivate
 
         IEngine *engine = nullptr;
         std::shared_ptr<Target> target;
+        Block *hatBlock = nullptr;
         Block *lastBlock = nullptr;
         std::vector<std::shared_ptr<Block>> blocks;
         std::vector<std::shared_ptr<Block>> inputBlocks;