Merge pull request #241 from scratchcpp/clear_vm_registers_in_reset

Clear registers in VirtualMachine::reset()

Author: adazem009

src/engine/virtualmachine.cpp

@@ -175,6 +175,7 @@ void VirtualMachine::reset()
 {
     assert(impl->bytecode);
     impl->pos = impl->bytecode;
+    impl->regCount = 0;
 }
 
 /*! Moves back to the last vm::OP_CHECKPOINT instruction in the bytecode. */

test/blocks/motion_blocks_test.cpp

@@ -369,12 +369,13 @@ TEST_F(MotionBlocksTest, PointTowardsImpl)
     static const std::vector<double> intPosResults = { -101.31, 29.55, -90, 90, 90 };
 
     // point towards (join "_mouse_" "")
+    vm.setBytecode(bytecode1);
+
     for (int i = 0; i < positions.size(); i++) {
         EXPECT_CALL(m_engineMock, mouseX()).WillOnce(Return(positions[i].first));
         EXPECT_CALL(m_engineMock, mouseY()).WillOnce(Return(positions[i].second));
 
-        // TODO: Move setBytecode() out of the loop and use reset() after task #215 is completed
-        vm.setBytecode(bytecode1);
+        vm.reset();
         vm.run();
 
         ASSERT_EQ(vm.registerCount(), 0);
@@ -384,15 +385,15 @@ TEST_F(MotionBlocksTest, PointTowardsImpl)
     // point towards (join "_random_" "")
     sprite.setX(std::round(sprite.x()));
     sprite.setY(std::round(sprite.y()));
+    vm.setBytecode(bytecode2);
 
     for (int i = 0; i < positions.size(); i++) {
         EXPECT_CALL(m_engineMock, stageWidth()).WillOnce(Return(640));
         EXPECT_CALL(m_engineMock, stageHeight()).WillOnce(Return(500));
         EXPECT_CALL(rng, randint(-320, 320)).WillOnce(Return(std::round(positions[i].first)));
         EXPECT_CALL(rng, randint(-250, 250)).WillOnce(Return(std::round(positions[i].second)));
 
-        // TODO: Move setBytecode() out of the loop and use reset() after task #215 is completed
-        vm.setBytecode(bytecode2);
+        vm.reset();
         vm.run();
 
         ASSERT_EQ(vm.registerCount(), 0);
@@ -403,43 +404,46 @@ TEST_F(MotionBlocksTest, PointTowardsImpl)
     sprite.setY(-100.025);
 
     // point towards (join "Sprite2" "")
+    vm.setBytecode(bytecode3);
+
     for (int i = 0; i < positions.size(); i++) {
         anotherSprite.setX(positions[i].first);
         anotherSprite.setY(positions[i].second);
 
         EXPECT_CALL(m_engineMock, findTarget("Sprite2")).WillOnce(Return(3));
         EXPECT_CALL(m_engineMock, targetAt(3)).WillOnce(Return(&anotherSprite));
 
-        // TODO: Move setBytecode() out of the loop and use reset() after task #215 is completed
-        vm.setBytecode(bytecode3);
+        vm.reset();
         vm.run();
 
         ASSERT_EQ(vm.registerCount(), 0);
         ASSERT_EQ(std::round(sprite.direction() * 100) / 100, results[i]);
     }
 
     // point towards (Sprite2)
+    vm.setBytecode(bytecode4);
+
     for (int i = 0; i < positions.size(); i++) {
         anotherSprite.setX(positions[i].first);
         anotherSprite.setY(positions[i].second);
 
         EXPECT_CALL(m_engineMock, targetAt(3)).WillOnce(Return(&anotherSprite));
 
-        // TODO: Move setBytecode() out of the loop and use reset() after task #215 is completed
-        vm.setBytecode(bytecode4);
+        vm.reset();
         vm.run();
 
         ASSERT_EQ(vm.registerCount(), 0);
         ASSERT_EQ(std::round(sprite.direction() * 100) / 100, results[i]);
     }
 
     // point towards (mouse-pointer)
+    vm.setBytecode(bytecode5);
+
     for (int i = 0; i < positions.size(); i++) {
         EXPECT_CALL(m_engineMock, mouseX()).WillOnce(Return(positions[i].first));
         EXPECT_CALL(m_engineMock, mouseY()).WillOnce(Return(positions[i].second));
 
-        // TODO: Move setBytecode() out of the loop and use reset() after task #215 is completed
-        vm.setBytecode(bytecode5);
+        vm.reset();
         vm.run();
 
         ASSERT_EQ(vm.registerCount(), 0);
@@ -449,15 +453,15 @@ TEST_F(MotionBlocksTest, PointTowardsImpl)
     // point towards (random position)
     sprite.setX(std::round(sprite.x()));
     sprite.setY(std::round(sprite.y()));
+    vm.setBytecode(bytecode6);
 
     for (int i = 0; i < positions.size(); i++) {
         EXPECT_CALL(m_engineMock, stageWidth()).WillOnce(Return(640));
         EXPECT_CALL(m_engineMock, stageHeight()).WillOnce(Return(500));
         EXPECT_CALL(rng, randint(-320, 320)).WillOnce(Return(std::round(positions[i].first)));
         EXPECT_CALL(rng, randint(-250, 250)).WillOnce(Return(std::round(positions[i].second)));
 
-        // TODO: Move setBytecode() out of the loop and use reset() after task #215 is completed
-        vm.setBytecode(bytecode6);
+        vm.reset();
         vm.run();
 
         ASSERT_EQ(vm.registerCount(), 0);

test/blocks/sensing_blocks_test.cpp

@@ -360,6 +360,6 @@ TEST_F(SensingBlocksTest, DaysSince2000Impl)
     vm.run();
     SensingBlocks::clock = nullptr;
 
-    ASSERT_EQ(vm.registerCount(), 2); // TODO: Change this to 1 after task #215 is completed
+    ASSERT_EQ(vm.registerCount(), 1);
     ASSERT_EQ(vm.getInput(0, 1)->toDouble(), 747.20278428240817);
 }