feat: load symbol ord

src/integration_test.py

@@ -15,3 +15,15 @@ def test_sum(self):
         except StopIteration:
             pass
         self.assertEqual(data_path.memory[0].arg, 10 + 5)
+
+    def test_mul_input(self):
+        lines = ["RESULT: VAR 0", "LD (2046)", "SUB '0'", "MUL 10", "ST RESULT", "HLT"]
+        instructions = parse_lines(lines)
+        data_path = DataPath("5", print, instructions)
+        control_unit = ControlUnit(1, data_path)
+        try:
+            for i in range(100):
+                control_unit.decode_and_execute()
+        except StopIteration:
+            pass
+        self.assertEqual(data_path.memory[0].arg, 50)

src/translator.py

@@ -38,13 +38,13 @@ def parse_labels(lines: list[str]) -> dict[str, int]:
     return labels
 
 
-def parse_argument(arg: str, labels: dict[str, int]) -> tuple[str | int, Addressing]:
+def parse_argument(arg: str, labels: dict[str, int]) -> tuple[int, Addressing]:
     if len(arg) == 0:
         return None, None
     addressing = parse_addressing(arg)
     if addressing is Addressing.IMMEDIATE:
         if arg[0] == "'" and arg[-1] == "'":  # is literal
-            return arg[1:-1], addressing
+            return ord(arg[1]), addressing
         if arg.isdecimal():
             return int(arg), addressing
         return labels[arg], addressing

src/translator_test.py

@@ -16,7 +16,7 @@ def test_translate_complex(self):
         expected = [
             Instruction(Opcode.LD, 2, Addressing.DIRECT),
             Instruction(Opcode.JMP, 0, Addressing.DIRECT),
-            Instruction(Opcode.VAR, "a", Addressing.IMMEDIATE),
+            Instruction(Opcode.VAR, ord("a"), Addressing.IMMEDIATE),
         ]
         self.assertEqual(transformed, expected)
 
@@ -71,7 +71,7 @@ def test_immediate(self):
         lines = ["ADD 10", "LD 'a'"]
         expected = [
             Instruction(Opcode.ADD, 10, Addressing.IMMEDIATE),
-            Instruction(Opcode.LD, "a", Addressing.IMMEDIATE),
+            Instruction(Opcode.LD, ord("a"), Addressing.IMMEDIATE),
         ]
         transformed = parse_lines(lines)
         self.assertEqual(transformed, expected)