VirtualMachine: Add support for procedure arguments

Author: adazem009

src/engine/virtualmachine.cpp

@@ -154,7 +154,10 @@ unsigned int *VirtualMachine::run(unsigned int *pos)
         &&do_str_length,
         &&do_str_contains,
         &&do_exec,
-        &&do_call_procedure
+        &&do_init_procedure,
+        &&do_call_procedure,
+        &&do_add_arg,
+        &&do_read_arg
     };
     unsigned int *loopStart;
     unsigned int *loopEnd;
@@ -171,6 +174,11 @@ unsigned int *VirtualMachine::run(unsigned int *pos)
     } else {
         pos = m_callTree.back();
         m_callTree.pop_back();
+        m_procedureArgTree.pop_back();
+        if (m_procedureArgTree.empty())
+            m_procedureArgs = nullptr;
+        else
+            m_procedureArgs = &m_procedureArgTree.back();
         DISPATCH();
     }
 
@@ -596,8 +604,26 @@ do_list_get_item : {
     FREE_REGS(m_functions[*++pos](this));
     DISPATCH();
 
+do_init_procedure:
+    m_procedureArgTree.push_back({});
+    if (m_procedureArgTree.size() >= 2)
+        m_procedureArgs = &m_procedureArgTree[m_procedureArgTree.size() - 2];
+    m_nextProcedureArgs = &m_procedureArgTree.back();
+    DISPATCH();
+
 do_call_procedure:
     m_callTree.push_back(++pos);
+    m_procedureArgs = m_nextProcedureArgs;
+    m_nextProcedureArgs = nullptr;
     pos = m_procedures[*pos];
     DISPATCH();
+
+do_add_arg:
+    m_nextProcedureArgs->push_back(*READ_LAST_REG());
+    FREE_REGS(1);
+    DISPATCH();
+
+do_read_arg:
+    ADD_RET_VALUE(m_procedureArgs->operator[](*++pos));
+    DISPATCH();
 }

src/engine/virtualmachine.h

@@ -59,17 +59,20 @@ enum Opcode
     OP_LIST_DEL,         /*!< Deletes the index (or item like "last" or "random") stored in the last register of the list with the index in the argument. */
     OP_LIST_DEL_ALL,     /*!< Clears the list with the index in the argument. */
     OP_LIST_INSERT,      /*!< Inserts the value from the second last register at the index (or item like "last" or "random") stored in the last register to the list with the index in the argument. */
-    OP_LIST_REPLACE,  /*!< Replaces the index (or item like "last" or "random") stored in the second last register with the value from the last register in the list with the index in the argument. */
-    OP_LIST_GET_ITEM, /*!< Stores the value at the index (or item like "last" or "random") (of the list with the index in the argument) stored in the last register, in the last register. */
-    OP_LIST_INDEX_OF, /*!< Stores the index of the value from the last register in the last register (of the list with the index in the argument). */
-    OP_LIST_LENGTH,   /*!< Stores the length of the list with the index in the argument, in the last register. */
-    OP_LIST_CONTAINS, /*!< Stores true in the last register if the list with the index in the argument contains the value from the last register. */
-    OP_STR_CONCAT,    /*!< Concatenates the strings stored in the last 2 registers and stores the result in the last register, deleting the input registers. */
-    OP_STR_AT,        /*! Stores the character at index in the last register of the string in the second last register, in the last register. */
-    OP_STR_LENGTH,    /*! Stores the length of the string in the last register, in the last register. */
-    OP_STR_CONTAINS,  /*! Stores true in the last register if the string stored in the second last register contains the substring in the last register. */
-    OP_EXEC,          /*!< Calls the function with the index in the argument. */
-    OP_CALL_PROCEDURE /*! Calls the procedure (custom block) with the index in the argument. */
+    OP_LIST_REPLACE,   /*!< Replaces the index (or item like "last" or "random") stored in the second last register with the value from the last register in the list with the index in the argument. */
+    OP_LIST_GET_ITEM,  /*!< Stores the value at the index (or item like "last" or "random") (of the list with the index in the argument) stored in the last register, in the last register. */
+    OP_LIST_INDEX_OF,  /*!< Stores the index of the value from the last register in the last register (of the list with the index in the argument). */
+    OP_LIST_LENGTH,    /*!< Stores the length of the list with the index in the argument, in the last register. */
+    OP_LIST_CONTAINS,  /*!< Stores true in the last register if the list with the index in the argument contains the value from the last register. */
+    OP_STR_CONCAT,     /*!< Concatenates the strings stored in the last 2 registers and stores the result in the last register, deleting the input registers. */
+    OP_STR_AT,         /*! Stores the character at index in the last register of the string in the second last register, in the last register. */
+    OP_STR_LENGTH,     /*! Stores the length of the string in the last register, in the last register. */
+    OP_STR_CONTAINS,   /*! Stores true in the last register if the string stored in the second last register contains the substring in the last register. */
+    OP_EXEC,           /*!< Calls the function with the index in the argument. */
+    OP_INIT_PROCEDURE, /*!< Initializes the list of procedure (custom block) arguments. */
+    OP_CALL_PROCEDURE, /*! Calls the procedure (custom block) with the index in the argument. */
+    OP_ADD_ARG,        /*!< Adds a procedure (custom block) argument with the value from the last register. */
+    OP_READ_ARG        /*!< Reads the procedure (custom block) argument with the index in the argument and stores the value in the last register. */
 };
 
 }
@@ -113,7 +116,7 @@ class LIBSCRATCHCPP_EXPORT VirtualMachine
         unsigned int *run(unsigned int *pos);
 
         static inline const unsigned int instruction_arg_count[] = {
-            0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 1, 1
+            0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 1, 1, 0
         };
 
         typedef struct
@@ -131,6 +134,9 @@ class LIBSCRATCHCPP_EXPORT VirtualMachine
         bool m_atEnd = false;
         std::vector<Loop> m_loops;
         std::vector<unsigned int *> m_callTree;
+        std::vector<std::vector<Value>> m_procedureArgTree;
+        std::vector<Value> *m_procedureArgs = nullptr;
+        std::vector<Value> *m_nextProcedureArgs = nullptr;
 
         unsigned int **m_procedures = nullptr;
         std::vector<unsigned int *> m_proceduresVector;