mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-03-30 17:06:40 +00:00
Code Issues Releases Wiki Activity

Support asymmetric comparison between ESM::RefId and std::string_view

Browse source
This commit is contained in:
elsid 2023-03-03 13:33:06 +01:00
parent 6f329f3d40
commit cd6a5b5a0e
No known key found for this signature in database
GPG key ID: 4DE04C198CBA7625
3 changed files with 32 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
apps/openmw_test_suite/esm/testrefid.cpp
View file

@ -3,6 +3,7 @@
#include <gtest/gtest.h>
#include <functional>
#include <map>
#include <string>
namespace ESM
@ -122,5 +123,26 @@ namespace ESM
const std::string_view b = "B";
EXPECT_LT(a, b);
}
TEST(ESMRefIdTest, hasCaseInsensitiveStrongOrderWithStringView)
{
const RefId a = RefId::stringRefId("a");
const std::string_view b = "B";
const RefId c = RefId::stringRefId("c");
EXPECT_LT(a, b);
EXPECT_LT(b, c);
}
TEST(ESMRefIdTest, canBeUsedAsMapKeyWithLookupByStringView)
{
const std::map<ESM::RefId, int, std::less<>> map({ { ESM::RefId::stringRefId("a"), 42 } });
EXPECT_EQ(map.count("A"), 1);
}
TEST(ESMRefIdTest, canBeUsedAsLookupKeyForMapWithStringKey)
{
const std::map<std::string, int, std::less<>> map({ { "a", 42 } });
EXPECT_EQ(map.count(ESM::RefId::stringRefId("A")), 1);
}
}
}

9
components/esm/refid.cpp
View file

@ -16,9 +16,14 @@ namespace ESM
return Misc::StringUtils::ciLess(mId, rhs.mId);
}
bool RefId::operator<(std::string_view rhs) const
bool operator<(const RefId& lhs, std::string_view rhs)
{
return Misc::StringUtils::ciLess(mId, rhs);
return Misc::StringUtils::ciLess(lhs.mId, rhs);
}
bool operator<(std::string_view lhs, const RefId& rhs)
{
return Misc::StringUtils::ciLess(lhs, rhs.mId);
}
std::ostream& operator<<(std::ostream& os, const RefId& refId)

4
components/esm/refid.hpp
View file

@ -39,7 +39,9 @@ namespace ESM
bool operator<(const RefId& rhs) const;
bool operator<(std::string_view rhs) const;
friend bool operator<(const RefId& lhs, std::string_view rhs);
friend bool operator<(std::string_view lhs, const RefId& rhs);
friend std::ostream& operator<<(std::ostream& os, const RefId& dt);