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

xo-object2: + string comparison operators

Browse source
This commit is contained in:
Roland Conybeare 2026-01-15 17:28:54 -05:00
commit fac95836fc
2 changed files with 67 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

20
xo-object2/include/xo/object2/DString.hpp
View file

@ -250,6 +250,26 @@ namespace xo {
return DString::compare(lhs, rhs) == 0;
}
inline bool operator!=(const DString & lhs, const DString & rhs) {
return DString::compare(lhs, rhs) != 0;
}
inline bool operator<(const DString & lhs, const DString & rhs) {
return DString::compare(lhs, rhs) < 0;
}
inline bool operator<=(const DString & lhs, const DString & rhs) {
return DString::compare(lhs, rhs) <= 0;
}
inline bool operator>(const DString & lhs, const DString & rhs) {
return DString::compare(lhs, rhs) > 0;
}
inline bool operator>=(const DString & lhs, const DString & rhs) {
return DString::compare(lhs, rhs) >= 0;
}
} /*namespace scm*/
} /*namespace xo*/

47
xo-object2/utest/DString.test.cpp
View file

@ -311,6 +311,53 @@ namespace xo {
REQUIRE(DString::compare(*s1, *s4) > 0);
REQUIRE(DString::compare(*s4, *s1) < 0);
}
TEST_CASE("DString-comparison-operators", "[object2][DString]")
{
ArenaConfig cfg { .name_ = "testarena",
.size_ = 4*1024 };
DArena arena = DArena::map(cfg);
auto alloc = with_facet<AAllocator>::mkobj(&arena);
DString * apple1 = DString::from_cstr(alloc, "apple");
DString * apple2 = DString::from_cstr(alloc, "apple");
DString * banana = DString::from_cstr(alloc, "banana");
// operator==
REQUIRE(*apple1 == *apple1);
REQUIRE(*apple2 == *apple2);
REQUIRE(*banana == *banana);
REQUIRE(*apple1 == *apple2);
REQUIRE_FALSE(*apple1 == *banana);
// operator!=
REQUIRE(*apple1 != *banana);
REQUIRE_FALSE(*apple1 != *apple1);
REQUIRE_FALSE(*apple2 != *apple2);
REQUIRE_FALSE(*apple1 != *apple2);
REQUIRE_FALSE(*banana != *banana);
// operator<
REQUIRE(*apple1 < *banana);
REQUIRE_FALSE(*banana < *apple1);
REQUIRE_FALSE(*apple1 < *apple2);
// operator<=
REQUIRE(*apple1 <= *banana);
REQUIRE(*apple1 <= *apple2);
REQUIRE_FALSE(*banana <= *apple1);
// operator>
REQUIRE(*banana > *apple1);
REQUIRE_FALSE(*apple1 > *banana);
REQUIRE_FALSE(*apple1 > *apple2);
// operator>=
REQUIRE(*banana >= *apple1);
REQUIRE(*apple1 >= *apple2);
REQUIRE_FALSE(*apple1 >= *banana);
}
} /*namespace ut*/
} /*namespace xo*/