Skip to content
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

Jump to bottom

Provide String::indexOf for a char* needle #7706

Merged
merged 7 commits into from
Nov 13, 2020
Merged

Provide String::indexOf for a char* needle #7706

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
598eddf
Provide String::indexOf for char* needle
paulocsanz Nov 13, 2020
543204e
Add tests for String::indexOf(char*)
paulocsanz Nov 13, 2020
c2017d0
Add String::indexOf for __FlashStringHelper pointers
paulocsanz Nov 13, 2020
06afd28
Fix typo
paulocsanz Nov 13, 2020
4b3a6a3
Use strstr_P in String::indexOf for char pointers
paulocsanz Nov 13, 2020
e466556
Make String::indexOf with String needle use char pointer version
paulocsanz Nov 13, 2020
dc696e0
Fix pointer cast to const
paulocsanz Nov 13, 2020
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
22 changes: 19 additions & 3 deletions cores/esp8266/WString.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -617,19 +617,35 @@ int String::indexOf(char ch, unsigned int fromIndex) const {
return temp - buffer();
}

int String::indexOf(const String &s2) const {
int String::indexOf(const __FlashStringHelper *s2) const {
return indexOf(s2, 0);
}

int String::indexOf(const String &s2, unsigned int fromIndex) const {
int String::indexOf(const __FlashStringHelper *s2, unsigned int fromIndex) const {
return indexOf((char*) s2, fromIndex);
earlephilhower marked this conversation as resolved.
Show resolved Hide resolved
}

int String::indexOf(const char *s2) const {
return indexOf(s2, 0);
}

int String::indexOf(const char *s2, unsigned int fromIndex) const {
if (fromIndex >= len())
return -1;
const char *found = strstr(buffer() + fromIndex, s2.buffer());
const char *found = strstr_P(buffer() + fromIndex, s2);
if (found == NULL)
return -1;
return found - buffer();
}

int String::indexOf(const String &s2) const {
return indexOf(s2, 0);
}

int String::indexOf(const String &s2, unsigned int fromIndex) const {
return indexOf(s2.c_str(), fromIndex);
}

int String::lastIndexOf(char theChar) const {
return lastIndexOf(theChar, len() - 1);
}
Expand Down
4 changes: 4 additions & 0 deletions cores/esp8266/WString.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,6 +235,10 @@ class String {
// search
int indexOf(char ch) const;
int indexOf(char ch, unsigned int fromIndex) const;
int indexOf(const char *str) const;
int indexOf(const char *str, unsigned int fromIndex) const;
int indexOf(const __FlashStringHelper *str) const;
int indexOf(const __FlashStringHelper *str, unsigned int fromIndex) const;
int indexOf(const String &str) const;
int indexOf(const String &str, unsigned int fromIndex) const;
int lastIndexOf(char ch) const;
Expand Down
4 changes: 4 additions & 0 deletions tests/host/core/test_string.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,6 +245,10 @@ TEST_CASE("String nulls", "[core][String]")
REQUIRE(s.lastIndexOf("tacos") == -1);
REQUIRE(s.lastIndexOf('t', 0) == -1);
REQUIRE(s.lastIndexOf('t') == -1);
REQUIRE(s.indexOf(String("tacos"), 1) == -1);
REQUIRE(s.indexOf(String("tacos")) == -1);
REQUIRE(s.indexOf(F("tacos"), 1) == -1);
REQUIRE(s.indexOf(F("tacos")) == -1);
REQUIRE(s.indexOf("tacos", 1) == -1);
REQUIRE(s.indexOf("tacos") == -1);
REQUIRE(s.indexOf('t', 1) == -1);
Expand Down