assembler: use common to match registers

2025-06-25 19:29:56 +01:00
parent d9807b5b36
commit 68e459f32b
4 changed files with 46 additions and 28 deletions
@@ -90,19 +90,13 @@ fn test_all_instructions() {

 #[test]
 fn test_registers() {
-    let test_cases = [
-        ("r0", "r0"),
-        ("r15", "r15"),
-        ("sp", "sp"),
-        ("fp", "fp"),
-        ("pc", "pc"),
-    ];
+    let test_cases = [("rg0", "r0"), ("rgf", "rgf"), ("pcx", "pcx")];

    for (input, expected) in &test_cases {
        let tokens = tokenize_source(input).expect("Failed to tokenize register");

        if let TokenType::Register(reg) = &tokens[0].token_type {
-            assert_eq!(reg.name, *expected);
+            assert_eq!(reg.reg.to_string(), *expected);
        } else {
            panic!("Expected register token for {input}");
        }