Skip to content

[java.lang.String] Fixed typo 'reversedString' #70

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tiny-express merged 2 commits into from
Jun 18, 2017
+11 −20
Merged

[java.lang.String] Fixed typo 'reversedString' #70

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9a78634
Fixed typo in reversedString
loint Jun 18, 2017
208d00c
Merge branch 'task/fix-memory-leak' of github.com:foodtiny/native int…
loint Jun 18, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 11 additions & 20 deletions java/lang/String/String.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -302,18 +302,14 @@ int String::lastIndexOf(int ch, int fromIndex) {
* @return int
*/
int String::lastIndexOf(String str) const {
string strReversed = string_reverse(str.toString());
string currentStrReversed = string_reverse(this->toString());

int result = string_index(currentStrReversed, strReversed, 1);

free(strReversed);
free(currentStrReversed);

string reversedString = string_reverse(str.toString());
string currentReversedString = string_reverse(this->toString());
int result = string_index(currentReversedString, reversedString, 1);
free(reversedString);
free(currentReversedString);
if (result == NOT_FOUND) {
return result;
}

//Re-calculate first character of str
result = this->size - ( result + str.size );
return result;
Expand All @@ -328,20 +324,15 @@ int String::lastIndexOf(String str) const {
*/
int String::lastIndexOf(String str, int fromIndex) const {
string subString = &( this->original )[ fromIndex ]; // get subString start fromIndex

string strReversed = string_reverse(str.toString());
string currentStrReversed = string_reverse(subString);

int result = string_index(currentStrReversed, strReversed, 1);

free(strReversed);
free(currentStrReversed);

string reversedString = string_reverse(str.toString());
string currentReversedString = string_reverse(subString);
int result = string_index(currentReversedString, reversedString, 1);
free(reversedString);
free(currentReversedString);
if (result == NOT_FOUND) {
return result;
}

//Re-calculate first character of str
// Re-calculate first character of str
result = this->size - ( result + str.size );
return result;

Expand Down