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

xo-expression2: + DConstant utest

Browse source
This commit is contained in:
Roland Conybeare 2026-01-26 15:33:58 -05:00
commit 826879c517
7 changed files with 261 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

12
xo-expression2/include/xo/expression2/DConstant.hpp
View file

@ -5,6 +5,7 @@
#pragma once
#include "Expression.hpp"
#include "TypeRef.hpp"
#include "exprtype.hpp"
#include <xo/reflect/TaggedPtr.hpp>
@ -27,12 +28,19 @@ namespace xo {
public:
explicit DConstant(obj<AGCObject> value) noexcept;
/** create isntance
* @p mm memory allocator
* @p value literal constant
**/
static obj<AExpression,DConstant> make(obj<AAllocator> mm,
obj<AGCObject> value);
/** create instance
* @p mm memory allocator
* @p value literal constant
**/
static DConstant * make(obj<AAllocator> mm,
obj<AGCObject> value);
static DConstant * _make(obj<AAllocator> mm,
obj<AGCObject> value);
bool is_resolved() const noexcept { return typeref_.is_resolved(); }

11
xo-expression2/src/expression2/DConstant.cpp
View file

@ -4,10 +4,12 @@
**/
#include "DConstant.hpp"
#include "detail/IExpression_DConstant.hpp"
#include "TypeDescr.hpp"
#include <xo/object2/DFloat.hpp>
#include <xo/object2/DInteger.hpp>
#include <xo/facet/FacetRegistry.hpp>
#include <xo/facet/obj.hpp>
#include <xo/reflect/Reflect.hpp>
#include <xo/printable2/Printable.hpp>
#include <xo/reflectutil/typeseq.hpp>
@ -38,9 +40,16 @@ namespace xo {
}
}
DConstant *
obj<AExpression,DConstant>
DConstant::make(obj<AAllocator> mm,
obj<AGCObject> value)
{
return obj<AExpression,DConstant>(_make(mm, value));
}
DConstant *
DConstant::_make(obj<AAllocator> mm,
obj<AGCObject> value)
{
void * mem = mm.alloc(typeseq::id<DConstant>(),
sizeof(DConstant));

1
xo-expression2/utest/CMakeLists.txt
View file

@ -5,6 +5,7 @@ set(UTEST_SRCS
expression2_utest_main.cpp
StringTable.test.cpp
X1Collector.test.cpp
DConstant.test.cpp
)
xo_add_utest_executable(${UTEST_EXE} ${UTEST_SRCS})

232
xo-expression2/utest/DConstant.test.cpp Normal file
View file

@ -0,0 +1,232 @@
/** @file DConstant.test.cpp
*
* @author Roland Conybeare, Jan 2026
**/
#include "init_expression2.hpp"
#include <xo/expression2/DConstant.hpp>
#include <xo/expression2/detail/IExpression_DConstant.hpp>
#include <xo/expression2/detail/IPrintable_DConstant.hpp>
#include <xo/object2/DFloat.hpp>
#include <xo/object2/DInteger.hpp>
#include <xo/object2/number/IGCObject_DFloat.hpp>
#include <xo/object2/number/IGCObject_DInteger.hpp>
#include <xo/gc/CollectorTypeRegistry.hpp>
#include <xo/gc/DX1Collector.hpp>
#include <xo/gc/detail/IAllocator_DX1Collector.hpp>
#include <xo/gc/detail/ICollector_DX1Collector.hpp>
#include <xo/printable2/Printable.hpp>
#include <xo/facet/FacetRegistry.hpp>
#include <xo/reflect/Reflect.hpp>
#include <xo/indentlog/scope.hpp>
#include <catch2/catch.hpp>
#include <sstream>
namespace ut {
using xo::S_expression2_tag;
using xo::scm::DConstant;
using xo::scm::DFloat;
using xo::scm::DInteger;
using xo::scm::AExpression;
using xo::mm::CollectorTypeRegistry;
using xo::mm::AAllocator;
using xo::mm::ACollector;
using xo::mm::AGCObject;
using xo::mm::DX1Collector;
using xo::mm::CollectorConfig;
using xo::mm::ArenaConfig;
using xo::print::APrintable;
using xo::print::ppstate_standalone;
using xo::print::ppconfig;
using xo::facet::FacetRegistry;
using xo::facet::with_facet;
using xo::facet::obj;
using xo::facet::typeseq;
using xo::reflect::Reflect;
using xo::InitEvidence;
using xo::InitSubsys;
using xo::scope;
// Ensure subsystem initialized before tests
static InitEvidence s_init = InitSubsys<S_expression2_tag>::require();
TEST_CASE("DConstant-init", "[expression2][DConstant]")
{
// Verify subsystem initialization succeeded
REQUIRE(s_init.evidence());
}
TEST_CASE("DConstant-from-float", "[expression2][DConstant]")
{
REQUIRE(s_init.evidence());
CollectorConfig cfg{
.name_ = "dconstant_float_test",
.arena_config_ = ArenaConfig{
.size_ = 8192,
.store_header_flag_ = true},
.object_types_z_ = 16384,
.gc_trigger_v_{{4096, 4096}},
.debug_flag_ = false,
};
DX1Collector gc(cfg);
auto alloc = with_facet<AAllocator>::mkobj(&gc);
auto coll = with_facet<ACollector>::mkobj(&gc);
bool ok = CollectorTypeRegistry::instance().install_types(coll);
REQUIRE(ok);
// Box a float value
obj<AGCObject> fval = DFloat::box<AGCObject>(alloc, 3.14);
REQUIRE(fval.data() != nullptr);
// Create DConstant from the boxed float
auto expr = DConstant::make(alloc, fval);
REQUIRE(expr.data() != nullptr);
// Verify expression type
REQUIRE(expr.data()->extype() == xo::scm::exprtype::constant);
// Verify valuetype is double (DFloat::value_type)
REQUIRE(expr.data()->valuetype() == Reflect::require<double>());
// Verify value is accessible
REQUIRE(expr.data()->value().data() != nullptr);
}
TEST_CASE("DConstant-from-integer", "[expression2][DConstant]")
{
REQUIRE(s_init.evidence());
CollectorConfig cfg{
.name_ = "dconstant_int_test",
.arena_config_ = ArenaConfig{
.size_ = 8192,
.store_header_flag_ = true},
.object_types_z_ = 16384,
.gc_trigger_v_{{4096, 4096}},
.debug_flag_ = false,
};
DX1Collector gc(cfg);
auto alloc = with_facet<AAllocator>::mkobj(&gc);
auto coll = with_facet<ACollector>::mkobj(&gc);
bool ok = CollectorTypeRegistry::instance().install_types(coll);
REQUIRE(ok);
// Box an integer value
obj<AGCObject> ival = DInteger::box<AGCObject>(alloc, 42);
REQUIRE(ival.data() != nullptr);
// Create DConstant from the boxed integer
auto expr = DConstant::make(alloc, ival);
REQUIRE(expr.data() != nullptr);
// Verify expression type
REQUIRE(expr.data()->extype() == xo::scm::exprtype::constant);
// Verify valuetype is long (DInteger::value_type)
REQUIRE(expr.data()->valuetype() == Reflect::require<long>());
// Verify value is accessible
REQUIRE(expr.data()->value().data() != nullptr);
}
TEST_CASE("DConstant-pretty-float", "[expression2][DConstant][pp]")
{
scope log(XO_DEBUG(true));
REQUIRE(s_init.evidence());
CollectorConfig cfg{
.name_ = "dconstant_pp_float_test",
.arena_config_ = ArenaConfig{
.size_ = 8192,
.store_header_flag_ = true},
.object_types_z_ = 16384,
.gc_trigger_v_{{4096, 4096}},
.debug_flag_ = false,
};
DX1Collector gc(cfg);
auto alloc = with_facet<AAllocator>::mkobj(&gc);
auto coll = with_facet<ACollector>::mkobj(&gc);
bool ok = CollectorTypeRegistry::instance().install_types(coll);
REQUIRE(ok);
// Box a float value
obj<AGCObject> fval = DFloat::box<AGCObject>(alloc, 2.718);
auto expr = DConstant::make(alloc, fval);
REQUIRE(expr.data() != nullptr);
// Pretty print
std::stringstream ss;
ppconfig ppc;
ppstate_standalone pps(&ss, 0, &ppc);
obj<APrintable,DConstant> expr_pr(expr.data());
pps.pretty(expr_pr);
std::string output = ss.str();
log && log(output);
// Output should contain "DConstant" struct name
CHECK(output.find("DConstant") != std::string::npos);
}
TEST_CASE("DConstant-pretty-integer", "[expression2][DConstant][pp]")
{
scope log(XO_DEBUG(false));
REQUIRE(s_init.evidence());
CollectorConfig cfg{
.name_ = "dconstant_pp_int_test",
.arena_config_ = ArenaConfig{
.size_ = 8192,
.store_header_flag_ = true},
.object_types_z_ = 16384,
.gc_trigger_v_{{4096, 4096}},
.debug_flag_ = false,
};
DX1Collector gc(cfg);
auto alloc = with_facet<AAllocator>::mkobj(&gc);
auto coll = with_facet<ACollector>::mkobj(&gc);
bool ok = CollectorTypeRegistry::instance().install_types(coll);
REQUIRE(ok);
// Box an integer value
obj<AGCObject> ival = DInteger::box<AGCObject>(alloc, 123);
auto expr = DConstant::make(alloc, ival);
REQUIRE(expr.data() != nullptr);
// Pretty print
std::stringstream ss;
ppconfig ppc;
ppstate_standalone pps(&ss, 0, &ppc);
obj<APrintable,DConstant> expr_pr(expr.data());
pps.pretty(expr_pr);
std::string output = ss.str();
log && log(output);
// Output should contain "DConstant" struct name
CHECK(output.find("DConstant") != std::string::npos);
}
}
/* end DConstant.test.cpp */

2
xo-reader2/src/reader2/DExpectExprSsm.cpp
View file

@ -248,7 +248,7 @@ namespace xo {
auto f64o = DFloat::box<AGCObject>(p_psm->expr_alloc(),
tk.f64_value());
auto expr = with_facet<AExpression>::mkobj(DConstant::make(p_psm->expr_alloc(), f64o));
auto expr = DConstant::make(p_psm->expr_alloc(), f64o);
// DProgressSsm responsible for resolving cases like
// 1.9,

12
xo-reader2/src/reader2/DExprSeqState.cpp
View file

@ -290,8 +290,7 @@ namespace xo {
DString * dstr = DString::from_cstr(p_psm->expr_alloc(),
tk.text().c_str());
obj<AGCObject,DString> str(dstr);
auto * dconst = DConstant::make(p_psm->expr_alloc(), str);
obj<AExpression,DConstant> expr(dconst);
obj<AExpression,DConstant> expr = DConstant::make(p_psm->expr_alloc(), str);
DProgressSsm::start(p_psm->parser_alloc(),
expr,
@ -319,8 +318,7 @@ namespace xo {
{
auto f64o = DFloat::box<AGCObject>(p_psm->expr_alloc(),
tk.f64_value());
auto * dconst = DConstant::make(p_psm->expr_alloc(), f64o);
auto expr = with_facet<AExpression>::mkobj(dconst);
auto expr = DConstant::make(p_psm->expr_alloc(), f64o);
DProgressSsm::start(p_psm->parser_alloc(),
expr,
@ -348,8 +346,7 @@ namespace xo {
{
auto i64o = DFloat::box<AGCObject>(p_psm->expr_alloc(),
tk.i64_value());
auto * dconst = DConstant::make(p_psm->expr_alloc(), i64o);
auto expr = with_facet<AExpression>::mkobj(dconst);
auto expr = DConstant::make(p_psm->expr_alloc(), i64o);
DProgressSsm::start(p_psm->parser_alloc(),
expr,
@ -377,8 +374,7 @@ namespace xo {
{
auto dvalue = DBoolean::box<AGCObject>(p_psm->expr_alloc(),
tk.bool_value());
auto * dconst = DConstant::make(p_psm->expr_alloc(), dvalue);
auto expr = with_facet<AExpression>::mkobj(dconst);
auto expr = DConstant::make(p_psm->expr_alloc(), dvalue);
DProgressSsm::start(p_psm->parser_alloc(),
expr,

3
xo-reader2/src/reader2/DProgressSsm.cpp
View file

@ -9,6 +9,9 @@
#include "DExpectExprSsm.hpp"
#include "ssm/ISyntaxStateMachine_DExpectExprSsm.hpp"
#include <xo/expression2/DConstant.hpp>
#include <xo/expression2/detail/IExpression_DConstant.hpp>
#ifdef NOT_YET
#include "DApplySsm.hpp"
#include "ssm/ISyntaxStateMachine_DApplySsm.hpp"