Commit ff3dd5b

authored

feat(string): Add initializer list constructor (#12109)

* feat(string): Add initializer list constructor * fix(mac): Add initializer list constructor

1 parent e368295 commit ff3dd5bCopy full SHA for ff3dd5b

File tree

+38

-0

lines changed

+38

-0

lines changed

Lines changed: 18 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -32,6 +32,24 @@ MacAddress::MacAddress(const String &macstr) {`
`32`	`32`	`fromString(macstr.c_str());`
`33`	`33`	`}`
`34`	`34`
	`35`	`+#ifdef __GXX_EXPERIMENTAL_CXX0X__`
	`36`	`+MacAddress::MacAddress(std::initializer_list<uint8_t> list) {`
	`37`	`+ size_t size = list.size();`
	`38`	`+ memset(_mac.bytes, 0, sizeof(_mac.bytes));`
	`39`	`+ if (size == 6) {`
	`40`	`+ _type = MAC6;`
	`41`	`+ } else if (size == 8) {`
	`42`	`+ _type = MAC8;`
	`43`	`+ } else {`
	`44`	`+ // Default to MAC6 and keep the rest of the bytes as 0`
	`45`	`+ _type = MAC6;`
	`46`	`+ return;`
	`47`	`+ }`
	`48`	`+`
	`49`	`+ memcpy(_mac.bytes, list.begin(), size);`
	`50`	`+}`
	`51`	`+#endif`
	`52`	`+`
`35`	`53`	`MacAddress::MacAddress(uint8_t b1, uint8_t b2, uint8_t b3, uint8_t b4, uint8_t b5, uint8_t b6) {`
`36`	`54`	`_type = MAC6;`
`37`	`55`	`memset(_mac.bytes, 0, sizeof(_mac.bytes));`

Lines changed: 9 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,9 @@`
`23`	`23`	`#include <stdint.h>`
`24`	`24`	`#include <WString.h>`
`25`	`25`	`#include <Printable.h>`
	`26`	`+#ifdef __GXX_EXPERIMENTAL_CXX0X__`
	`27`	`+#include <initializer_list>`
	`28`	`+#endif`
`26`	`29`
`27`	`30`	`enum MACType {`
`28`	`31`	`MAC6,`
`@@ -56,6 +59,12 @@ class MacAddress : public Printable {`
`56`	`59`	`MacAddress(const char *macstr);`
`57`	`60`	`MacAddress(const String &macstr);`
`58`	`61`
	`62`	`+#ifdef __GXX_EXPERIMENTAL_CXX0X__`
	`63`	`+ // Initializer list constructor for {0xAA, 0xBB, ...} syntax`
	`64`	`+ // This has higher priority than String conversion, preventing ambiguity`
	`65`	`+ MacAddress(std::initializer_list<uint8_t> list);`
	`66`	`+#endif`
	`67`	`+`
`59`	`68`	`virtual ~MacAddress() {}`
`60`	`69`
`61`	`70`	`bool fromString(const char *buf);`

Lines changed: 7 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -59,6 +59,13 @@ String::String(StringSumHelper &&rval) {`
`59`	`59`	`init();`
`60`	`60`	`move(rval);`
`61`	`61`	`}`
	`62`	`+`
	`63`	`+String::String(std::initializer_list<char> list) {`
	`64`	`+ init();`
	`65`	`+ if (list.size() > 0) {`
	`66`	`+ copy(list.begin(), list.size());`
	`67`	`+ }`
	`68`	`+}`
`62`	`69`	`#endif`
`63`	`70`
`64`	`71`	`String::String(char c) {`

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,9 @@`
`29`	`29`	`#include <stdint.h>`
`30`	`30`	`#include <string.h>`
`31`	`31`	`#include <ctype.h>`
	`32`	`+#ifdef __GXX_EXPERIMENTAL_CXX0X__`
	`33`	`+#include <initializer_list>`
	`34`	`+#endif`
`32`	`35`
`33`	`36`	`// A pure abstract class forward used as a means to proide a unique pointer type`
`34`	`37`	`// but really is never defined.`
`@@ -58,6 +61,7 @@ class String {`
`58`	`61`	`String(const char *cstr, unsigned int length);`
`59`	`62`	`#ifdef __GXX_EXPERIMENTAL_CXX0X__`
`60`	`63`	`String(const uint8_t cstr, unsigned int length) : String(reinterpret_cast<const char >(cstr), length) {}`
	`64`	`+ String(std::initializer_list<char> list);`
`61`	`65`	`#endif`
`62`	`66`	`String(const String &str);`
`63`	`67`	`String(const __FlashStringHelper str) : String(reinterpret_cast<const char >(str)) {}`

Comments

(0)