Implement new opcodes:

- `PUSH_FLOAT`
- `POP`
- `PUSH_VARIABLE`
- `STORE_VARIABLE`

Author: weaversam8

README.md

@@ -52,25 +52,25 @@ A few gotchas to look out for:
 
 Only a subset of Yarn Spinner opcodes are currently implemented. This will certainly change over time. The current status is:
 
-| OpCode           | Status                                               |
-| ---------------- | ---------------------------------------------------- |
-| `JUMP_TO`        | 🚫  Not Implemented                        |
-| `JUMP`           | 🚫  Not Implemented                        |
-| `RUN_LINE`       | ✅  Implemented in `runner.__run_line`     |
-| `RUN_COMMAND`    | ✅  Implemented in `runner.__run_command`  |
-| `ADD_OPTION`     | ✅  Implemented in `runner.__add_option`   |
-| `SHOW_OPTIONS`   | ✅  Implemented in `runner.__show_options` |
-| `PUSH_STRING`    | 🚫  Not Implemented                        |
-| `PUSH_FLOAT`     | 🚫  Not Implemented                        |
-| `PUSH_BOOL`      | 🚫  Not Implemented                        |
-| `PUSH_NULL`      | 🚫  Not Implemented                        |
-| `JUMP_IF_FALSE`  | 🚫  Not Implemented                        |
-| `POP`            | 🚫  Not Implemented                        |
-| `CALL_FUNC`      | 🚫  Not Implemented                        |
-| `PUSH_VARIABLE`  | 🚫  Not Implemented                        |
-| `STORE_VARIABLE` | 🚫  Not Implemented                        |
-| `STOP`           | ✅  Implemented in `runner.stop`           |
-| `RUN_NODE`       | ✅  Implemented in `runner.__run_node`     |
+| OpCode           | Status                                                 |
+| ---------------- | ------------------------------------------------------ |
+| `JUMP_TO`        | 🚫  Not Implemented                          |
+| `JUMP`           | 🚫  Not Implemented                          |
+| `RUN_LINE`       | ✅  Implemented in `runner.__run_line`       |
+| `RUN_COMMAND`    | ✅  Implemented in `runner.__run_command`    |
+| `ADD_OPTION`     | ✅  Implemented in `runner.__add_option`     |
+| `SHOW_OPTIONS`   | ✅  Implemented in `runner.__show_options`   |
+| `PUSH_STRING`    | 🚫  Not Implemented                          |
+| `PUSH_FLOAT`     | ✅  Implemented in `runner.__push_float`     |
+| `PUSH_BOOL`      | 🚫  Not Implemented                          |
+| `PUSH_NULL`      | 🚫  Not Implemented                          |
+| `JUMP_IF_FALSE`  | 🚫  Not Implemented                          |
+| `POP`            | ✅  Implemented in `runner.__pop`            |
+| `CALL_FUNC`      | 🚫  Not Implemented                          |
+| `PUSH_VARIABLE`  | ✅  Implemented in `runner.__push_variable`  |
+| `STORE_VARIABLE` | ✅  Implemented in `runner.__store_variable` |
+| `STOP`           | ✅  Implemented in `runner.__stop`           |
+| `RUN_NODE`       | ✅  Implemented in `runner.__run_node`       |
 
 ## Development
 

yarnrunner_python/runner.py

@@ -11,6 +11,7 @@ def __init__(self, compiled_yarn_f, names_csv_f, autostart=True) -> None:
         self.__construct_string_lookup_table()
 
         self.visits = {key: 0 for key in self._compiled_yarn.nodes.keys()}
+        self.variables = {}
         self.current_node = None
         self._command_handlers = {}
         self._line_buffer = []
@@ -53,6 +54,11 @@ def debug_vm(self):
         self.debug_vm_instruction_stack()
         print("The current VM data stack is:")
         print(self._vm_data_stack)
+        self.debug_variables()
+
+    def debug_variables(self):
+        print("The current variables stored are:")
+        print(self.variables)
 
     def debug_vm_instruction_stack(self):
         print(f"The current program counter is: {self._program_counter}")
@@ -138,6 +144,19 @@ def __add_option(self, instruction):
     def __show_options(self, _instruction):
         self.paused = True
 
+    def __push_float(self, instruction):
+        self._vm_data_stack.insert(0, instruction.operands[0].float_value)
+
+    def __pop(self, _instruction):
+        self._vm_data_stack.pop(0)
+
+    def __push_variable(self, instruction):
+        self._vm_data_stack.insert(
+            0, self.variables[instruction.operands[0].string_value])
+
+    def __store_variable(self, instruction):
+        self.variables[instruction.operands[0].string_value] = self._vm_data_stack[0]
+
     def __stop(self, _instruction):
         self.finished = True
 
@@ -181,14 +200,14 @@ def noop(instruction):
             Instruction.OpCode.ADD_OPTION: self.__add_option,
             Instruction.OpCode.SHOW_OPTIONS: self.__show_options,
             Instruction.OpCode.PUSH_STRING: noop,
-            Instruction.OpCode.PUSH_FLOAT: noop,
+            Instruction.OpCode.PUSH_FLOAT: self.__push_float,
             Instruction.OpCode.PUSH_BOOL: noop,
             Instruction.OpCode.PUSH_NULL: noop,
             Instruction.OpCode.JUMP_IF_FALSE: noop,
-            Instruction.OpCode.POP: noop,
+            Instruction.OpCode.POP: self.__pop,
             Instruction.OpCode.CALL_FUNC: noop,
-            Instruction.OpCode.PUSH_VARIABLE: noop,
-            Instruction.OpCode.STORE_VARIABLE: noop,
+            Instruction.OpCode.PUSH_VARIABLE: self.__push_variable,
+            Instruction.OpCode.STORE_VARIABLE: self.__store_variable,
             Instruction.OpCode.STOP: self.__stop,
             Instruction.OpCode.RUN_NODE: self.__run_node,
         }