roland/xo-reader2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

xo-reader2: formatting + asserts

Browse source
This commit is contained in:
Roland Conybeare 2026-01-26 21:36:10 -05:00
commit a346dcc579
6 changed files with 20 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/reader2/DDefineSsm.cpp
View file

@ -733,13 +733,18 @@ namespace xo {
bool
DDefineSsm::pretty(const ppindentinfo & ppii) const
{
auto expr = FacetRegistry::instance().variant<APrintable,AExpression>(def_expr_);
auto expr
= FacetRegistry::instance().variant<APrintable,
AExpression>(def_expr_);
assert(expr.data());
(void)expr;
return ppii.pps()->pretty_struct
(ppii,
"DDefineSsm",
refrtag("defstate", defstate_),
refrtag("def_expr", expr));
refrtag("def_expr", expr)
);
}
} /*namespace scm*/
} /*namespace xo*/

3
src/reader2/DExpectExprSsm.cpp
View file

@ -336,7 +336,8 @@ namespace xo {
(ppii,
"DExpectExprSsm",
refrtag("allow_defs", allow_defs_),
refrtag("cxl_on_rightbrace", cxl_on_rightbrace_));
refrtag("cxl_on_rightbrace", cxl_on_rightbrace_)
);
}
#ifdef NOT_YET

24
src/reader2/DProgressSsm.cpp
View file

@ -1115,32 +1115,16 @@ namespace xo {
if (rhs_)
rhs = FacetRegistry::instance().variant<APrintable,AExpression>(rhs_);
(void)lhs;
return ppii.pps()->pretty_struct
(ppii,
"DProgressSsm",
refrtag("lhs", lhs),
refrtag("op", op_type_),
cond(rhs, refrtag("rhs", rhs), "nullptr"));
cond(rhs, refrtag("rhs", rhs), "nullptr")
);
#ifdef NOPE
if (ppii.upto()) {
return (ppii.pps()->print_upto("<progress_xs")
&& (lhs_ ? ppii.pps()->print_upto(refrtag("lhs", lhs_)) : true)
&& (op_type_ != optype::invalid ? ppii.pps()->print_upto(refrtag("op", op_type_)) : true)
&& (rhs_ ? ppii.pps()->print_upto(refrtag("rhs", rhs_)) : true)
&& ppii.pps()->print_upto(">"));
} else {
ppii.pps()->write("<progress_xs ");
if (lhs_)
ppii.pps()->pretty(refrtag("lhs", lhs_));
if (op_type_ != optype::invalid)
ppii.pps()->pretty(refrtag("op", op_type_));
if (rhs_)
ppii.pps()->pretty(refrtag("rhs", rhs_));
ppii.pps()->write(">");
return false;
}
#endif
}
obj<AExpression>

5
src/reader2/ParserStack.cpp
View file

@ -73,8 +73,9 @@ namespace xo {
char buf[80];
snprintf(buf, sizeof(buf), "[%lu]", i_frame);
auto ssm = FacetRegistry::instance().variant<APrintable,
ASyntaxStateMachine> (frame->top());
auto ssm = (FacetRegistry::instance().variant
<APrintable, ASyntaxStateMachine> (frame->top()));
assert(ssm.data());
pps->newline_pretty_tag(ppii.ci1(), buf, ssm);

3
src/reader2/SchematikaParser.cpp
View file

@ -117,7 +117,8 @@ namespace xo {
return pps->pretty_struct
(ppii,
"SchematikaParser",
refrtag("stack", psm_.stack()));
refrtag("stack", psm_.stack())
);
}
} /*namespace scm*/
} /*namespace xo*/

4
utest/SchematikaParser.test.cpp
View file

@ -16,9 +16,9 @@ namespace xo {
using xo::scm::SchematikaParser;
using xo::scm::ASyntaxStateMachine;
using xo::scm::syntaxstatetype;
using xo::scm::DDefineSsm;
// using xo::scm::DDefineSsm;
using xo::scm::DExpectExprSsm;
using xo::scm::defexprstatetype;
// using xo::scm::defexprstatetype;
//using xo::scm::ParserResult;
//using xo::scm::parser_result_type;
using xo::scm::Token;