Use RandomGenerator to generate random numbers

Author: adazem009

src/engine/CMakeLists.txt

@@ -18,7 +18,6 @@ target_sources(scratchcpp
     internal/timer.h
     internal/blocksectioncontainer.cpp
     internal/blocksectioncontainer.h
-    internal/global.h
     internal/randomgenerator.h
     internal/randomgenerator.cpp
     internal/irandomgenerator.h

src/engine/internal/global.h

@@ -5,8 +5,6 @@
 #include <vector>
 #include <scratchcpp/value.h>
 
-#include "engine/internal/global.h"
-
 namespace libscratchcpp
 {
 

src/engine/script_p.h

@@ -8,7 +8,7 @@
 #include <cassert>
 
 #include "virtualmachine_p.h"
-#include "internal/global.h"
+#include "internal/randomgenerator.h"
 
 #define MAX_REG_COUNT 1024
 
@@ -29,6 +29,8 @@ using namespace vm;
 
 static const double pi = std::acos(-1); // TODO: Use std::numbers::pi in C++20
 
+IRandomGenerator *VirtualMachinePrivate::rng = nullptr;
+
 const unsigned int VirtualMachinePrivate::instruction_arg_count[] = {
     0, // OP_START
     0, // OP_HALT
@@ -106,6 +108,9 @@ VirtualMachinePrivate::VirtualMachinePrivate(VirtualMachine *vm, Target *target,
         regs[i] = new Value();
     loops.reserve(256);
     callTree.reserve(1024);
+
+    if (!rng)
+        rng = RandomGenerator::instance().get();
 }
 
 VirtualMachinePrivate::~VirtualMachinePrivate()
@@ -360,7 +365,7 @@ do_loop_end : {
     DISPATCH();
 
 do_random:
-    REPLACE_RET_VALUE(randint<long>(READ_REG(0, 2)->toDouble(), READ_REG(1, 2)->toDouble()), 2);
+    REPLACE_RET_VALUE(rng->randint(READ_REG(0, 2)->toDouble(), READ_REG(1, 2)->toDouble()), 2);
     FREE_REGS(1);
     DISPATCH();
 
@@ -539,7 +544,7 @@ do_list_del : {
             index = 0;
         } else if (str == "random") {
             size_t size = list->size();
-            index = size == 0 ? 0 : randint<size_t>(1, size);
+            index = size == 0 ? 0 : rng->randint(1, size);
         } else
             index = 0;
     } else {
@@ -567,7 +572,7 @@ do_list_insert : {
             index = 0;
         } else if (str == "random") {
             size_t size = list->size();
-            index = size == 0 ? 1 : randint<size_t>(1, size);
+            index = size == 0 ? 1 : rng->randint(1, size);
         } else
             index = 0;
     } else {
@@ -594,7 +599,7 @@ do_list_replace : {
             index = list->size();
         else if (str == "random") {
             size_t size = list->size();
-            index = size == 0 ? 0 : randint<size_t>(1, size);
+            index = size == 0 ? 0 : rng->randint(1, size);
         } else
             index = 0;
     } else {
@@ -617,7 +622,7 @@ do_list_get_item : {
             index = list->size();
         else if (str == "random") {
             size_t size = list->size();
-            index = size == 0 ? 0 : randint<size_t>(1, size);
+            index = size == 0 ? 0 : rng->randint(1, size);
         } else
             index = 0;
     } else {

src/engine/virtualmachine_p.cpp

@@ -15,6 +15,7 @@ class IEngine;
 class Script;
 class Value;
 class List;
+class IRandomGenerator;
 
 struct VirtualMachinePrivate
 {
@@ -65,6 +66,8 @@ struct VirtualMachinePrivate
 
         Value **regs = nullptr;
         size_t regCount = 0;
+
+        static IRandomGenerator *rng;
 };
 
 } // namespace libscratchcpp

src/engine/virtualmachine_p.h

@@ -2,13 +2,18 @@
 #include <scratchcpp/list.h>
 #include <scratchcpp/script.h>
 #include <enginemock.h>
+#include <randomgeneratormock.h>
 
+#include "engine/virtualmachine_p.h"
 #include "engine/internal/engine.h"
+#include "engine/internal/randomgenerator.h"
 #include "../common.h"
 
 using namespace libscratchcpp;
 using namespace vm;
 
+using ::testing::Return;
+
 TEST(VirtualMachineTest, Constructors)
 {
     VirtualMachine vm1;
@@ -867,11 +872,19 @@ TEST(VirtualMachineTest, OP_LIST_DEL)
     list1.push_back("h");
     List *lists[] = { &list1 };
 
+    RandomGeneratorMock rng;
+    VirtualMachinePrivate::rng = &rng;
+
     VirtualMachine vm;
     vm.setBytecode(bytecode);
     vm.setConstValues(constValues);
     vm.setLists(lists);
+
+    EXPECT_CALL(rng, randint(1, 4)).WillOnce(Return(2));
     vm.run();
+
+    VirtualMachinePrivate::rng = RandomGenerator::instance().get();
+
     ASSERT_EQ(vm.registerCount(), 14);
     ASSERT_EQ(vm.getInput(0, 14)->toString(), "a b d e f g h");
     ASSERT_EQ(vm.getInput(1, 14)->toString(), "b d e f g h");
@@ -931,11 +944,19 @@ TEST(VirtualMachineTest, OP_LIST_INSERT)
     list1.push_back("h");
     List *lists[] = { &list1 };
 
+    RandomGeneratorMock rng;
+    VirtualMachinePrivate::rng = &rng;
+
     VirtualMachine vm;
     vm.setBytecode(bytecode);
     vm.setConstValues(constValues);
     vm.setLists(lists);
+
+    EXPECT_CALL(rng, randint(1, 12)).WillOnce(Return(5));
     vm.run();
+
+    VirtualMachinePrivate::rng = RandomGenerator::instance().get();
+
     ASSERT_EQ(vm.registerCount(), 13);
     ASSERT_EQ(vm.getInput(0, 13)->toString(), "a b new item c d e f g h");
     ASSERT_EQ(vm.getInput(1, 13)->toString(), "new item a b new item c d e f g h");
@@ -976,11 +997,19 @@ TEST(VirtualMachineTest, OP_LIST_REPLACE)
     list1.push_back("h");
     List *lists[] = { &list1 };
 
+    RandomGeneratorMock rng;
+    VirtualMachinePrivate::rng = &rng;
+
     VirtualMachine vm;
     vm.setBytecode(bytecode);
     vm.setConstValues(constValues);
     vm.setLists(lists);
+
+    EXPECT_CALL(rng, randint(1, 8)).WillOnce(Return(7));
     vm.run();
+
+    VirtualMachinePrivate::rng = RandomGenerator::instance().get();
+
     ASSERT_EQ(vm.registerCount(), 13);
     ASSERT_EQ(vm.getInput(0, 13)->toString(), "a b new item d e f g h");
     ASSERT_EQ(vm.getInput(1, 13)->toString(), "new item b new item d e f g h");
@@ -1016,11 +1045,19 @@ TEST(VirtualMachineTest, OP_LIST_GET_ITEM)
     list1.push_back("h");
     List *lists[] = { &list1 };
 
+    RandomGeneratorMock rng;
+    VirtualMachinePrivate::rng = &rng;
+
     VirtualMachine vm;
     vm.setBytecode(bytecode);
     vm.setConstValues(constValues);
     vm.setLists(lists);
+
+    EXPECT_CALL(rng, randint(1, 8)).WillOnce(Return(1));
     vm.run();
+
+    VirtualMachinePrivate::rng = RandomGenerator::instance().get();
+
     ASSERT_EQ(vm.registerCount(), 13);
     ASSERT_EQ(vm.getInput(0, 13)->toString(), "c");
     ASSERT_EQ(vm.getInput(1, 13)->toString(), "a");