Browse Source

Fix string orderings to account for prefix-equal strings

Atanas Dimitrov 3 years ago
parent
commit
28ec50d567
1 changed files with 6 additions and 1 deletions
  1. 6 1
      core/runtime/internal.odin

+ 6 - 1
core/runtime/internal.odin

@@ -341,7 +341,12 @@ string_eq :: proc "contextless" (lhs, rhs: string) -> bool {
 string_cmp :: proc "contextless" (a, b: string) -> int {
 string_cmp :: proc "contextless" (a, b: string) -> int {
 	x := transmute(Raw_String)a
 	x := transmute(Raw_String)a
 	y := transmute(Raw_String)b
 	y := transmute(Raw_String)b
-	return memory_compare(x.data, y.data, min(x.len, y.len))
+
+	ret := memory_compare(x.data, y.data, min(x.len, y.len))
+	if ret == 0 && x.len != y.len {
+		return -1 if x.len < y.len else +1
+	}
+	return ret
 }
 }
 
 
 string_ne :: #force_inline proc "contextless" (a, b: string) -> bool { return !string_eq(a, b) }
 string_ne :: #force_inline proc "contextless" (a, b: string) -> bool { return !string_eq(a, b) }