From 28ec50d567c748e9e0deb14f6d1ff6993e02a329 Mon Sep 17 00:00:00 2001 From: Atanas Dimitrov Date: Wed, 3 Aug 2022 16:09:36 +0300 Subject: [PATCH] Fix string orderings to account for prefix-equal strings --- core/runtime/internal.odin | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/core/runtime/internal.odin b/core/runtime/internal.odin index 30798f623..16af84ebc 100644 --- a/core/runtime/internal.odin +++ b/core/runtime/internal.odin @@ -341,7 +341,12 @@ string_eq :: proc "contextless" (lhs, rhs: string) -> bool { string_cmp :: proc "contextless" (a, b: string) -> int { x := transmute(Raw_String)a 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) }