From 078f00efbdbcbb788eb40271dc91756a21f0ff97 Mon Sep 17 00:00:00 2001
From: Tomer Aberbach <tomeraberbach@gmail.com>
Date: Sat, 17 Sep 2022 20:02:03 -0400
Subject: [PATCH] fix: correctly handle all unrecognized label name cases

---
 .../tomeraberbach/mano/assembly/Compiler.java | 52 +++++++++++--------
 1 file changed, 31 insertions(+), 21 deletions(-)

diff --git a/src/main/java/com/tomeraberbach/mano/assembly/Compiler.java b/src/main/java/com/tomeraberbach/mano/assembly/Compiler.java
index a54cec2..3c5236e 100755
--- a/src/main/java/com/tomeraberbach/mano/assembly/Compiler.java
+++ b/src/main/java/com/tomeraberbach/mano/assembly/Compiler.java
@@ -333,27 +333,37 @@ private static int get12BitNumber(String lexeme, int range) {
   private void replaceLabels(ArrayList<String> labels) {
     // Loops through the instructions to substitute labelMap for hex
     for (int i = 0; i < instructions.size(); i++) {
-      // Checks if there was a label argument for the current instruction
-      if (labels.get(i) != null) {
-        // Checks if the label was ever defined
-        if (this.labelMap.containsKey(labels.get(i))) {
-          // Adds the address of the label to the instruction hex
-          instructions.set(i, instructions.get(i).argument(this.labelMap.get(labels.get(i))));
-        } else {
-          switch (instructions.get(i).tokens().length) {
-            case 1:
-              errors.add("Unrecognized label name, " + instructions.get(i).tokens()[0] + ".");
-              break;
-            case 2:
-              errors.add(
-                  "Unrecognized label name, "
-                      + instructions.get(i).tokens()[1]
-                      + " or potentially missing argument after "
-                      + instructions.get(i).tokens()[0]
-                      + ".");
-              break;
-          }
-        }
+      String label = labels.get(i);
+
+      if (label == null) {
+        continue;
+      }
+
+      // Checks if the label was ever defined
+      if (this.labelMap.containsKey(label)) {
+        // Adds the address of the label to the instruction hex
+        instructions.set(i, instructions.get(i).argument(this.labelMap.get(label)));
+        continue;
+      }
+
+      Token[] tokens = instructions.get(i).tokens();
+
+      switch (tokens.length) {
+        case 1:
+          errors.add("Unrecognized label name, " + tokens[0] + ".");
+          break;
+        case 2:
+        case 3:
+          errors.add(
+              "Unrecognized label name, "
+                  + tokens[1]
+                  + " or potentially missing argument after "
+                  + tokens[0]
+                  + ".");
+          break;
+        default:
+          errors.add(
+              "An unexpected error occurred while processing the following: " + tokens + ".");
       }
     }
   }