cycle detecion on cart print - no longer stack overflow

2022-07-02 01:17:31 +02:00 · 2022-07-02 01:17:31 +02:00 · 18943f184d
parent 167a5077df
commit 18943f184d
1 changed files with 6 additions and 7 deletions
--- a/ablescript/src/value/mod.rs
+++ b/ablescript/src/value/mod.rs
@ -148,13 +148,12 @@ impl Display for Value {
                cart_vec.sort_by(|x, y| x.0.partial_cmp(y.0).unwrap_or(std::cmp::Ordering::Less));

                for (idx, (key, value)) in cart_vec.into_iter().enumerate() {
-                    write!(
-                        f,
-                        "{}{} <= {}",
-                        if idx != 0 { ", " } else { "" },
-                        value.borrow(),
-                        key
-                    )?;
+                    write!(f, "{}", if idx != 0 { ", " } else { "" },)?;
+                    match &*value.borrow() {
+                        x if std::ptr::eq(x, self) => write!(f, "<cycle>"),
+                        x => write!(f, "{x}"),
+                    }?;
+                    write!(f, " <= {key}")?;
                }

                write!(f, "]")