From be6a05916f5e5e6ecf247bb049b7d1760bda931f Mon Sep 17 00:00:00 2001
From: Ethiraric <ethiraric@gmail.com>
Date: Tue, 26 Dec 2023 18:08:21 +0100
Subject: [PATCH] Add debugging helpers.

---
 saphyr/examples/dump_events.rs | 4 +++-
 saphyr/src/scanner.rs          | 6 ++++++
 saphyr/tests/spec_test.rs      | 2 +-
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/saphyr/examples/dump_events.rs b/saphyr/examples/dump_events.rs
index 876902c..49c564c 100644
--- a/saphyr/examples/dump_events.rs
+++ b/saphyr/examples/dump_events.rs
@@ -16,6 +16,7 @@ struct EventSink {
 
 impl MarkedEventReceiver for EventSink {
     fn on_event(&mut self, ev: Event, mark: Marker) {
+        eprintln!("    \x1B[;34m\u{21B3} {:?}\x1B[;m", &ev);
         self.events.push((ev, mark));
     }
 }
@@ -34,5 +35,6 @@ fn main() {
     let mut s = String::new();
     f.read_to_string(&mut s).unwrap();
 
-    dbg!(str_to_events(&s));
+    // dbg!(str_to_events(&s));
+    str_to_events(&s);
 }
diff --git a/saphyr/src/scanner.rs b/saphyr/src/scanner.rs
index c6c1015..9de8771 100644
--- a/saphyr/src/scanner.rs
+++ b/saphyr/src/scanner.rs
@@ -244,6 +244,12 @@ impl<T: Iterator<Item = char>> Iterator for Scanner<T> {
             return None;
         }
         match self.next_token() {
+            Ok(Some(tok)) => {
+                if std::env::var("YAMLRUST_DEBUG").is_ok() {
+                    eprintln!("\x1B[;32m{:?} \x1B[;36m{:?}\x1B[;m", tok.1, tok.0);
+                }
+                Some(tok)
+            }
             Ok(tok) => tok,
             Err(e) => {
                 self.error = Some(e);
diff --git a/saphyr/tests/spec_test.rs b/saphyr/tests/spec_test.rs
index 5e6dfa3..f78aa58 100644
--- a/saphyr/tests/spec_test.rs
+++ b/saphyr/tests/spec_test.rs
@@ -59,7 +59,7 @@ macro_rules! assert_next {
         match $v.next().unwrap() {
             $p => {}
             e => {
-                panic!("unexpected event: {:?}", e);
+                panic!("unexpected event: {:?} (expected {:?})", e, stringify!($p));
             }
         }
     };