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

xo-reader2: support if-then-else expressions. + detailed utest

Browse source
This commit is contained in:
Roland Conybeare 2026-01-27 15:50:10 -05:00
commit a69023096d
2 changed files with 55 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

10
include/xo/expression2/DIfElseExpr.hpp
View file

@ -59,6 +59,12 @@ namespace xo {
obj<AExpression> when_true,
obj<AExpression> when_false);
/** create empty if-else expression using memory from @p mm **/
static obj<AExpression,DIfElseExpr> make_empty(obj<AAllocator> mm);
/** create empty if-else expression using memory from @p mm **/
static DIfElseExpr * _make_empty(obj<AAllocator> mm);
///@}
/** @defgroup scm-ifelseexpr-access-methods **/
///@{
@ -67,6 +73,10 @@ namespace xo {
obj<AExpression> when_true() const noexcept { return when_true_; }
obj<AExpression> when_false() const noexcept { return when_false_; }
void assign_test(obj<AExpression> x) { this->test_ = x; }
void assign_when_true(obj<AExpression> x) { this->when_true_ = x; }
void assign_when_false(obj<AExpression> x) { this->when_false_ = x; }
///@}
/** @defgroup scm-ifelseexpr-expression-facet **/
///@{

53
src/expression2/DIfElseExpr.cpp
View file

@ -57,6 +57,21 @@ namespace xo {
when_false);
}
obj<AExpression,DIfElseExpr>
DIfElseExpr::make_empty(obj<AAllocator> mm)
{
return obj<AExpression,DIfElseExpr>(_make_empty(mm));
}
DIfElseExpr *
DIfElseExpr::_make_empty(obj<AAllocator> mm)
{
return _make(mm,
obj<AExpression>() /*test*/,
obj<AExpression>() /*when_true*/,
obj<AExpression>() /*when_false*/);
}
void
DIfElseExpr::assign_valuetype(TypeDescr td) noexcept
{
@ -76,14 +91,33 @@ namespace xo {
= FacetRegistry::instance().try_variant<APrintable,
AExpression>(when_false_);
return ppii.pps()->pretty_struct
(ppii,
"DIfElseExpr",
refrtag("typeref", typeref_),
refrtag("test", test),
refrtag("when_true", when_true),
refrtag("when_false", when_false));
if (when_false) {
return ppii.pps()->pretty_struct
(ppii,
"DIfElseExpr",
refrtag("typeref", typeref_),
refrtag("test", test),
refrtag("when_true", when_true),
refrtag("when_false", when_false));
} else if (when_true) {
return ppii.pps()->pretty_struct
(ppii,
"DIfElseExpr",
refrtag("typeref", typeref_),
refrtag("test", test),
refrtag("when_true", when_true));
} else if (test) {
return ppii.pps()->pretty_struct
(ppii,
"DIfElseExpr",
refrtag("typeref", typeref_),
refrtag("test", test));
} else {
return ppii.pps()->pretty_struct
(ppii,
"DIfElseExpr",
refrtag("typeref", typeref_));
}
}
// ----------------------------------------------------------------
@ -141,10 +175,13 @@ namespace xo {
std::uint32_t
IfExpr::pretty_print(const ppindentinfo & ppii) const {
return ppii.pps()->pretty_struct(ppii, "IfExpr");
#ifdef NOT_YET
return ppii.pps()->pretty_struct(ppii, "IfExpr",
refrtag("test", test_),
refrtag("when_true", when_true_),
refrtag("when_false", when_false_));
#endif
}
rp<IfExprAccess>