azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed bug in strings comparison

Browse Source
This commit is contained in:
Igor Chevdar
2017-05-19 17:44:33 +03:00
parent 0d0e652709
commit 67f37bad8d
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
runtime/src/main/cpp/KString.cpp
+5 -1
View File
@@ -744,10 +744,14 @@ OBJ_GETTER(CreateStringFromUtf8, const char* utf8, uint32_t lengthBytes) {
// String.kt // String.kt
KInt Kotlin_String_compareTo(KString thiz, KString other) { KInt Kotlin_String_compareTo(KString thiz, KString other) {
return memcmp( int result = memcmp(
CharArrayAddressOfElementAt(thiz, 0), CharArrayAddressOfElementAt(thiz, 0),
CharArrayAddressOfElementAt(other, 0), CharArrayAddressOfElementAt(other, 0),
(thiz->count_ < other->count_ ? thiz->count_ : other->count_) * sizeof(KChar)); (thiz->count_ < other->count_ ? thiz->count_ : other->count_) * sizeof(KChar));
if (result != 0) return result;
int diff = thiz->count_ - other->count_;
if (diff == 0) return 0;
return diff < 0 ? -1 : 1;
} }
KChar Kotlin_String_get(KString thiz, KInt index) { KChar Kotlin_String_get(KString thiz, KInt index) {