From 0fa623093366351ad47583f47add6e51f56a56d8 Mon Sep 17 00:00:00 2001 From: Lexi Winter Date: Mon, 23 Jun 2025 00:32:38 +0100 Subject: nihil.ucl: improve tests --- nihil.ucl/integer.ccm | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'nihil.ucl/integer.ccm') diff --git a/nihil.ucl/integer.ccm b/nihil.ucl/integer.ccm index b58c04d..482a716 100644 --- a/nihil.ucl/integer.ccm +++ b/nihil.ucl/integer.ccm @@ -18,8 +18,7 @@ import :object; namespace nihil::ucl { export struct integer final : object { - using value_type = std::int64_t; - + using contained_type = std::int64_t; inline static constexpr object_type ucl_type = object_type::integer; // Create a new integer from a UCL object. @@ -43,7 +42,7 @@ export struct integer final : object { {} // Create a new integer from a value. - explicit integer(value_type value) + explicit integer(contained_type value) : object(noref, ::ucl_object_fromint(value)) { if (_object == nullptr) @@ -51,9 +50,9 @@ export struct integer final : object { } // Return the value of this object. - auto value(this integer const &self) -> value_type + auto value(this integer const &self) -> contained_type { - auto v = value_type{}; + auto v = contained_type{}; auto const *uobj = self.get_ucl_object(); if (::ucl_object_toint_safe(uobj, &v)) @@ -79,13 +78,13 @@ export auto operator<=> (integer const &a, integer const &b) return a.value() <=> b.value(); } -export auto operator== (integer const &a, integer::value_type b) +export auto operator== (integer const &a, integer::contained_type b) -> bool { return a.value() == b; } -export auto operator<=> (integer const &a, integer::value_type b) +export auto operator<=> (integer const &a, integer::contained_type b) -> std::strong_ordering { return a.value() <=> b; -- cgit v1.2.3