Add support for other address modes and test

Author: ian-h-chamberlain

src/data/grammar.txt

@@ -10,7 +10,7 @@ Instruction = _{ Operation ~ Field ~ ("," ~ Field)? }
 
 Operation = ${ Opcode }
 
-Field = ${ AddressMode? ~ Expr }
+Field = !{ AddressMode? ~ Expr }
 
 Opcode = {
     ^"DAT" | ^"MOV" | ^"ADD" | ^"SUB" | ^"MUL" | ^"DIV" | ^"MOD" |
@@ -22,6 +22,6 @@ Modifier = { ^"A" | ^"B" | ^"AB" | ^"BA" | ^"F" | ^"X" | ^"I" }
 
 AddressMode = { "#" | "$" | "*" | "@" | "{" | "<" | "}" | ">" }
 
-Expr = !{ Number }
+Expr = { Number }
 
 Number = @{ ASCII_DIGIT+ }

src/data/redcode.pest

@@ -20,9 +20,6 @@ enum_string!(pub Opcode, {
     Slt => "SLT",
     Spl => "SPL",
     Nop => "NOP",
-    Org => "ORG",
-    Equ => "EQU",
-    End => "END",
 });
 
 impl Default for Opcode {
@@ -31,9 +28,21 @@ impl Default for Opcode {
     }
 }
 
+enum_string!(pub PseudoOpcode, {
+    Org => "ORG",
+    Equ => "EQU",
+    End => "END",
+});
+
 enum_string!(pub AddressMode, {
     Immediate => "#",
-    Direct => "",
+    Direct => "$",
+    IndirectA => "*",
+    IndirectB => "@",
+    PreDecIndirectA => "{",
+    PreDecIndirectB => "<",
+    PostIncIndirectA => "}",
+    PostIncIndirectB => ">",
 });
 
 impl Default for AddressMode {

src/load_file.rs

@@ -155,19 +155,47 @@ mod tests {
 
     #[test]
     fn parse_field_with_mode() {
-        parses_to! {
-            parser: RedcodeParser,
-            input: "#123",
-            rule: Rule::Field,
-            tokens: [
-                Field(0, 4, [
-                    AddressMode(0, 1),
-                    Expr(1, 4, [
-                        Number(1, 4)
+        for test_input in [
+            "#123", "$123", "*123", "@123", "{123", "<123", "}123", ">123",
+        ]
+        .iter()
+        {
+            parses_to! {
+                parser: RedcodeParser,
+                input: test_input,
+                rule: Rule::Field,
+                tokens: [
+                    Field(0, 4, [
+                        AddressMode(0, 1),
+                        Expr(1, 4, [
+                            Number(1, 4)
+                        ]),
+                    ])
+                ]
+            };
+        }
+    }
+
+    #[test]
+    fn parse_opcode_modifier() {
+        for test_input in [
+            "mov.a", "mov.b", "mov.ab", "mov.ba", "mov.f", "mov.x", "mov.i",
+        ]
+        .iter()
+        {
+            dbg!(test_input);
+            parses_to! {
+                parser: RedcodeParser,
+                input: test_input,
+                rule: Rule::Operation,
+                tokens: [
+                    Operation(0, test_input.len(), [
+                        Opcode(0, 3),
+                        Modifier(4, test_input.len()),
                     ]),
-                ])
-            ]
-        };
+                ]
+            }
+        }
     }
 
     #[allow(clippy::cyclomatic_complexity)]

src/parser.rs

@@ -1,21 +1,18 @@
-MOV 0, 1
-DAT 1, 2
-MOV 1, 0
-JMP 123, 0
-ADD 1, 2
-SUB 3, 4
-MUL 5, 6
-DIV 7, 8
-MOD 9, 10
-JMZ 0, 0
-JMN 0, 0
-DJN 0, 0
-CMP 0, 0
-SEQ 0, 0
-SNE 0, 0
-SLT 0, 0
-SPL 0, 0
-NOP 0, 0
-ORG 0, 0
-EQU 0, 0
-END 0, 0
+MOV $0, $1
+DAT $1, $2
+MOV $1, $0
+JMP $123, $0
+ADD #1, @2
+SUB $3, $4
+MUL $5, $6
+DIV $7, $8
+MOD $9, $10
+JMZ $0, $0
+JMN $0, $0
+DJN $0, $0
+CMP $0, $0
+SEQ $0, $0
+SNE $0, $0
+SLT $0, $0
+SPL $0, $0
+NOP $0, $0

tests/expected_loadfile.red

@@ -4,7 +4,7 @@ mov 1, 0
 
 jmp 123
 
-add 1, 2
+add # 1, @ 2
 sub 3, 4
 mul 5, 6
 div 7, 8
@@ -19,6 +19,8 @@ sne  0
 slt  0
 spl  0
 nop  0
-org  0
-equ  0
-end  0 ; TODO optional operands for END or possibly some other opcodes?
+
+; TODO rewrite grammar to handle org, equ, end
+; org  0
+; equ  0
+; end  0