Finish implementation of modifier parsing

Also updated expected_loadfile and test_file in integration tests

Author: ian-h-chamberlain

src/load_file.rs

@@ -146,8 +146,9 @@ impl Instruction {
 impl ToString for Instruction {
     fn to_string(&self) -> String {
         format!(
-            "{} {}, {}",
+            "{}.{} {}, {}",
             self.opcode.to_string(),
+            self.modifier.to_string(),
             self.field_a.to_string(),
             self.field_b.to_string(),
         )

src/parser.rs

@@ -66,16 +66,21 @@ pub fn parse(file_contents: &str) -> Result<Core, Error> {
 }
 
 fn parse_instruction(mut instruction_pairs: Pairs<Rule>) -> Instruction {
+    let mut operation_pairs = instruction_pairs
+        .next()
+        .expect("Operation must be first pair in Instruction")
+        .into_inner();
+
     let opcode = parse_opcode(
-        &instruction_pairs
+        &operation_pairs
             .next()
-            .expect("Opcode must be first pair in Instruction"),
+            .expect("Opcode must be first pair in Operation"),
     );
 
-    let maybe_modifier = instruction_pairs
+    let maybe_modifier = operation_pairs
         .peek()
         .filter(|pair| pair.as_rule() == Rule::Modifier)
-        .map(|pair| Modifier::from_str(pair.as_str()).expect("Invalid Modifier"));
+        .and_then(|pair| Some(parse_modifier(&pair)));
 
     let field_a = parse_field(
         instruction_pairs
@@ -100,6 +105,10 @@ fn parse_instruction(mut instruction_pairs: Pairs<Rule>) -> Instruction {
     }
 }
 
+fn parse_modifier(modifier_pair: &Pair<Rule>) -> Modifier {
+    Modifier::from_str(modifier_pair.as_str().to_uppercase().as_ref()).unwrap()
+}
+
 fn parse_opcode(opcode_pair: &Pair<Rule>) -> Opcode {
     Opcode::from_str(opcode_pair.as_str().to_uppercase().as_ref()).unwrap()
 }

tests/expected_loadfile.red

@@ -1,18 +1,25 @@
-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
+MOV.I $0, $1
+DAT.F $1, $2
+MOV.I $1, $0
+JMP.B $123, $0
+ADD.AB #1, @2
+SUB.F $3, $4
+MUL.F $5, $6
+DIV.F $7, $8
+MOD.F $9, $10
+JMZ.B $0, $0
+JMN.B $0, $0
+DJN.B $0, $0
+CMP.I $0, $0
+SEQ.I $0, $0
+SNE.I $0, $0
+SLT.B $0, $0
+SPL.B $0, $0
+NOP.B $0, $0
+MOV.A $1, $2
+MOV.B $1, $2
+MOV.AB $1, $2
+MOV.BA $1, $2
+MOV.F $1, $2
+MOV.X $1, $2
+MOV.I $1, $2

tests/test_file.red

@@ -24,3 +24,11 @@ nop  0
 ; org  0
 ; equ  0
 ; end  0
+
+mov.a 1, 2
+mov.b 1, 2
+mov.ab 1, 2
+mov.ba 1, 2
+mov.f 1, 2
+mov.x 1, 2
+mov.i 1, 2