Add more getters to VirtualMachine

Author: adazem009

include/scratchcpp/virtualmachine.h

@@ -105,7 +105,11 @@ class LIBSCRATCHCPP_EXPORT VirtualMachine
 
         void setBytecode(unsigned int *code);
 
+        unsigned int **procedures() const;
+        const BlockFunc *functions() const;
         const Value *constValues() const;
+        Value **variables() const;
+        List **lists() const;
 
         unsigned int *bytecode() const;
 

src/engine/virtualmachine.cpp

@@ -57,12 +57,36 @@ void VirtualMachine::setBytecode(unsigned int *code)
     impl->pos = code;
 }
 
+/*! Returns the array of procedures. */
+unsigned int **VirtualMachine::procedures() const
+{
+    return impl->procedures;
+}
+
+/*! Returns the array of functions (block implementation function pointers). */
+const BlockFunc *VirtualMachine::functions() const
+{
+    return impl->functions;
+}
+
 /*! Returns the array of constant values. */
 const Value *VirtualMachine::constValues() const
 {
     return impl->constValues;
 }
 
+/*! Returns the array of Value pointers of variables. */
+Value **VirtualMachine::variables() const
+{
+    return impl->variables;
+}
+
+/*! Returns the array of lists. */
+List **VirtualMachine::lists() const
+{
+    return impl->lists;
+}
+
 /*! Returns the bytecode array. */
 unsigned int *VirtualMachine::bytecode() const
 {

test/virtual_machine/virtual_machine_test.cpp

@@ -25,6 +25,17 @@ TEST(VirtualMachineTest, Constructors)
     ASSERT_EQ(vm2.script(), &script);
 }
 
+TEST(VirtualMachineTest, Procedures)
+{
+    static unsigned int procedure[] = { OP_START, OP_HALT };
+    static unsigned int *procedures[] = { procedure };
+
+    VirtualMachine vm;
+    ASSERT_EQ(vm.procedures(), nullptr);
+    vm.setProcedures(procedures);
+    ASSERT_EQ(vm.procedures(), procedures);
+}
+
 TEST(VirtualMachineTest, ConstValues)
 {
     static Value constValues[] = { "test1", "test2" };
@@ -35,6 +46,28 @@ TEST(VirtualMachineTest, ConstValues)
     ASSERT_EQ(vm.constValues(), constValues);
 }
 
+TEST(VirtualMachineTest, Variables)
+{
+    Value var;
+    Value *variables[] = { &var };
+
+    VirtualMachine vm;
+    ASSERT_EQ(vm.variables(), nullptr);
+    vm.setVariables(variables);
+    ASSERT_EQ(vm.variables(), variables);
+}
+
+TEST(VirtualMachineTest, Lists)
+{
+    List list("", "");
+    List *lists[] = { &list };
+
+    VirtualMachine vm;
+    ASSERT_EQ(vm.lists(), nullptr);
+    vm.setLists(lists);
+    ASSERT_EQ(vm.lists(), lists);
+}
+
 TEST(VirtualMachineTest, Bytecode)
 {
     static unsigned int bytecode[] = { OP_START, OP_HALT };
@@ -1240,7 +1273,17 @@ TEST(VirtualMachineTest, OP_EXEC)
     }
 }
 
-TEST(VirtualMachineTest, Procedures)
+TEST(VirtualMachineTest, Functions)
+{
+    static BlockFunc functions[] = { &testFunction1, &testFunction2 };
+
+    VirtualMachine vm;
+    ASSERT_EQ(vm.functions(), nullptr);
+    vm.setFunctions(functions);
+    ASSERT_EQ(vm.functions(), functions);
+}
+
+TEST(VirtualMachineTest, RunProcedures)
 {
     static unsigned int bytecode[] = {
         OP_START, OP_INIT_PROCEDURE, OP_CONST, 0, OP_ADD_ARG, OP_CONST, 1, OP_ADD_ARG, OP_CALL_PROCEDURE, 0, OP_NULL, OP_EXEC, 0, OP_INIT_PROCEDURE, OP_CALL_PROCEDURE, 1, OP_HALT