More inputs checking; SFT works correctly

Author: dluman

src/lpc/cmd.py

@@ -75,15 +75,19 @@ def __init__(self):
 
     def parse(self, **kwargs):
         try:
+            self._line = kwargs['line']
             self._arg = kwargs['arg'][0]
             self._val = int(kwargs['arg'][1:3])
         except KeyError:
             pass
+        except:
+            print(f"[ERROR] Invalid instruction at line {self._line}.")
         if self._arg == "9":
             self._arg = kwargs['arg']
         try:
             return self._syntax[self._arg]
         except:
+            print(f"[ERROR] Invalid instruction at line {self._line}.")
             return
 
     @accumulate
@@ -98,7 +102,7 @@ def __sub(self, acc, storage) -> int:
 
     @storage
     def __sta(self, acc, storage):
-        storage._spaces[self._val] = acc.value
+        storage._spaces[self._val] = str(acc.value)[-3:]
 
     @storage
     def __lda(self, acc, storage):
@@ -129,15 +133,17 @@ def __sft(self, acc, storage):
         # Left shift first
         if int(self._val[0]) > 0:
             shifts = int(self._val[0])
+            tmp = str(acc.value)
             for _ in range(shifts):
-                acc.value = f"{acc.value}0"
-            acc.value = acc.value[-3:]
+                tmp = f"{tmp}0"
+            acc.value = tmp[-3:]
         # Right shift second
         if int(self._val[1]) > 0:
             shifts = int(self._val[1])
+            tmp = str(acc.value)
             for _ in range(shifts):
-                acc.value = f"0{acc.value}"
-            acc.value = acc.value[0:3]
+                tmp = f"0{tmp}"
+            acc.value = tmp[0:3]
         acc.value = int(acc.value)
 
     @inputs

src/lpc/main.py

@@ -48,19 +48,27 @@ def main() -> None:
     # convert to a tuple if supplied with
     # comma-separated list
     inputs = Inputs(cliarg.optional.inputs)
-
+    len_inputs = len(inputs._values)
     # Step through instruction list, translate to
     # functions
     while True:
 
         cmd = commands.parse(
+            line = storage._counter,
             arg = storage.retrieve(storage._counter)
         )
 
         arg_types = get_signature(Commands)[cmd.__name__]
 
         if 'inputs' in arg_types:
-            cmd(acc, storage, inputs._values.pop(0))
+            try:
+                cmd(acc, storage, inputs._values.pop(0))
+            except IndexError:
+                # This is the last case to consider
+                print(f"[ERROR] Reached end of inputs.")
+                print(f"        Expected:\t{storage._expected_inputs}")
+                print(f"        Given:\t\t{len_inputs}")
+                sys.exit(1)
         else:
             if cliarg.optional.debug:
                 debug_log(acc, storage)

src/lpc/parts.py

@@ -13,6 +13,7 @@ def __init__(self, instructions):
                 r"\s{2,}|\t{2,}",
                 instruction
             ) for instruction in instructions)
+        self._expected_inputs = 0
         self.__initialize_storage()
 
     def __initialize_storage(self):
@@ -24,6 +25,8 @@ def __initialize_storage(self):
             self._spaces.append(None)
         for instruction in self._program:
             self._spaces[int(instruction[0])] = instruction[1]
+            if instruction[1] == "901":
+                self._expected_inputs += 1
             try:
                 comment = str(instruction[2])
                 if not comment.startswith("@"):
@@ -39,6 +42,7 @@ def __initialize_storage(self):
 
     def retrieve(self, addr):
         if self._spaces[addr] == None:
+            print(f"[ERROR] Program ends abruptly at line {addr}. Did you meant to HALT?")
             sys.exit(1)
         return self._spaces[addr]