feat(--verbose): prints DP and CC in addition to the current index

Author: ynn

src/interpreter.rs

@@ -1,3 +1,4 @@
+use std::fmt::{self, Display, Formatter};
 use std::io::{self, Write};
 
 use super::cc::CC;
@@ -15,6 +16,19 @@ pub struct Interpreter {
     pub output_buf: Vec<u8>,
 }
 
+impl Display for Interpreter {
+    //The implementation is a bit dirty but see https://github.com/rust-lang/rust/issues/55584 .
+    fn fmt(&self, f: &mut Formatter) -> fmt::Result {
+        write!(
+            f,
+            "{:12} DP:{:5} CC:{:?}",
+            format!("{:?}", self.cur),
+            format!("{:?}", self.dp),
+            self.cc
+        )
+    }
+}
+
 impl Interpreter {
     #[allow(clippy::new_without_default)]
     pub fn new() -> Self {

src/lib.rs

@@ -40,7 +40,7 @@ pub fn run(args: &Args) -> Result<(), Box<dyn Error>> {
         let cur_codel = img.get_codel_at(ip.cur);
         assert!(!cur_codel.is_black());
         if !cur_codel.is_white() {
-            debug_print(args.verbose, &format!("{:?}", ip.cur));
+            debug_print(args.verbose, &ip.to_string());
 
             let iter_max = 8; //changes `dp` and `cc` at most 7 times
             for i in 0..iter_max {
@@ -99,6 +99,8 @@ pub fn run(args: &Args) -> Result<(), Box<dyn Error>> {
             //FIXME: Currently, the average number of iterations needed to find a non-white codel or wall is the size of the current white block.
             //       Ideally it should be O(1) (like `Block::get_corner_index()`).
             loop {
+                debug_print(args.verbose, &ip.to_string());
+
                 if visited.contains(&(ip.cur, ip.dp)) {
                     return Ok(());
                 }
@@ -117,8 +119,6 @@ pub fn run(args: &Args) -> Result<(), Box<dyn Error>> {
                     continue;
                 }
 
-                debug_print(args.verbose, &format!("{:?}", ip.cur));
-
                 ip.cur = next_index.unwrap();
 
                 if next_codel.is_white() {