From fb48c94be66939e4bf1cad45efc2e3ce2d438e68 Mon Sep 17 00:00:00 2001 From: Roland Conybeare Date: Thu, 29 Jan 2026 10:49:55 -0500 Subject: [PATCH] xo-reader2: ssm pretty-printers include .expect_str() output --- xo-reader2/src/reader2/DDefineSsm.cpp | 1 + xo-reader2/src/reader2/DExpectFormalArgSsm.cpp | 5 ++++- xo-reader2/src/reader2/DExpectFormalArglistSsm.cpp | 6 ++++++ xo-reader2/src/reader2/DLambdaSsm.cpp | 4 +++- 4 files changed, 14 insertions(+), 2 deletions(-) diff --git a/xo-reader2/src/reader2/DDefineSsm.cpp b/xo-reader2/src/reader2/DDefineSsm.cpp index 4a13d41d..4676b3c8 100644 --- a/xo-reader2/src/reader2/DDefineSsm.cpp +++ b/xo-reader2/src/reader2/DDefineSsm.cpp @@ -741,6 +741,7 @@ namespace xo { return ppii.pps()->pretty_struct(ppii, "DDefineSsm", refrtag("defstate", defstate_), + refrtag("expect", this->get_expect_str()), refrtag("def_expr", expr)); } } /*namespace scm*/ diff --git a/xo-reader2/src/reader2/DExpectFormalArgSsm.cpp b/xo-reader2/src/reader2/DExpectFormalArgSsm.cpp index d08858f7..215c9471 100644 --- a/xo-reader2/src/reader2/DExpectFormalArgSsm.cpp +++ b/xo-reader2/src/reader2/DExpectFormalArgSsm.cpp @@ -246,12 +246,15 @@ namespace xo { (ppii, "DExpectFormalArgSsm", refrtag("fstate", fstate_), + refrtag("expect", this->get_expect_str()), refrtag("name", std::string_view(*name_))); } else { return ppii.pps()->pretty_struct (ppii, "DExpectFormalArgSsm", - refrtag("fstate", fstate_)); + refrtag("fstate", fstate_), + refrtag("expect", this->get_expect_str()) + ); } } diff --git a/xo-reader2/src/reader2/DExpectFormalArglistSsm.cpp b/xo-reader2/src/reader2/DExpectFormalArglistSsm.cpp index eaad8028..db8b1f6d 100644 --- a/xo-reader2/src/reader2/DExpectFormalArglistSsm.cpp +++ b/xo-reader2/src/reader2/DExpectFormalArglistSsm.cpp @@ -287,6 +287,9 @@ namespace xo { if (!pps->print_upto(xrefrtag("fastate", fastate_))) return false; + if (!pps->print_upto(xrefrtag("expect", this->get_expect_str()))) + return false; + if (!pps->print_upto(xrefrtag("n_args", n_args_))) return false; @@ -311,6 +314,9 @@ namespace xo { pps->newline_indent(ppii.ci1()); pps->pretty(refrtag("fastate", fastate_)); + pps->newline_indent(ppii.ci1()); + pps->pretty(refrtag("expect", this->get_expect_str())); + pps->newline_indent(ppii.ci1()); pps->pretty(refrtag("n_args", n_args_)); diff --git a/xo-reader2/src/reader2/DLambdaSsm.cpp b/xo-reader2/src/reader2/DLambdaSsm.cpp index a7db6e11..1fda9547 100644 --- a/xo-reader2/src/reader2/DLambdaSsm.cpp +++ b/xo-reader2/src/reader2/DLambdaSsm.cpp @@ -463,12 +463,14 @@ namespace xo { (ppii, "DLambdaSsm", refrtag("lmstate", lmstate_), + refrtag("expect", this->get_expect_str()), refrtag("body", body)); } else { return ppii.pps()->pretty_struct (ppii, "DLambdaSsm", - refrtag("lmstate", lmstate_)); + refrtag("lmstate", lmstate_), + refrtag("expect", this->get_expect_str())); } }