ScriptBuilder: Fix multiple entity references

Author: adazem009

src/dev/test/scriptbuilder.cpp

@@ -174,7 +174,11 @@ void ScriptBuilder::addEntityInput(const std::string &name, const std::string &e
     if (!impl->lastBlock)
         return;
 
-    entity->setId(std::to_string(impl->blockId++));
+    if (std::find(impl->entities.begin(), impl->entities.end(), entity) == impl->entities.end()) {
+        entity->setId(std::to_string(impl->blockId++));
+        impl->entities.push_back(entity);
+    }
+
     auto input = std::make_shared<Input>(name, Input::Type::Shadow);
     input->setPrimaryValue(entityName);
     input->primaryValue()->setValuePtr(entity);
@@ -188,7 +192,11 @@ void ScriptBuilder::addEntityField(const std::string &name, std::shared_ptr<Enti
     if (!impl->lastBlock)
         return;
 
-    entity->setId(std::to_string(impl->blockId++));
+    if (std::find(impl->entities.begin(), impl->entities.end(), entity) == impl->entities.end()) {
+        entity->setId(std::to_string(impl->blockId++));
+        impl->entities.push_back(entity);
+    }
+
     auto field = std::make_shared<Field>(name, Value(), entity);
     impl->lastBlock->addField(field);
 }
@@ -203,8 +211,19 @@ std::shared_ptr<Block> ScriptBuilder::currentBlock()
     if (!impl->lastBlock)
         return nullptr;
 
-    if (!impl->lastBlock->compileFunction())
-        build(std::make_shared<Sprite>());
+    if (!impl->lastBlock->compileFunction()) {
+        auto target = std::make_shared<Sprite>();
+        const auto &variables = impl->target->variables();
+        const auto &lists = impl->target->lists();
+
+        for (auto var : variables)
+            target->addVariable(var);
+
+        for (auto list : lists)
+            target->addList(list);
+
+        build(target);
+    }
 
     return impl->lastBlock;
 }

src/dev/test/scriptbuilder_p.h

@@ -11,6 +11,7 @@ namespace libscratchcpp
 class IEngine;
 class Target;
 class Block;
+class Entity;
 class List;
 
 } // namespace libscratchcpp
@@ -29,6 +30,7 @@ class ScriptBuilderPrivate
         std::shared_ptr<Block> lastBlock;
         std::vector<std::shared_ptr<Block>> blocks;
         std::vector<std::shared_ptr<Block>> inputBlocks;
+        std::vector<std::shared_ptr<Entity>> entities;
         unsigned int blockId = 0;
 };
 

test/dev/test_api/scriptbuilder_test.cpp

@@ -7,7 +7,7 @@
 #include <scratchcpp/input.h>
 #include <scratchcpp/field.h>
 #include <scratchcpp/list.h>
-#include <scratchcpp/broadcast.h>
+#include <scratchcpp/variable.h>
 
 #include "../../common.h"
 #include "testextension.h"
@@ -183,34 +183,42 @@ TEST_F(ScriptBuilderTest, AddDropdownField)
 
 TEST_F(ScriptBuilderTest, AddEntityInput)
 {
-    auto broadcast = std::make_shared<Broadcast>("", "");
-    m_engine->setBroadcasts({ broadcast });
+    auto var = std::make_shared<Variable>("", "");
+    m_target->addVariable(var);
 
     m_builder->addBlock("test_simple");
-    m_builder->addEntityInput("BROADCAST", "test", InputValue::Type::Broadcast, broadcast);
+    m_builder->addEntityInput("VARIABLE", "test", InputValue::Type::Variable, var);
     auto block = m_builder->currentBlock();
     ASSERT_TRUE(block);
     ASSERT_EQ(block->opcode(), "test_simple");
     ASSERT_EQ(block->inputs().size(), 1);
-    ASSERT_EQ(block->inputAt(0)->name(), "BROADCAST");
-    ASSERT_EQ(block->inputAt(0)->primaryValue()->valuePtr(), broadcast);
-    ASSERT_EQ(block->inputAt(0)->primaryValue()->type(), InputValue::Type::Broadcast);
+    ASSERT_EQ(block->inputAt(0)->name(), "VARIABLE");
+    ASSERT_EQ(block->inputAt(0)->primaryValue()->valuePtr(), var);
+    ASSERT_EQ(block->inputAt(0)->primaryValue()->type(), InputValue::Type::Variable);
+
+    m_builder->addBlock("test_simple");
+    m_builder->addEntityInput("VARIABLE", "test", InputValue::Type::Variable, var);
+    m_builder->build();
 }
 
 TEST_F(ScriptBuilderTest, AddEntityField)
 {
-    auto broadcast = std::make_shared<Broadcast>("", "");
-    m_engine->setBroadcasts({ broadcast });
+    auto var = std::make_shared<Variable>("", "");
+    m_target->addVariable(var);
 
     m_builder->addBlock("test_simple");
-    m_builder->addEntityField("BROADCAST", broadcast);
+    m_builder->addEntityField("VARIABLE", var);
     auto block = m_builder->currentBlock();
     ASSERT_TRUE(block);
     ASSERT_EQ(block->opcode(), "test_simple");
     ASSERT_TRUE(block->inputs().empty());
     ASSERT_EQ(block->fields().size(), 1);
-    ASSERT_EQ(block->fieldAt(0)->name(), "BROADCAST");
-    ASSERT_EQ(block->fieldAt(0)->valuePtr(), broadcast);
+    ASSERT_EQ(block->fieldAt(0)->name(), "VARIABLE");
+    ASSERT_EQ(block->fieldAt(0)->valuePtr(), var);
+
+    m_builder->addBlock("test_simple");
+    m_builder->addEntityField("VARIABLE", var);
+    m_builder->build();
 }
 
 TEST_F(ScriptBuilderTest, ReporterBlocks)