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

stdlib: Remove redundant checks from String.lastIndexOf

Browse Source 
Kotlin/JVM allows a user to specify a start index greater than
a string length in String.lastIndexOf method. This patch
modifies the Kotlin/Native implementation according to this
behaviour. It also removes other redundant checks.
This commit is contained in:
Ilya Matveev
2017-06-14 14:55:17 +07:00
committed by ilmat192
parent 0e8a1292a7
commit 4202e6d818
1 changed files with 28 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
runtime/src/main/cpp/KString.cpp
+28 -27
View File
@@ -1020,9 +1020,12 @@ KInt Kotlin_String_indexOfChar(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 || thiz->count_ == 0) {
return -1;
}
if (fromIndex >= thiz->count_) {
fromIndex = thiz->count_ - 1;
}
KInt count = thiz->count_;
KInt index = fromIndex;
const KChar* thizRaw = CharArrayAddressOfElementAt(thiz, index);
@@ -1065,35 +1068,33 @@ KInt Kotlin_String_indexOfString(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 ||
other->count_ > thiz->count_ - fromIndex) {
return -1;
}
KInt count = thiz->count_;
KInt otherCount = other->count_;
KInt start = fromIndex;
if (otherCount <= count && start >= 0) {
if (otherCount > 0) {
if (fromIndex > count - otherCount)
start = count - otherCount;
KChar firstChar = *CharArrayAddressOfElementAt(other, 0);
while (true) {
KInt candidate = Kotlin_String_lastIndexOfChar(thiz, firstChar, start);
if (candidate == -1) return -1;
KInt offsetThiz = candidate;
KInt offsetOther = 0;
while (++offsetOther < otherCount &&
*CharArrayAddressOfElementAt(thiz, ++offsetThiz) ==
*CharArrayAddressOfElementAt(other, offsetOther)) {}
if (offsetOther == otherCount) {
return candidate;
}
start = candidate - 1;
}
}
return start < count ? start : count;
if (fromIndex < 0 || otherCount > count) {
return -1;
}
if (otherCount == 0) {
return fromIndex < count ? fromIndex : count;
}
KInt start = fromIndex;
if (fromIndex > count - otherCount)
start = count - otherCount;
KChar firstChar = *CharArrayAddressOfElementAt(other, 0);
while (true) {
KInt candidate = Kotlin_String_lastIndexOfChar(thiz, firstChar, start);
if (candidate == -1) return -1;
KInt offsetThiz = candidate;
KInt offsetOther = 0;
while (++offsetOther < otherCount &&
*CharArrayAddressOfElementAt(thiz, ++offsetThiz) ==
*CharArrayAddressOfElementAt(other, offsetOther)) {}
if (offsetOther == otherCount) {
return candidate;
}
start = candidate - 1;
}
return -1;
}
KInt Kotlin_String_hashCode(KString thiz) {