Fix different length string comparison

Author: adazem009

src/scratch/string_functions.cpp

@@ -61,17 +61,14 @@ extern "C"
 
     inline int string_compare_raw_case_sensitive_inline(const char16_t *str1, size_t n1, const char16_t *str2, size_t n2)
     {
-        if (n1 != n2)
-            return n1 < n2 ? -1 : 1;
-
         const size_t min_len = std::min(n1, n2);
 
         for (size_t i = 0; i < min_len; i++) {
             if (str1[i] != str2[i])
                 return str1[i] - str2[i];
         }
 
-        return 0;
+        return n1 < n2 ? -1 : (n1 > n2 ? 1 : 0);
     }
 
     int string_compare_raw_case_sensitive(const char16_t *str1, size_t n1, const char16_t *str2, size_t n2)
@@ -86,9 +83,6 @@ extern "C"
 
     inline int string_compare_raw_case_insensitive_inline(const char16_t *str1, size_t n1, const char16_t *str2, size_t n2)
     {
-        if (n1 != n2)
-            return n1 < n2 ? -1 : 1;
-
         const size_t min_len = std::min(n1, n2);
         std::u32string cp1_str, cp2_str;
         char32_t cp1, cp2;
@@ -104,7 +98,7 @@ extern "C"
                 return cp1 - cp2;
         }
 
-        return 0;
+        return n1 < n2 ? -1 : (n1 > n2 ? 1 : 0);
     }
 
     int string_compare_raw_case_insensitive(const char16_t *str1, size_t n1, const char16_t *str2, size_t n2)

test/scratch_classes/string_functions_test.cpp

@@ -145,6 +145,11 @@ TEST(StringFunctionsTest, CompareCaseSensitive)
     ASSERT_LT(string_compare_case_sensitive(&str1, &str2), 0);
     ASSERT_LT(string_compare_raw_case_sensitive(str1.data, str1.size, str2.data, str2.size), 0);
 
+    string_assign_cstring(&str1, "Infinity");
+    string_assign_cstring(&str2, "NaN");
+    ASSERT_LT(string_compare_case_sensitive(&str1, &str2), 0);
+    ASSERT_LT(string_compare_raw_case_sensitive(str1.data, str1.size, str2.data, str2.size), 0);
+
     string_assign_cstring(&str1, "ábčď");
     string_assign_cstring(&str2, "ábčď");
     ASSERT_EQ(string_compare_case_sensitive(&str1, &str2), 0);
@@ -202,13 +207,13 @@ TEST(StringFunctionsTest, CompareCaseInsensitive)
 
     string_assign_cstring(&str1, "Lorem ipsum");
     string_assign_cstring(&str2, "dolor sit amet");
-    ASSERT_LT(string_compare_case_insensitive(&str1, &str2), 0);
-    ASSERT_LT(string_compare_raw_case_insensitive(str1.data, str1.size, str2.data, str2.size), 0);
+    ASSERT_GT(string_compare_case_insensitive(&str1, &str2), 0);
+    ASSERT_GT(string_compare_raw_case_insensitive(str1.data, str1.size, str2.data, str2.size), 0);
 
     string_assign_cstring(&str1, "dolor sit amet");
     string_assign_cstring(&str2, "Lorem ipsum");
-    ASSERT_GT(string_compare_case_insensitive(&str1, &str2), 0);
-    ASSERT_GT(string_compare_raw_case_insensitive(str1.data, str1.size, str2.data, str2.size), 0);
+    ASSERT_LT(string_compare_case_insensitive(&str1, &str2), 0);
+    ASSERT_LT(string_compare_raw_case_insensitive(str1.data, str1.size, str2.data, str2.size), 0);
 
     string_assign_cstring(&str1, "Hello");
     string_assign_cstring(&str2, "Hello world");
@@ -225,6 +230,11 @@ TEST(StringFunctionsTest, CompareCaseInsensitive)
     ASSERT_LT(string_compare_case_insensitive(&str1, &str2), 0);
     ASSERT_LT(string_compare_raw_case_insensitive(str1.data, str1.size, str2.data, str2.size), 0);
 
+    string_assign_cstring(&str1, "Infinity");
+    string_assign_cstring(&str2, "NaN");
+    ASSERT_LT(string_compare_case_insensitive(&str1, &str2), 0);
+    ASSERT_LT(string_compare_raw_case_insensitive(str1.data, str1.size, str2.data, str2.size), 0);
+
     string_assign_cstring(&str1, "ábčď");
     string_assign_cstring(&str2, "ábčď");
     ASSERT_EQ(string_compare_case_insensitive(&str1, &str2), 0);