From 450fbdb74deeb97b2633e50dcd9215d71f5387dc Mon Sep 17 00:00:00 2001
From: Roland Conybeare <rconybeare@gmail.com>
Date: Sat, 19 Jul 2025 11:47:03 -0500
Subject: [PATCH] pretty printing -- copmlete for
 xo::ast::GeneralizedExpression

---
 include/xo/refcnt/pretty_refcnt.hpp | 91 +++++++++++++++--------------
 1 file changed, 46 insertions(+), 45 deletions(-)

diff --git a/include/xo/refcnt/pretty_refcnt.hpp b/include/xo/refcnt/pretty_refcnt.hpp
index ecf53aba..8c1903f1 100644
--- a/include/xo/refcnt/pretty_refcnt.hpp
+++ b/include/xo/refcnt/pretty_refcnt.hpp
@@ -10,66 +10,67 @@
 
 namespace xo {
     namespace print {
+#ifndef ppdetail_atomic
         template <>
         struct ppdetail<xo::ref::Refcount *> {
-            static bool print_upto(ppstate * pps, const xo::ref::Refcount * x) {
-                return ppdetail_atomic<const xo::ref::Refcount *>::print_upto(pps, x);
-            }
-            static void print_pretty(ppstate * pps, const xo::ref::Refcount * x) {
-                ppdetail_atomic<const xo::ref::Refcount *>::print_pretty(pps, x);
+            static bool print_pretty(const ppindentinfo & ppii, const xo::ref::Refcount * x) {
+                return ppdetail_atomic<const xo::ref::Refcount *>::print_pretty(ppii, x);
             }
         };
+#endif
 
         template <typename T>
         struct ppdetail<rp<T>> {
-            static bool print_upto(ppstate * pps, const rp<T> & x) {
-                if (auto p = x.get()) {
-                    return ppdetail<T>::print_upto(pps, *p);
+            static bool print_pretty(const ppindentinfo & ppii, const rp<T> & x) {
+                if (ppii.upto()) {
+                    if (auto p = x.get()) {
+                        return ppdetail<T>::print_pretty(ppii, *p);
+                    } else {
+                        /* note: degenerate case here, since never write newline for nullptr */
+
+                        ppii.pps()->write("<nullptr ");
+                        ppii.pps()->write(reflect::type_name<T>());
+                        ppii.pps()->write(">");
+
+                        return ppii.pps()->has_margin();
+                    }
                 } else {
-                    /* note: degenerate case here, since never write newline for nullptr */
-
-                    pps->write("<nullptr ");
-                    pps->write(reflect::type_name<T>());
-                    pps->write(">");
-
-                    return pps->has_margin();
-                }
-            }
-
-            static void print_pretty(ppstate * pps,  const rp<T> & x) {
-                if (auto p = x.get()) {
-                    ppdetail<T>::print_pretty(pps, *p);
-                } else {
-                    pps->write("<nullptr ");
-                    pps->write(reflect::type_name<T>());
-                    pps->write(">");
+                    if (auto p = x.get()) {
+                        ppdetail<T>::print_pretty(ppii, *p);
+                    } else {
+                        ppii.pps()->write("<nullptr ");
+                        ppii.pps()->write(reflect::type_name<T>());
+                        ppii.pps()->write(">");
+                    }
+                    return false;
                 }
             }
         };
 
         template <typename T>
         struct ppdetail<bp<T>> {
-            static bool print_upto(ppstate * pps, const bp<T> & x) {
-                if (auto p = x.get()) {
-                    return ppdetail<T>::print_upto(pps, *p);
+            static bool print_pretty(const ppindentinfo & ppii, const bp<T> & x) {
+                if (ppii.upto()) {
+                    if (auto p = x.get()) {
+                        return ppdetail<T>::print_pretty(ppii, *p);
+                    } else {
+                        /* note: degenerate case here, since never write newline for nullptr */
+
+                        ppii.pps()->write("<nullptr ");
+                        ppii.pps()->write(reflect::type_name<T>());
+                        ppii.pps()->write(">");
+
+                        return ppii.pps()->has_margin();
+                    }
                 } else {
-                    /* note: degenerate case here, since never write newline for nullptr */
-
-                    pps->write("<nullptr ");
-                    pps->write(reflect::type_name<T>());
-                    pps->write(">");
-
-                    return pps->has_margin();
-                }
-            }
-
-            static void print_pretty(ppstate * pps,  const bp<T> & x) {
-                if (auto p = x.get()) {
-                    ppdetail<T>::print_pretty(pps, *p);
-                } else {
-                    pps->write("<nullptr ");
-                    pps->write(reflect::type_name<T>());
-                    pps->write(">");
+                    if (auto p = x.get()) {
+                        ppdetail<T>::print_pretty(ppii, *p);
+                    } else {
+                        ppii.pps()->write("<nullptr ");
+                        ppii.pps()->write(reflect::type_name<T>());
+                        ppii.pps()->write(">");
+                    }
+                    return false;
                 }
             }
         };