Add variable and list vector setters to VirtualMachine

Author: adazem009

include/scratchcpp/virtualmachine.h

@@ -102,6 +102,8 @@ class LIBSCRATCHCPP_EXPORT VirtualMachine
         void setConstValues(const Value *values);
         void setVariables(Value **variables);
         void setLists(List **lists);
+        void setVariablesVector(const std::vector<Value *> &variables);
+        void setListsVector(const std::vector<List *> &lists);
 
         void setBytecode(unsigned int *code);
 

src/engine/virtualmachine.cpp

@@ -50,6 +50,26 @@ void VirtualMachine::setLists(List **lists)
     impl->lists = lists;
 }
 
+/*!
+ * Sets the vector of variables.
+ * Use this instead of setVariables() if you can't store the array (data pointer) anywhere.
+ */
+void VirtualMachine::setVariablesVector(const std::vector<Value *> &variables)
+{
+    impl->variablesVector = variables;
+    impl->variables = impl->variablesVector.data();
+}
+
+/*!
+ * Sets the vector of lists.
+ * Use this instead of setLists() if you can't store the array (data pointer) anywhere.
+ */
+void VirtualMachine::setListsVector(const std::vector<List *> &lists)
+{
+    impl->listsVector = lists;
+    impl->lists = impl->listsVector.data();
+}
+
 /*! Sets the bytecode of the script. */
 void VirtualMachine::setBytecode(unsigned int *code)
 {

src/engine/virtualmachine_p.h

@@ -59,7 +59,9 @@ struct VirtualMachinePrivate
         BlockFunc *functions = nullptr;
         const Value *constValues = nullptr;
         Value **variables = nullptr;
+        std::vector<Value *> variablesVector;
         List **lists = nullptr;
+        std::vector<List *> listsVector;
 
         Value **regs = nullptr;
         size_t regCount = 0;

test/virtual_machine/virtual_machine_test.cpp

@@ -48,24 +48,35 @@ TEST(VirtualMachineTest, ConstValues)
 
 TEST(VirtualMachineTest, Variables)
 {
-    Value var;
-    Value *variables[] = { &var };
+    Value var1, var2;
+    Value *variables[] = { &var1, &var2 };
 
     VirtualMachine vm;
     ASSERT_EQ(vm.variables(), nullptr);
+
     vm.setVariables(variables);
     ASSERT_EQ(vm.variables(), variables);
+
+    vm.setVariablesVector({ &var1, &var2 });
+    ASSERT_EQ(vm.variables()[0], &var1);
+    ASSERT_EQ(vm.variables()[1], &var2);
 }
 
 TEST(VirtualMachineTest, Lists)
 {
-    List list("", "");
-    List *lists[] = { &list };
+    List list1("", "");
+    List list2("", "");
+    List *lists[] = { &list1, &list2 };
 
     VirtualMachine vm;
     ASSERT_EQ(vm.lists(), nullptr);
+
     vm.setLists(lists);
     ASSERT_EQ(vm.lists(), lists);
+
+    vm.setListsVector({ &list1, &list2 });
+    ASSERT_EQ(vm.lists()[0], &list1);
+    ASSERT_EQ(vm.lists()[1], &list2);
 }
 
 TEST(VirtualMachineTest, Bytecode)