Fix some whitespace in dwarf and cleanup cli

Author: ian-h-chamberlain

src/cli.rs

@@ -24,9 +24,10 @@ pub fn run() -> Result<(), Box<dyn Error>> {
     let parsed_input = parser::parse(input_program.as_str())?;
     let parse_output = parsed_input.dump();
 
-    match cli_options.output_file {
-        Some(output_path) => fs::write(output_path, parse_output)?,
-        None => println!("{}", parse_output),
+    if let Some(output_path) = cli_options.output_file {
+        fs::write(output_path, parse_output)?;
+    } else {
+        println!("{}", parse_output);
     };
 
     Ok(())

tests/data/dwarf.red

@@ -1,23 +1,24 @@
 ;redcode
 
-;name          Dwarf
-;author        A. K. Dewdney
-;version       94.1
-;date          April 29, 1993
+;name           Dwarf
+;author         A. K. Dewdney
+;version        94.1
+;date           April 29, 1993
 
-;strategy      Bombs every fourth instruction.
-;assert        CORESIZE % 4 == 0
+;strategy       Bombs every fourth instruction.
+;assert         (CORESIZE % 4 == 0) && (foo > baz)
 
-        ORG     start              ; Indicates the instruction with
-                                   ; the label "start" should be the
-                                   ; first to execute.
+        ORG     start               ; Indicates the instruction with
+                                    ; the label "start" should be the
+                                    ; first to execute.
 
-step    EQU      4                 ; Replaces all occurrences of "step"
-                                   ; with the character "4".
+step    EQU     4                   ; Replaces all occurrences of "step"
+                                    ; with the character "4".
+
+target  DAT.F   #0,     #0          ; Pointer to target instruction.
+start   ADD.AB  #step,  target      ; Increments pointer by step.
+        MOV.AB  #0,     @target     ; Bombs target instruction.
+        JMP.A   start               ; Same as JMP.A -2.  Loops back to
+                                    ; the instruction labelled "start
 
-target  DAT.F   #0,     #0         ; Pointer to target instruction.
-start   ADD.AB  #step,   target    ; Increments pointer by step.
-        MOV.AB  #0,     @target    ; Bombs target instruction.
-        JMP.A    start             ; Same as JMP.A -2.  Loops back to
-                                   ; the instruction labelled "start".
         END