Use Compiler::addConstValue() in broadcast blocks

Project data shouldn't be altered when compiling or running projects.

Author: adazem009

src/blocks/eventblocks.cpp

@@ -34,24 +34,28 @@ void EventBlocks::registerBlocks(IEngine *engine)
 void EventBlocks::compileBroadcast(Compiler *compiler)
 {
     auto input = compiler->input(BROADCAST_INPUT);
-    compiler->addInput(input);
+
     if (input->type() != Input::Type::ObscuredShadow) {
-        input->primaryValue()->setValue(compiler->engine()->findBroadcast(input->primaryValue()->value().toString()));
+        compiler->addConstValue(compiler->engine()->findBroadcast(input->primaryValue()->value().toString()));
         compiler->addFunctionCall(&broadcastByIndex);
-    } else
+    } else {
+        compiler->addInput(input);
         compiler->addFunctionCall(&broadcast);
+    }
 }
 
 void EventBlocks::compileBroadcastAndWait(Compiler *compiler)
 {
     auto input = compiler->input(BROADCAST_INPUT);
-    compiler->addInput(input);
+
     if (input->type() != Input::Type::ObscuredShadow) {
-        input->primaryValue()->setValue(compiler->engine()->findBroadcast(input->primaryValue()->value().toString()));
+        int index = compiler->engine()->findBroadcast(input->primaryValue()->value().toString());
+        compiler->addConstValue(index);
         compiler->addFunctionCall(&broadcastByIndexAndWait);
-        compiler->addInput(input);
+        compiler->addConstValue(index);
         compiler->addFunctionCall(&checkBroadcastByIndex);
     } else {
+        compiler->addInput(input);
         compiler->addFunctionCall(&broadcastAndWait);
         compiler->addInput(input);
         compiler->addFunctionCall(&checkBroadcast);

test/blocks/event_blocks_test.cpp

@@ -180,9 +180,8 @@ TEST_F(EventBlocksTest, BroadcastAndWait)
     ASSERT_EQ(
         compiler.bytecode(),
         std::vector<unsigned int>(
-            { vm::OP_START, vm::OP_CONST, 0, vm::OP_EXEC, 0, vm::OP_CONST, 0, vm::OP_EXEC, 1, vm::OP_NULL, vm::OP_NOT, vm::OP_EXEC, 2, vm::OP_NULL, vm::OP_NOT, vm::OP_EXEC, 3, vm::OP_HALT }));
-    ASSERT_EQ(compiler.constValues().size(), 1);
-    ASSERT_EQ(compiler.constValues()[0].toDouble(), 0);
+            { vm::OP_START, vm::OP_CONST, 0, vm::OP_EXEC, 0, vm::OP_CONST, 1, vm::OP_EXEC, 1, vm::OP_NULL, vm::OP_NOT, vm::OP_EXEC, 2, vm::OP_NULL, vm::OP_NOT, vm::OP_EXEC, 3, vm::OP_HALT }));
+    ASSERT_EQ(compiler.constValues(), std::vector<Value>({ 0, 0 }));
     ASSERT_TRUE(compiler.variables().empty());
     ASSERT_TRUE(compiler.lists().empty());
 }