xo-reader2 xo-expression2: define example working and printing

def foo : f64 = 3.141593;
2026-01-22 18:40:42 -05:00 · 2026-01-22 18:40:42 -05:00 · 2bf23b41a9
commit 2bf23b41a9
parent 8452ef040c
12 changed files with 206 additions and 10 deletions
--- a/xo-expression2/src/expression2/DDefineExpr.cpp
+++ b/xo-expression2/src/expression2/DDefineExpr.cpp
@ -79,11 +79,21 @@ namespace xo {
            auto rhs = FacetRegistry::instance().try_variant<APrintable,
                                                             AExpression>(rhs_);

-            return ppii.pps()->pretty_struct
-                       (ppii,
-                        "DDefineExpr",
-                        refrtag("lhs", lhs),
-                        refrtag("rhs", cond(rhs_, rhs, "nullptr")));
+            // note: xo::print::cond() doesn't resolve the way we want here
+
+            if (rhs) {
+                return ppii.pps()->pretty_struct
+                           (ppii,
+                            "DDefineExpr",
+                            refrtag("lhs", lhs),
+                            refrtag("rhs", rhs));
+            } else {
+                return ppii.pps()->pretty_struct
+                           (ppii,
+                            "DDefineExpr",
+                            refrtag("lhs", lhs));
+
+            }
        }

    } /*namespace scm*/