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

Fix char index search

Browse Source
This commit is contained in:
Nikolay Igotti
2017-03-23 18:38:25 +03:00
parent c55d0cd674
commit 4a4225fd72
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
runtime/src/main/cpp/KString.cpp
+5 -5
View File
@@ -371,7 +371,7 @@ KInt Kotlin_Char_digitOf(KChar ch, KInt radix) {
KInt Kotlin_String_indexOfChar(KString thiz, KChar ch, KInt fromIndex) { KInt Kotlin_String_indexOfChar(KString thiz, KChar ch, KInt fromIndex) {
if (fromIndex < 0 || fromIndex > thiz->count_) { if (fromIndex < 0 || fromIndex > thiz->count_) {
return false; return -1;
} }
KInt count = thiz->count_; KInt count = thiz->count_;
const KChar* thizRaw = CharArrayAddressOfElementAt(thiz, fromIndex); const KChar* thizRaw = CharArrayAddressOfElementAt(thiz, fromIndex);
@@ -384,12 +384,12 @@ KInt Kotlin_String_indexOfChar(KString thiz, KChar ch, KInt fromIndex) {
KInt Kotlin_String_lastIndexOfChar(KString thiz, KChar ch, KInt fromIndex) { KInt Kotlin_String_lastIndexOfChar(KString thiz, KChar ch, KInt fromIndex) {
if (fromIndex < 0 || fromIndex > thiz->count_ || thiz->count_ == 0) { if (fromIndex < 0 || fromIndex > thiz->count_ || thiz->count_ == 0) {
return false; return -1;
} }
KInt count = thiz->count_; KInt count = thiz->count_;
KInt index = count - 1; KInt index = fromIndex;
const KChar* thizRaw = CharArrayAddressOfElementAt(thiz, index); const KChar* thizRaw = CharArrayAddressOfElementAt(thiz, index);
while (index >= fromIndex) { while (index >= 0) {
if (*thizRaw-- == ch) return index; if (*thizRaw-- == ch) return index;
index--; index--;
} }
@@ -416,7 +416,7 @@ KInt Kotlin_String_indexOfString(KString thiz, KString other, KInt fromIndex) {
KInt Kotlin_String_lastIndexOfString(KString thiz, KString other, KInt fromIndex) { KInt Kotlin_String_lastIndexOfString(KString thiz, KString other, KInt fromIndex) {
if (fromIndex < 0 || fromIndex > thiz->count_ || thiz->count_ == 0 || if (fromIndex < 0 || fromIndex > thiz->count_ || thiz->count_ == 0 ||
other->count_ > thiz->count_ - fromIndex) { other->count_ > thiz->count_ - fromIndex) {
return false; return -1;
} }
KInt count = thiz->count_; KInt count = thiz->count_;
KInt otherCount = other->count_; KInt otherCount = other->count_;