From 639b270eed81f7c2627d810057d188e2e8ee67f9 Mon Sep 17 00:00:00 2001 From: Lexi Winter Date: Sun, 22 Jun 2025 18:18:44 +0100 Subject: nihil.ucl: improve construction and comparison --- nihil.ucl/tests/array.cc | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'nihil.ucl/tests/array.cc') diff --git a/nihil.ucl/tests/array.cc b/nihil.ucl/tests/array.cc index a4f26b6..ce86058 100644 --- a/nihil.ucl/tests/array.cc +++ b/nihil.ucl/tests/array.cc @@ -31,9 +31,9 @@ TEST_CASE("ucl: array: push_back", "[ucl]") arr.push_back(integer(666)); REQUIRE(arr.size() == 3); - REQUIRE(arr[0].value() == 1); - REQUIRE(arr[1].value() == 42); - REQUIRE(arr[2].value() == 666); + REQUIRE(arr[0] == 1); + REQUIRE(arr[1] == 42); + REQUIRE(arr[2] == 666); REQUIRE_THROWS_AS(arr[3], std::out_of_range); @@ -46,22 +46,22 @@ TEST_CASE("ucl: array: compare", "[ucl]") using namespace nihil::ucl; auto arr = array(); - arr.push_back(1); - arr.push_back(42); - arr.push_back(666); + arr.push_back(integer(1)); + arr.push_back(integer(42)); + arr.push_back(integer(666)); auto arr2 = array(); REQUIRE(arr != arr2); - arr2.push_back(1); - arr2.push_back(42); - arr2.push_back(666); + arr2.push_back(integer(1)); + arr2.push_back(integer(42)); + arr2.push_back(integer(666)); REQUIRE(arr == arr2); auto arr3 = array(); - arr3.push_back(1); - arr3.push_back(1); - arr3.push_back(1); + arr3.push_back(integer(1)); + arr3.push_back(integer(1)); + arr3.push_back(integer(1)); REQUIRE(arr != arr3); } @@ -69,7 +69,7 @@ TEST_CASE("ucl: array: iterator", "[ucl]") { using namespace nihil::ucl; - auto arr = array{1, 42, 666}; + auto arr = array{integer(1), integer(42), integer(666)}; auto it = arr.begin(); REQUIRE(*it == 1); @@ -129,7 +129,7 @@ TEST_CASE("ucl: array is a sized_range", "[ucl]") { using namespace nihil::ucl; - auto arr = array{1, 42, 666}; + auto arr = array{integer(1), integer(42), integer(666)}; static_assert(std::ranges::sized_range); auto size = std::ranges::size(arr); -- cgit v1.2.3