From ac2b307eb91c9454d201dfc362d56610bbdf97c7 Mon Sep 17 00:00:00 2001 From: Roland Conybeare Date: Mon, 2 Feb 2026 10:53:28 -0500 Subject: [PATCH] xo-interpreter2: refactor to setup vsm utest + repl --- utest/DApplyExpr.test.cpp | 14 +++++++------- utest/DConstant.test.cpp | 10 +++++----- utest/DDefineExpr.test.cpp | 16 ++++++++-------- utest/DIfElseExpr.test.cpp | 20 ++++++++++---------- utest/DVariable.test.cpp | 12 ++++++------ 5 files changed, 36 insertions(+), 36 deletions(-) diff --git a/utest/DApplyExpr.test.cpp b/utest/DApplyExpr.test.cpp index d151b776..f217d47e 100644 --- a/utest/DApplyExpr.test.cpp +++ b/utest/DApplyExpr.test.cpp @@ -47,7 +47,7 @@ namespace ut { using xo::mm::ACollector; using xo::mm::AGCObject; using xo::mm::DX1Collector; - using xo::mm::CollectorConfig; + using xo::mm::X1CollectorConfig; using xo::mm::ArenaConfig; using xo::print::APrintable; using xo::print::ppstate_standalone; @@ -71,7 +71,7 @@ namespace ut { { REQUIRE(s_init.evidence()); - CollectorConfig cfg{ + X1CollectorConfig cfg{ .name_ = "dapplyexpr_make2_test", .arena_config_ = ArenaConfig{ .size_ = 8192, @@ -111,7 +111,7 @@ namespace ut { { REQUIRE(s_init.evidence()); - CollectorConfig cfg{ + X1CollectorConfig cfg{ .name_ = "dapplyexpr_extype_test", .arena_config_ = ArenaConfig{ .size_ = 8192, @@ -146,7 +146,7 @@ namespace ut { { REQUIRE(s_init.evidence()); - CollectorConfig cfg{ + X1CollectorConfig cfg{ .name_ = "dapplyexpr_n_args_test", .arena_config_ = ArenaConfig{ .size_ = 8192, @@ -181,7 +181,7 @@ namespace ut { { REQUIRE(s_init.evidence()); - CollectorConfig cfg{ + X1CollectorConfig cfg{ .name_ = "dapplyexpr_fn_test", .arena_config_ = ArenaConfig{ .size_ = 8192, @@ -219,7 +219,7 @@ namespace ut { { REQUIRE(s_init.evidence()); - CollectorConfig cfg{ + X1CollectorConfig cfg{ .name_ = "dapplyexpr_arg_test", .arena_config_ = ArenaConfig{ .size_ = 8192, @@ -263,7 +263,7 @@ namespace ut { REQUIRE(s_init.evidence()); - CollectorConfig cfg{ + X1CollectorConfig cfg{ .name_ = "dapplyexpr_pretty_test", .arena_config_ = ArenaConfig{ .size_ = 8192, diff --git a/utest/DConstant.test.cpp b/utest/DConstant.test.cpp index ddff5b20..fd8e9b1b 100644 --- a/utest/DConstant.test.cpp +++ b/utest/DConstant.test.cpp @@ -39,7 +39,7 @@ namespace ut { using xo::mm::ACollector; using xo::mm::AGCObject; using xo::mm::DX1Collector; - using xo::mm::CollectorConfig; + using xo::mm::X1CollectorConfig; using xo::mm::ArenaConfig; using xo::print::APrintable; using xo::print::ppstate_standalone; @@ -66,7 +66,7 @@ namespace ut { { REQUIRE(s_init.evidence()); - CollectorConfig cfg{ + X1CollectorConfig cfg{ .name_ = "dconstant_float_test", .arena_config_ = ArenaConfig{ .size_ = 8192, @@ -105,7 +105,7 @@ namespace ut { { REQUIRE(s_init.evidence()); - CollectorConfig cfg{ + X1CollectorConfig cfg{ .name_ = "dconstant_int_test", .arena_config_ = ArenaConfig{ .size_ = 8192, @@ -146,7 +146,7 @@ namespace ut { REQUIRE(s_init.evidence()); - CollectorConfig cfg{ + X1CollectorConfig cfg{ .name_ = "dconstant_pp_float_test", .arena_config_ = ArenaConfig{ .size_ = 8192, @@ -190,7 +190,7 @@ namespace ut { REQUIRE(s_init.evidence()); - CollectorConfig cfg{ + X1CollectorConfig cfg{ .name_ = "dconstant_pp_int_test", .arena_config_ = ArenaConfig{ .size_ = 8192, diff --git a/utest/DDefineExpr.test.cpp b/utest/DDefineExpr.test.cpp index 5bb91582..5f78891d 100644 --- a/utest/DDefineExpr.test.cpp +++ b/utest/DDefineExpr.test.cpp @@ -44,7 +44,7 @@ namespace ut { using xo::mm::ACollector; using xo::mm::AGCObject; using xo::mm::DX1Collector; - using xo::mm::CollectorConfig; + using xo::mm::X1CollectorConfig; using xo::mm::ArenaConfig; using xo::print::APrintable; using xo::print::ppstate_standalone; @@ -68,7 +68,7 @@ namespace ut { { REQUIRE(s_init.evidence()); - CollectorConfig cfg{ + X1CollectorConfig cfg{ .name_ = "ddefineexpr_make_test", .arena_config_ = ArenaConfig{ .size_ = 8192, @@ -103,7 +103,7 @@ namespace ut { { REQUIRE(s_init.evidence()); - CollectorConfig cfg{ + X1CollectorConfig cfg{ .name_ = "ddefineexpr_lhs_test", .arena_config_ = ArenaConfig{ .size_ = 8192, @@ -138,7 +138,7 @@ namespace ut { { REQUIRE(s_init.evidence()); - CollectorConfig cfg{ + X1CollectorConfig cfg{ .name_ = "ddefineexpr_rhs_test", .arena_config_ = ArenaConfig{ .size_ = 8192, @@ -174,7 +174,7 @@ namespace ut { { REQUIRE(s_init.evidence()); - CollectorConfig cfg{ + X1CollectorConfig cfg{ .name_ = "ddefineexpr_name_test", .arena_config_ = ArenaConfig{ .size_ = 8192, @@ -207,7 +207,7 @@ namespace ut { { REQUIRE(s_init.evidence()); - CollectorConfig cfg{ + X1CollectorConfig cfg{ .name_ = "ddefineexpr_extype_test", .arena_config_ = ArenaConfig{ .size_ = 8192, @@ -239,7 +239,7 @@ namespace ut { { REQUIRE(s_init.evidence()); - CollectorConfig cfg{ + X1CollectorConfig cfg{ .name_ = "ddefineexpr_valuetype_test", .arena_config_ = ArenaConfig{ .size_ = 8192, @@ -273,7 +273,7 @@ namespace ut { REQUIRE(s_init.evidence()); - CollectorConfig cfg{ + X1CollectorConfig cfg{ .name_ = "ddefineexpr_pretty_test", .arena_config_ = ArenaConfig{ .size_ = 8192, diff --git a/utest/DIfElseExpr.test.cpp b/utest/DIfElseExpr.test.cpp index a82521a0..2dee2f26 100644 --- a/utest/DIfElseExpr.test.cpp +++ b/utest/DIfElseExpr.test.cpp @@ -42,15 +42,15 @@ namespace ut { using xo::mm::ACollector; using xo::mm::AGCObject; using xo::mm::DX1Collector; - using xo::mm::CollectorConfig; + using xo::mm::X1CollectorConfig; using xo::mm::ArenaConfig; using xo::print::APrintable; using xo::print::ppstate_standalone; using xo::print::ppconfig; - using xo::facet::FacetRegistry; + //using xo::facet::FacetRegistry; using xo::facet::with_facet; using xo::facet::obj; - using xo::reflect::Reflect; + //using xo::reflect::Reflect; using xo::InitEvidence; using xo::InitSubsys; using xo::scope; @@ -66,7 +66,7 @@ namespace ut { { REQUIRE(s_init.evidence()); - CollectorConfig cfg{ + X1CollectorConfig cfg{ .name_ = "difelseexpr_make_test", .arena_config_ = ArenaConfig{ .size_ = 8192, @@ -107,7 +107,7 @@ namespace ut { { REQUIRE(s_init.evidence()); - CollectorConfig cfg{ + X1CollectorConfig cfg{ .name_ = "difelseexpr_test_test", .arena_config_ = ArenaConfig{ .size_ = 8192, @@ -145,7 +145,7 @@ namespace ut { { REQUIRE(s_init.evidence()); - CollectorConfig cfg{ + X1CollectorConfig cfg{ .name_ = "difelseexpr_when_true_test", .arena_config_ = ArenaConfig{ .size_ = 8192, @@ -183,7 +183,7 @@ namespace ut { { REQUIRE(s_init.evidence()); - CollectorConfig cfg{ + X1CollectorConfig cfg{ .name_ = "difelseexpr_when_false_test", .arena_config_ = ArenaConfig{ .size_ = 8192, @@ -221,7 +221,7 @@ namespace ut { { REQUIRE(s_init.evidence()); - CollectorConfig cfg{ + X1CollectorConfig cfg{ .name_ = "difelseexpr_extype_test", .arena_config_ = ArenaConfig{ .size_ = 8192, @@ -256,7 +256,7 @@ namespace ut { { REQUIRE(s_init.evidence()); - CollectorConfig cfg{ + X1CollectorConfig cfg{ .name_ = "difelseexpr_valuetype_test", .arena_config_ = ArenaConfig{ .size_ = 8192, @@ -296,7 +296,7 @@ namespace ut { REQUIRE(s_init.evidence()); - CollectorConfig cfg{ + X1CollectorConfig cfg{ .name_ = "difelseexpr_pretty_test", .arena_config_ = ArenaConfig{ .size_ = 8192, diff --git a/utest/DVariable.test.cpp b/utest/DVariable.test.cpp index 8afee360..9c26a7c4 100644 --- a/utest/DVariable.test.cpp +++ b/utest/DVariable.test.cpp @@ -37,7 +37,7 @@ namespace ut { using xo::mm::AAllocator; using xo::mm::ACollector; using xo::mm::DX1Collector; - using xo::mm::CollectorConfig; + using xo::mm::X1CollectorConfig; using xo::mm::ArenaConfig; using xo::print::APrintable; using xo::print::ppstate_standalone; @@ -61,7 +61,7 @@ namespace ut { { REQUIRE(s_init.evidence()); - CollectorConfig cfg{ + X1CollectorConfig cfg{ .name_ = "dvariable_make_test", .arena_config_ = ArenaConfig{ .size_ = 8192, @@ -92,7 +92,7 @@ namespace ut { { REQUIRE(s_init.evidence()); - CollectorConfig cfg{ + X1CollectorConfig cfg{ .name_ = "dvariable_extype_test", .arena_config_ = ArenaConfig{ .size_ = 8192, @@ -122,7 +122,7 @@ namespace ut { { REQUIRE(s_init.evidence()); - CollectorConfig cfg{ + X1CollectorConfig cfg{ .name_ = "dvariable_valuetype_test", .arena_config_ = ArenaConfig{ .size_ = 8192, @@ -152,7 +152,7 @@ namespace ut { { REQUIRE(s_init.evidence()); - CollectorConfig cfg{ + X1CollectorConfig cfg{ .name_ = "dvariable_name_test", .arena_config_ = ArenaConfig{ .size_ = 8192, @@ -185,7 +185,7 @@ namespace ut { REQUIRE(s_init.evidence()); - CollectorConfig cfg{ + X1CollectorConfig cfg{ .name_ = "dvariable_pretty_test", .arena_config_ = ArenaConfig{ .size_ = 8192,