constexpr fast string comparator

ucpu · Dec 28, 2023 · 39538b9 · 39538b9
1 parent b47d07b
commit 39538b9
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 1 deletion.
diff --git a/sources/include/cage-core/string.h b/sources/include/cage-core/string.h
@@ -229,7 +229,7 @@ namespace cage
 		template<uint32 N>
 		struct StringComparatorFastBase
 		{
-			bool operator()(const StringBase<N> &a, const StringBase<N> &b) const noexcept
+			constexpr bool operator()(const StringBase<N> &a, const StringBase<N> &b) const noexcept
 			{
 				if (a.length() == b.length())
 					return detail::memcmp(a.begin(), b.begin(), a.length()) < 0;

diff --git a/sources/test-core/flatSet.cpp b/sources/test-core/flatSet.cpp
@@ -1,6 +1,26 @@
 #include "main.h"
 
 #include <cage-core/flatSet.h>
+#include <cage-core/string.h>
+
+namespace
+{
+	constexpr uint32 testConstexpr()
+	{
+		FlatSet<String, StringComparatorFast> s = { "hello", "there" };
+		s.insert("Obi-Wan");
+		s.insert("Kenobi");
+		s.insert("says");
+		s.insert("hello");
+		s.insert("how");
+		s.insert("are");
+		s.insert("you");
+		s.insert("you");
+		s.insert("you");
+		s.insert("are");
+		return s.size();
+	}
+}
 
 void testFlatSet()
 {
@@ -172,4 +192,11 @@ void testFlatSet()
 		CAGE_TEST(s.size() == 2);
 		CAGE_TEST(s == FlatSet<uint32>({ 13, 1024 }));
 	}
+
+	{
+		CAGE_TESTCASE("constexpr");
+		constexpr const uint32 a = testConstexpr();
+		uint32 b = testConstexpr();
+		CAGE_TEST(a == b);
+	}
 }