Skip to content

cores/WString: Add missing __FlashStringHelper implementations #441

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
ederjc merged 1 commit into from
Jun 11, 2026
Merged

cores/WString: Add missing __FlashStringHelper implementations #441

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
50 changes: 50 additions & 0 deletions cores/WString.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,11 @@ String::String(const String &value) {
*this = value;
}

String::String(const __FlashStringHelper *pstr) {
init();
*this = pstr;
}

String::String(char c) {
init();
char buf[2];
Expand Down Expand Up @@ -159,6 +164,16 @@ String &String::copy(const char *cstr, unsigned int length) {
return *this;
}

String &String::copy(const __FlashStringHelper *pstr, unsigned int length) {
if (!reserve(length)) {
invalidate();
return *this;
}
len = length;
strcpy_P(buffer, (PGM_P)pstr);
return *this;
}

String &String::operator=(const String &rhs) {
if (this == &rhs) {
return *this;
Expand All @@ -183,6 +198,16 @@ String &String::operator=(const char *cstr) {
return *this;
}

String &String::operator=(const __FlashStringHelper *pstr) {
if (pstr) {
copy(pstr, strlen_P((PGM_P)pstr));
} else {
invalidate();
}

return *this;
}

/*********************************************/
/* concat */
/*********************************************/
Expand Down Expand Up @@ -261,6 +286,23 @@ unsigned char String::concat(double num) {
return concat(string, strlen(string));
}

unsigned char String::concat(const __FlashStringHelper *pstr) {
if (!pstr) {
return 0;
}
unsigned int length = strlen_P((PGM_P)pstr);
if (length == 0) {
return 1;
}
unsigned int newlen = len + length;
if (!reserve(newlen)) {
return 0;
}
strcpy_P(buffer + len, (PGM_P)pstr);
len = newlen;
return 1;
}

/*********************************************/
/* Concatenate */
/*********************************************/
Expand Down Expand Up @@ -345,6 +387,14 @@ StringSumHelper &operator+(const StringSumHelper &lhs, double num) {
return a;
}

StringSumHelper &operator+(const StringSumHelper &lhs, const __FlashStringHelper *rhs) {
StringSumHelper &a = const_cast<StringSumHelper &>(lhs);
if (!a.concat(rhs)) {
a.invalidate();
}
return a;
}

/*********************************************/
/* Comparison */
/*********************************************/
Expand Down
Loading