WString explicit converters to reduce Flash size (espressif#3497)

everslick · me-no-dev · commit 36075257c243 · 2020-01-20T15:29:16.000+02:00
* WString explicit converters to reduce Flash size This is a port from the same patch for ESP8266: https://github.com/esp8266/Arduino/pull/6759/files
diff --git a/cores/esp32/WString.h b/cores/esp32/WString.h
@@ -203,8 +203,20 @@ class String{
 unsigned char equalsIgnoreCase(const String &s) const;
 unsigned char equalsConstantTime(const String &s) const;
 unsigned char startsWith(const String &prefix) const;
+ unsigned char startsWith(const char *prefix) const{
+ return this->startsWith(String(prefix));
+ }
+ unsigned char startsWith(const __FlashStringHelper *prefix) const{
+ return this->startsWith(String(prefix));
+ }
 unsigned char startsWith(const String &prefix, unsigned int offset) const;
 unsigned char endsWith(const String &suffix) const;
+ unsigned char endsWith(const char *suffix) const{
+ return this->endsWith(String(suffix));
+ }
+ unsigned char endsWith(const __FlashStringHelper * suffix) const{
+ return this->endsWith(String(suffix));
+ }
 
 // character access
 char charAt(unsigned int index) const;
@@ -238,7 +250,22 @@ class String{
 
 // modification
 void replace(char find, char replace);
- void replace(const String& find, const String& replace);
+ void replace(const String &find, const String &replace);
+ void replace(const char *find, const String &replace){
+ this->replace(String(find), replace);
+ }
+ void replace(const __FlashStringHelper *find, const String &replace){
+ this->replace(String(find), replace);
+ }
+ void replace(const char *find, const char *replace){
+ this->replace(String(find), String(replace));
+ }
+ void replace(const __FlashStringHelper *find, const char *replace){
+ this->replace(String(find), String(replace));
+ }
+ void replace(const __FlashStringHelper *find, const __FlashStringHelper *replace){
+ this->replace(String(find), String(replace));
+ }
 void remove(unsigned int index);
 void remove(unsigned int index, unsigned int count);
 void toLowerCase(void);

-Original file line number
+Diff line change
 unsignedcharequalsIgnoreCase(const String &s) const;
 unsignedcharequalsConstantTime(const String &s) const;
 unsignedcharstartsWith(const String &prefix) const;
 +unsignedcharstartsWith(constchar *prefix) const{
 +returnthis->startsWith(String(prefix));
 + }
 +unsignedcharstartsWith(const __FlashStringHelper *prefix) const{
 +returnthis->startsWith(String(prefix));
 + }
 unsignedcharstartsWith(const String &prefix, unsignedint offset) const;
 unsignedcharendsWith(const String &suffix) const;
 +unsignedcharendsWith(constchar *suffix) const{
 +returnthis->endsWith(String(suffix));
 + }
 +unsignedcharendsWith(const __FlashStringHelper * suffix) const{
 +returnthis->endsWith(String(suffix));
 + }
 // character access
 charcharAt(unsignedint index) const;
 // modification
 voidreplace(char find, char replace);
 -voidreplace(const String& find, const String& replace);
 +voidreplace(const String &find, const String &replace);
 +voidreplace(constchar *find, const String &replace){
 +this->replace(String(find), replace);
 + }
 +voidreplace(const __FlashStringHelper *find, const String &replace){
 +this->replace(String(find), replace);
 + }
 +voidreplace(constchar *find, constchar *replace){
 +this->replace(String(find), String(replace));
 + }
 +voidreplace(const __FlashStringHelper *find, constchar *replace){
 +this->replace(String(find), String(replace));
 + }
 +voidreplace(const __FlashStringHelper *find, const __FlashStringHelper *replace){
 +this->replace(String(find), String(replace));
 + }
 voidremove(unsignedint index);
 voidremove(unsignedint index, unsignedint count);
 voidtoLowerCase(void);