From 480294ae0584b14b76f2fe401f5665d44af8e359 Mon Sep 17 00:00:00 2001 From: Roland Conybeare Date: Tue, 20 Jan 2026 15:06:58 -0500 Subject: [PATCH] xo-reader2 xo-expression2: pprint for DDefineExpr + DVariable --- xo-expression2/CMakeLists.txt | 28 +++++++++ .../idl/IPrintable_DDefineExpr.json5 | 13 ++++ xo-expression2/idl/IPrintable_DVariable.json5 | 13 ++++ .../include/xo/expression2/DDefineExpr.hpp | 8 +++ .../include/xo/expression2/DVariable.hpp | 10 ++- .../detail/IExpression_DVariable.hpp | 4 +- .../detail/IPrintable_DDefineExpr.hpp | 62 +++++++++++++++++++ .../detail/IPrintable_DVariable.hpp | 62 +++++++++++++++++++ xo-expression2/src/expression2/CMakeLists.txt | 4 ++ .../src/expression2/DDefineExpr.cpp | 29 +++++++++ xo-expression2/src/expression2/DVariable.cpp | 13 ++++ .../expression2/IPrintable_DDefineExpr.cpp | 28 +++++++++ .../src/expression2/IPrintable_DVariable.cpp | 28 +++++++++ .../expression2_register_facets.cpp | 12 ++++ xo-reader2/include/xo/reader2/ParserStack.hpp | 32 ++++++++++ .../include/xo/reader2/ParserStateMachine.hpp | 3 +- .../include/xo/reader2/SchematikaParser.hpp | 28 ++++++++- xo-reader2/src/reader2/DDefineSsm.cpp | 9 ++- xo-reader2/src/reader2/ParserStack.cpp | 46 ++++++++++++++ xo-reader2/src/reader2/SchematikaParser.cpp | 22 +++++++ xo-reader2/utest/SchematikaParser.test.cpp | 9 +++ 21 files changed, 455 insertions(+), 8 deletions(-) create mode 100644 xo-expression2/idl/IPrintable_DDefineExpr.json5 create mode 100644 xo-expression2/idl/IPrintable_DVariable.json5 create mode 100644 xo-expression2/include/xo/expression2/detail/IPrintable_DDefineExpr.hpp create mode 100644 xo-expression2/include/xo/expression2/detail/IPrintable_DVariable.hpp create mode 100644 xo-expression2/src/expression2/IPrintable_DDefineExpr.cpp create mode 100644 xo-expression2/src/expression2/IPrintable_DVariable.cpp diff --git a/xo-expression2/CMakeLists.txt b/xo-expression2/CMakeLists.txt index 678e5eca..3de04758 100644 --- a/xo-expression2/CMakeLists.txt +++ b/xo-expression2/CMakeLists.txt @@ -56,6 +56,8 @@ xo_add_genfacetimpl( OUTPUT_CPP_DIR src/expression2 ) +# ---------------------------------------------------------------- + # note: manual target; generated code committed to git xo_add_genfacetimpl( TARGET xo-expression2-facetimpl-expression-variable @@ -68,6 +70,20 @@ xo_add_genfacetimpl( OUTPUT_CPP_DIR src/expression2 ) +# note: manual target; generated code committed to git +xo_add_genfacetimpl( + TARGET xo-expression2-facetimpl-printable-variable + FACET_PKG xo_printable2 + FACET Printable + REPR Variable + INPUT idl/IPrintable_DVariable.json5 + OUTPUT_HPP_DIR include/xo/expression2 + OUTPUT_IMPL_SUBDIR detail + OUTPUT_CPP_DIR src/expression2 +) + +# ---------------------------------------------------------------- + # note: manual target; generated code committed to git xo_add_genfacetimpl( TARGET xo-expression2-facetimpl-expression-defineexpr @@ -80,6 +96,18 @@ xo_add_genfacetimpl( OUTPUT_CPP_DIR src/expression2 ) +# note: manual target; generated code committed to git +xo_add_genfacetimpl( + TARGET xo-expression2-facetimpl-printable-defineexpr + FACET_PKG xo_printable2 + FACET Printable + REPR DefineExpr + INPUT idl/IPrintable_DDefineExpr.json5 + OUTPUT_HPP_DIR include/xo/expression2 + OUTPUT_IMPL_SUBDIR detail + OUTPUT_CPP_DIR src/expression2 +) + # ---------------------------------------------------------------- # note: manual target; generated code committed to git diff --git a/xo-expression2/idl/IPrintable_DDefineExpr.json5 b/xo-expression2/idl/IPrintable_DDefineExpr.json5 new file mode 100644 index 00000000..351f8caf --- /dev/null +++ b/xo-expression2/idl/IPrintable_DDefineExpr.json5 @@ -0,0 +1,13 @@ +{ + mode: "implementation", + includes: [ "", + "" ], + local_types: [ ], + namespace1: "xo", + namespace2: "scm", + facet_idl: "idl/Printable.json5", + brief: "provide APrintable interface for DDefineExpr", + using_doxygen: true, + repr: "DDefineExpr", + doc: [ "implement APrintable for DDefineExpr" ], +} diff --git a/xo-expression2/idl/IPrintable_DVariable.json5 b/xo-expression2/idl/IPrintable_DVariable.json5 new file mode 100644 index 00000000..52c301b2 --- /dev/null +++ b/xo-expression2/idl/IPrintable_DVariable.json5 @@ -0,0 +1,13 @@ +{ + mode: "implementation", + includes: [ "", + "" ], + local_types: [ ], + namespace1: "xo", + namespace2: "scm", + facet_idl: "idl/Printable.json5", + brief: "provide APrintable interface for DVariable", + using_doxygen: true, + repr: "DVariable", + doc: [ "implement APrintable for DVariable" ], +} diff --git a/xo-expression2/include/xo/expression2/DDefineExpr.hpp b/xo-expression2/include/xo/expression2/DDefineExpr.hpp index 618e4161..59826aa2 100644 --- a/xo-expression2/include/xo/expression2/DDefineExpr.hpp +++ b/xo-expression2/include/xo/expression2/DDefineExpr.hpp @@ -8,6 +8,7 @@ #include "Expression.hpp" #include "DVariable.hpp" #include +#include namespace xo { namespace scm { @@ -21,6 +22,7 @@ namespace xo { **/ class DDefineExpr { public: + using ppindentinfo = xo::print::ppindentinfo; using AAllocator = xo::mm::AAllocator; using TypeDescr = xo::reflect::TypeDescr; @@ -62,6 +64,12 @@ namespace xo { void assign_valuetype(TypeDescr td) noexcept; ///@} + /** @defgroup scm-defineexpr-printable-facet **/ + ///@{ + + bool pretty(const ppindentinfo & ppii) const; + + ///@} private: /** @defgrouop scm-defineexpr-instance-vars **/ diff --git a/xo-expression2/include/xo/expression2/DVariable.hpp b/xo-expression2/include/xo/expression2/DVariable.hpp index 2208852e..ae362bf1 100644 --- a/xo-expression2/include/xo/expression2/DVariable.hpp +++ b/xo-expression2/include/xo/expression2/DVariable.hpp @@ -10,6 +10,7 @@ #include "TypeRef.hpp" #include "exprtype.hpp" #include +#include namespace xo { namespace scm { @@ -19,6 +20,7 @@ namespace xo { **/ class DVariable { public: + using ppindentinfo = xo::print::ppindentinfo; using AAllocator = xo::mm::AAllocator; using TypeDescr = xo::reflect::TypeDescr; @@ -46,7 +48,7 @@ namespace xo { void assign_name(const DUniqueString * name) { this->name_ = name; } - /** @defgroup scm-variable-expression-facet**/ + /** @defgroup scm-variable-expression-facet **/ ///@{ exprtype extype() const noexcept { return exprtype::variable; } @@ -55,6 +57,12 @@ namespace xo { void assign_valuetype(TypeDescr td) noexcept; ///@} + /** @defgroup scm-variable-printable-facet **/ + ///@{ + + bool pretty(const ppindentinfo & ppii) const; + + ///@} private: /** symbol name **/ diff --git a/xo-expression2/include/xo/expression2/detail/IExpression_DVariable.hpp b/xo-expression2/include/xo/expression2/detail/IExpression_DVariable.hpp index 95b1becb..b4186f55 100644 --- a/xo-expression2/include/xo/expression2/detail/IExpression_DVariable.hpp +++ b/xo-expression2/include/xo/expression2/detail/IExpression_DVariable.hpp @@ -55,7 +55,7 @@ namespace xo { static TypeDescr valuetype(const DVariable & self) noexcept; // non-const methods - /** assing to valuetype member. Useful when scaffolding expressions **/ + /** assign to valuetype member. Useful when scaffolding expressions **/ static void assign_valuetype(DVariable & self, TypeDescr td) noexcept; ///@} }; @@ -63,4 +63,4 @@ namespace xo { } /*namespace scm*/ } /*namespace xo*/ -/* end */ \ No newline at end of file +/* end */ diff --git a/xo-expression2/include/xo/expression2/detail/IPrintable_DDefineExpr.hpp b/xo-expression2/include/xo/expression2/detail/IPrintable_DDefineExpr.hpp new file mode 100644 index 00000000..6d727d86 --- /dev/null +++ b/xo-expression2/include/xo/expression2/detail/IPrintable_DDefineExpr.hpp @@ -0,0 +1,62 @@ +/** @file IPrintable_DDefineExpr.hpp + * + * Generated automagically from ingredients: + * 1. code generator: + * [/home/roland/proj/xo-umbrella2-claude1/xo-facet/codegen/genfacet] + * arguments: + * --input [idl/IPrintable_DDefineExpr.json5] + * 2. jinja2 template for abstract facet .hpp file: + * [iface_facet_repr.hpp.j2] + * 3. idl for facet methods + * [idl/IPrintable_DDefineExpr.json5] + **/ + +#pragma once + +#include "Printable.hpp" +#include +#include +#include "DDefineExpr.hpp" + +namespace xo { namespace scm { class IPrintable_DDefineExpr; } } + +namespace xo { + namespace facet { + template <> + struct FacetImplementation + { + using ImplType = xo::print::IPrintable_Xfer + ; + }; + } +} + +namespace xo { + namespace scm { + /** @class IPrintable_DDefineExpr + **/ + class IPrintable_DDefineExpr { + public: + /** @defgroup scm-printable-ddefineexpr-type-traits **/ + ///@{ + using ppindentinfo = xo::print::APrintable::ppindentinfo; + using Copaque = xo::print::APrintable::Copaque; + using Opaque = xo::print::APrintable::Opaque; + ///@} + /** @defgroup scm-printable-ddefineexpr-methods **/ + ///@{ + // const methods + /** Pretty-printing support for this object. +See [xo-indentlog/xo/indentlog/pretty.hpp] **/ + static bool pretty(const DDefineExpr & self, const ppindentinfo & ppii); + + // non-const methods + ///@} + }; + + } /*namespace scm*/ +} /*namespace xo*/ + +/* end */ \ No newline at end of file diff --git a/xo-expression2/include/xo/expression2/detail/IPrintable_DVariable.hpp b/xo-expression2/include/xo/expression2/detail/IPrintable_DVariable.hpp new file mode 100644 index 00000000..6e97451b --- /dev/null +++ b/xo-expression2/include/xo/expression2/detail/IPrintable_DVariable.hpp @@ -0,0 +1,62 @@ +/** @file IPrintable_DVariable.hpp + * + * Generated automagically from ingredients: + * 1. code generator: + * [/home/roland/proj/xo-umbrella2-claude1/xo-facet/codegen/genfacet] + * arguments: + * --input [idl/IPrintable_DVariable.json5] + * 2. jinja2 template for abstract facet .hpp file: + * [iface_facet_repr.hpp.j2] + * 3. idl for facet methods + * [idl/IPrintable_DVariable.json5] + **/ + +#pragma once + +#include "Printable.hpp" +#include +#include +#include "DVariable.hpp" + +namespace xo { namespace scm { class IPrintable_DVariable; } } + +namespace xo { + namespace facet { + template <> + struct FacetImplementation + { + using ImplType = xo::print::IPrintable_Xfer + ; + }; + } +} + +namespace xo { + namespace scm { + /** @class IPrintable_DVariable + **/ + class IPrintable_DVariable { + public: + /** @defgroup scm-printable-dvariable-type-traits **/ + ///@{ + using ppindentinfo = xo::print::APrintable::ppindentinfo; + using Copaque = xo::print::APrintable::Copaque; + using Opaque = xo::print::APrintable::Opaque; + ///@} + /** @defgroup scm-printable-dvariable-methods **/ + ///@{ + // const methods + /** Pretty-printing support for this object. +See [xo-indentlog/xo/indentlog/pretty.hpp] **/ + static bool pretty(const DVariable & self, const ppindentinfo & ppii); + + // non-const methods + ///@} + }; + + } /*namespace scm*/ +} /*namespace xo*/ + +/* end */ \ No newline at end of file diff --git a/xo-expression2/src/expression2/CMakeLists.txt b/xo-expression2/src/expression2/CMakeLists.txt index 0fcd6541..f2dfe7e7 100644 --- a/xo-expression2/src/expression2/CMakeLists.txt +++ b/xo-expression2/src/expression2/CMakeLists.txt @@ -12,8 +12,12 @@ set(SELF_SRCS IExpression_Any.cpp IExpression_DConstant.cpp + IExpression_DVariable.cpp + IPrintable_DVariable.cpp + IExpression_DDefineExpr.cpp + IPrintable_DDefineExpr.cpp DLocalSymtab.cpp DGlobalSymtab.cpp diff --git a/xo-expression2/src/expression2/DDefineExpr.cpp b/xo-expression2/src/expression2/DDefineExpr.cpp index a5609246..8afb90fe 100644 --- a/xo-expression2/src/expression2/DDefineExpr.cpp +++ b/xo-expression2/src/expression2/DDefineExpr.cpp @@ -4,9 +4,14 @@ **/ #include "DDefineExpr.hpp" +#include "detail/IPrintable_DVariable.hpp" +#include +#include #include namespace xo { + using xo::print::APrintable; + using xo::facet::FacetRegistry; using xo::facet::typeseq; namespace scm { @@ -60,6 +65,30 @@ namespace xo { { lhs_var_->assign_valuetype(td); } + + bool + DDefineExpr::pretty(const ppindentinfo & ppii) const + { + auto lhs = obj(lhs_var_); + auto rhs = FacetRegistry::instance().try_variant(rhs_); + + if (rhs_) { + assert(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*/ } /*namespace xo*/ diff --git a/xo-expression2/src/expression2/DVariable.cpp b/xo-expression2/src/expression2/DVariable.cpp index d27c71ef..4adbe841 100644 --- a/xo-expression2/src/expression2/DVariable.cpp +++ b/xo-expression2/src/expression2/DVariable.cpp @@ -35,6 +35,19 @@ namespace xo { typeref_.resolve(td); } + bool + DVariable::pretty(const ppindentinfo & ppii) const + { + auto name = (name_ + ? std::string_view(*name_) + : std::string_view("")); + + return ppii.pps()->pretty_struct + (ppii, + "DVariable", + refrtag("name", name)); + } + } /*namespace scm*/ } /*namespace xo*/ diff --git a/xo-expression2/src/expression2/IPrintable_DDefineExpr.cpp b/xo-expression2/src/expression2/IPrintable_DDefineExpr.cpp new file mode 100644 index 00000000..e8c6a799 --- /dev/null +++ b/xo-expression2/src/expression2/IPrintable_DDefineExpr.cpp @@ -0,0 +1,28 @@ +/** @file IPrintable_DDefineExpr.cpp + * + * Generated automagically from ingredients: + * 1. code generator: + * [/home/roland/proj/xo-umbrella2-claude1/xo-facet/codegen/genfacet] + * arguments: + * --input [idl/IPrintable_DDefineExpr.json5] + * 2. jinja2 template for abstract facet .hpp file: + * [iface_facet_any.hpp.j2] + * 3. idl for facet methods + * [idl/IPrintable_DDefineExpr.json5] +**/ + +#include "detail/IPrintable_DDefineExpr.hpp" + +namespace xo { + namespace scm { + auto + IPrintable_DDefineExpr::pretty(const DDefineExpr & self, const ppindentinfo & ppii) -> bool + { + return self.pretty(ppii); + } + + + } /*namespace scm*/ +} /*namespace xo*/ + +/* end IPrintable_DDefineExpr.cpp */ \ No newline at end of file diff --git a/xo-expression2/src/expression2/IPrintable_DVariable.cpp b/xo-expression2/src/expression2/IPrintable_DVariable.cpp new file mode 100644 index 00000000..75e673ae --- /dev/null +++ b/xo-expression2/src/expression2/IPrintable_DVariable.cpp @@ -0,0 +1,28 @@ +/** @file IPrintable_DVariable.cpp + * + * Generated automagically from ingredients: + * 1. code generator: + * [/home/roland/proj/xo-umbrella2-claude1/xo-facet/codegen/genfacet] + * arguments: + * --input [idl/IPrintable_DVariable.json5] + * 2. jinja2 template for abstract facet .hpp file: + * [iface_facet_any.hpp.j2] + * 3. idl for facet methods + * [idl/IPrintable_DVariable.json5] +**/ + +#include "detail/IPrintable_DVariable.hpp" + +namespace xo { + namespace scm { + auto + IPrintable_DVariable::pretty(const DVariable & self, const ppindentinfo & ppii) -> bool + { + return self.pretty(ppii); + } + + + } /*namespace scm*/ +} /*namespace xo*/ + +/* end IPrintable_DVariable.cpp */ \ No newline at end of file diff --git a/xo-expression2/src/expression2/expression2_register_facets.cpp b/xo-expression2/src/expression2/expression2_register_facets.cpp index 2d728bd3..e6715769 100644 --- a/xo-expression2/src/expression2/expression2_register_facets.cpp +++ b/xo-expression2/src/expression2/expression2_register_facets.cpp @@ -8,6 +8,10 @@ #include #include +#include + +#include + #include #include #include @@ -28,7 +32,15 @@ namespace xo { FacetRegistry::register_impl(); FacetRegistry::register_impl(); + FacetRegistry::register_impl(); + + FacetRegistry::register_impl(); + log && log(xtag("DUniqueString.tseq", typeseq::id())); + log && log(xtag("DDefineExpr.tseq", typeseq::id())); + log && log(xtag("DVariable.tseq", typeseq::id())); + + log && log(xtag("AExpression.tqseq", typeseq::id())); return true; } diff --git a/xo-reader2/include/xo/reader2/ParserStack.hpp b/xo-reader2/include/xo/reader2/ParserStack.hpp index b63be044..936c57e5 100644 --- a/xo-reader2/include/xo/reader2/ParserStack.hpp +++ b/xo-reader2/include/xo/reader2/ParserStack.hpp @@ -8,6 +8,7 @@ #include "SyntaxStateMachine.hpp" #include #include +#include namespace xo { namespace scm { @@ -21,6 +22,7 @@ namespace xo { class ParserStack { public: using DArena = xo::mm::DArena; + using ppindentinfo = xo::print::ppindentinfo; public: ParserStack(DArena::Checkpoint ckp, @@ -42,6 +44,11 @@ namespace xo { obj top() const noexcept { return ssm_; } ParserStack * parent() const noexcept { return parent_; } + /** regular printing **/ + void print(std::ostream & os) const; + /** pretty-printer support **/ + bool pretty(const ppindentinfo & ppii) const; + private: /** stack pointer: top of stack just before this instance created **/ DArena::Checkpoint ckp_; @@ -51,7 +58,32 @@ namespace xo { ParserStack * parent_ = nullptr; }; + inline std::ostream & operator<< (std::ostream & os, const ParserStack * x) { + if (x) { + x->print(os); + } else { + os << "nullptr"; + } + return os; + } + } /*namespace scm*/ + + namespace print { + /** pretty printer in relies on this specialization + * to handle ParserResult instances + **/ + template <> + struct ppdetail { + static inline bool print_pretty(const ppindentinfo & ppii, const xo::scm::ParserStack * p) { + if (p) + return p->pretty(ppii); + else + return ppii.pps()->print_upto("nullptr"); + } + }; + } + } /*namespace xo*/ /* end ParserStack.hpp */ diff --git a/xo-reader2/include/xo/reader2/ParserStateMachine.hpp b/xo-reader2/include/xo/reader2/ParserStateMachine.hpp index b333dd51..fbef2393 100644 --- a/xo-reader2/include/xo/reader2/ParserStateMachine.hpp +++ b/xo-reader2/include/xo/reader2/ParserStateMachine.hpp @@ -19,7 +19,8 @@ namespace xo { // class ASyntaxStateMachine; - // note: load-bearing to forward-declare ParserStack, + // note: it's load-bearing here to forward-declare ParserStack, + // see ParserStack.hpp for impl // because ASyntaxStateMachine.hpp includes ParserStateMachine.hpp; // before obj is defined. class ParserStack; diff --git a/xo-reader2/include/xo/reader2/SchematikaParser.hpp b/xo-reader2/include/xo/reader2/SchematikaParser.hpp index 81115239..300980fb 100644 --- a/xo-reader2/include/xo/reader2/SchematikaParser.hpp +++ b/xo-reader2/include/xo/reader2/SchematikaParser.hpp @@ -153,9 +153,10 @@ namespace xo { **/ class SchematikaParser { public: + using token_type = Token; using ArenaConfig = xo::mm::ArenaConfig; using AAllocator = xo::mm::AAllocator; - using token_type = Token; + using ppindentinfo = xo::print::ppindentinfo; public: /** create parser in initial state; @@ -216,6 +217,8 @@ namespace xo { /** print human-readable representation on stream @p os **/ void print(std::ostream & os) const; + /** pretty-printer support **/ + bool pretty(const ppindentinfo & ppii) const; private: /** state machine **/ @@ -227,12 +230,31 @@ namespace xo { inline std::ostream & operator<< (std::ostream & os, - const SchematikaParser & x) { - x.print(os); + const SchematikaParser * x) { + if (x) { + x->print(os); + } else { + os << "nullptr"; + } return os; } } /*namespace scm*/ + + namespace print { + /** pretty printer in relies on this specialization + * to handle ParserResult instances + **/ + template <> + struct ppdetail { + static inline bool print_pretty(const ppindentinfo & ppii, const xo::scm::SchematikaParser* p) { + if (p) + return p->pretty(ppii); + else + return ppii.pps()->print_upto("nullptr"); + } + }; + } } /*namespace xo*/ /* end SchematikaParser.hpp */ diff --git a/xo-reader2/src/reader2/DDefineSsm.cpp b/xo-reader2/src/reader2/DDefineSsm.cpp index 3ae20286..c1e3f6a9 100644 --- a/xo-reader2/src/reader2/DDefineSsm.cpp +++ b/xo-reader2/src/reader2/DDefineSsm.cpp @@ -6,6 +6,9 @@ #include "DDefineSsm.hpp" #include "DExpectSymbolSsm.hpp" #include "ssm/ISyntaxStateMachine_DDefineSsm.hpp" +#include "ssm/IPrintable_DDefineSsm.hpp" +#include +#include #ifdef NOT_YET #include "parserstatemachine.hpp" @@ -16,6 +19,7 @@ #endif namespace xo { + using xo::print::APrintable; using xo::facet::with_facet; using xo::facet::typeseq; @@ -497,10 +501,13 @@ namespace xo { bool DDefineSsm::pretty(const ppindentinfo & ppii) const { + auto expr = with_facet::mkobj(def_expr_.data()); + return ppii.pps()->pretty_struct (ppii, "DDefineSsm", - refrtag("defstate", defstate_)); + refrtag("defstate", defstate_), + refrtag("def_expr", expr)); } } /*namespace scm*/ } /*namespace xo*/ diff --git a/xo-reader2/src/reader2/ParserStack.cpp b/xo-reader2/src/reader2/ParserStack.cpp index ba39517d..91d8bca9 100644 --- a/xo-reader2/src/reader2/ParserStack.cpp +++ b/xo-reader2/src/reader2/ParserStack.cpp @@ -5,8 +5,12 @@ #include "ParserStack.hpp" #include "SyntaxStateMachine.hpp" +#include +#include namespace xo { + using xo::print::APrintable; + using xo::facet::FacetRegistry; using xo::facet::typeseq; namespace scm { @@ -41,6 +45,48 @@ namespace xo { return stack->parent(); } + void + ParserStack::print(std::ostream & os) const + { + os << ""; + os << xtag("ssm", "*placeholder*"); + os << xtag("parent", "*placeholder*"); + os << ">"; + } + + bool + ParserStack::pretty(const ppindentinfo & ppii) const + { + auto * pps = ppii.pps(); + + /* always use multiple lines */ + + if (ppii.upto()) + return false; + + pps->write(" (frame->top()); + + pps->newline_pretty_tag(ppii.ci1(), buf, ssm); + + ++i_frame; + frame = frame->parent_; + } + + pps->write(">"); + + return false; + } + } /*namespace scm*/ } /*namespace xo*/ diff --git a/xo-reader2/src/reader2/SchematikaParser.cpp b/xo-reader2/src/reader2/SchematikaParser.cpp index ac2d4520..d243de51 100644 --- a/xo-reader2/src/reader2/SchematikaParser.cpp +++ b/xo-reader2/src/reader2/SchematikaParser.cpp @@ -86,6 +86,28 @@ namespace xo { << xtag("has_stack", (psm_.stack() != nullptr)) << ">" << std::endl; } + + bool + SchematikaParser::pretty(const ppindentinfo & ppii) const { + auto * pps = ppii.pps(); + + if (ppii.upto()) + return false; + + // TODO: consider printing: + // psm.stringtable_ + // psm.parser_alloc_ + // psm.parser_alloc_ckp_ + // psm.expr_alloc_ + // psm.result_ + // psm.debug_flag_ + // + + return pps->pretty_struct + (ppii, + "SchematikaParser", + refrtag("stack", psm_.stack())); + } } /*namespace scm*/ } /*namespace xo*/ diff --git a/xo-reader2/utest/SchematikaParser.test.cpp b/xo-reader2/utest/SchematikaParser.test.cpp index e2a9023e..8cccfd7b 100644 --- a/xo-reader2/utest/SchematikaParser.test.cpp +++ b/xo-reader2/utest/SchematikaParser.test.cpp @@ -4,6 +4,7 @@ **/ #include +#include #include #include @@ -17,6 +18,8 @@ namespace xo { using xo::mm::DArena; using xo::facet::with_facet; + static InitEvidence s_init = (InitSubsys::require()); + namespace ut { TEST_CASE("SchematikaParser-ctor", "[reader2][SchematikaParser]") { @@ -92,6 +95,10 @@ namespace xo { // but is still "at toplevel" in the sense of ready for input REQUIRE(parser.has_incomplete_expr() == true); REQUIRE(result.is_incomplete()); + + log && log("after def token:"); + log && log(xtag("parser", &parser)); + log && log(xtag("result", result)); } { @@ -100,6 +107,8 @@ namespace xo { REQUIRE(parser.has_incomplete_expr() == true); REQUIRE(result.is_incomplete()); + log && log("after lhs symbol token:"); + log && log(xtag("parser", &parser)); log && log(xtag("result", result)); }