add support for String operation with uint64_t

fixes examples StringConstructors, StringAdditionOperator, StringAppendOperator

only needed because millis() returns a uint64_t

Author: facchinm

cores/arduino/WString.cpp

@@ -125,7 +125,7 @@ char * String::getCSpec(int base, bool issigned, bool islong){
 String::String(unsigned char value, unsigned char base)
 {
 	init();
-	char buf[9];
+	char buf[1 + 8 * sizeof(unsigned char)];
 	//utoa(value, buf, base);
 	snprintf(buf, sizeof(buf), getCSpec(base, false, false), value);
 	*this = buf;
@@ -134,7 +134,7 @@ String::String(unsigned char value, unsigned char base)
 String::String(int value, unsigned char base)
 {
 	init();
-	char buf[18];
+	char buf[2 + 8 * sizeof(int)];
 	//itoa(value, buf, base);
 	snprintf(buf, sizeof(buf), getCSpec(base, true, false), value);
 	*this = buf;
@@ -143,7 +143,7 @@ String::String(int value, unsigned char base)
 String::String(unsigned int value, unsigned char base)
 {
 	init();
-	char buf[17];
+	char buf[1 + 8 * sizeof(unsigned int)];
 	//utoa(value, buf, base);
 	snprintf(buf, sizeof(buf), getCSpec(base, false, false), value);
 	*this = buf;
@@ -152,7 +152,7 @@ String::String(unsigned int value, unsigned char base)
 String::String(long value, unsigned char base)
 {
 	init();
-	char buf[34];
+	char buf[2 + 8 * sizeof(long)];
 	//ltoa(value, buf, base);
 	snprintf(buf, sizeof(buf), getCSpec(base, true, true), value);
 	*this = buf;
@@ -161,7 +161,25 @@ String::String(long value, unsigned char base)
 String::String(unsigned long value, unsigned char base)
 {
 	init();
-	char buf[33];
+	char buf[1 + 8 * sizeof(unsigned long)];
+	//ultoa(value, buf, base);
+	snprintf(buf, sizeof(buf), getCSpec(base, false, true), value);
+	*this = buf;
+}
+
+String::String(long long value, unsigned char base)
+{
+	init();
+	char buf[2 + 8 * sizeof(long long)];
+	//ltoa(value, buf, base);
+	snprintf(buf, sizeof(buf), getCSpec(base, true, true), value);
+	*this = buf;
+}
+
+String::String(unsigned long long value, unsigned char base)
+{
+	init();
+	char buf[1 + 8 * sizeof(unsigned long long)];
 	//ultoa(value, buf, base);
 	snprintf(buf, sizeof(buf), getCSpec(base, false, true), value);
 	*this = buf;
@@ -337,37 +355,53 @@ unsigned char String::concat(char c)
 
 unsigned char String::concat(unsigned char num)
 {
-	char buf[4];
+	char buf[1 + 3 * sizeof(unsigned char)];
 	//itoa(num, buf, 10);
 	snprintf(buf, sizeof(buf), getCSpec(10, true, false), num);
 	return concat(buf, strlen(buf));
 }
 
 unsigned char String::concat(int num)
 {
-	char buf[7];
+	char buf[2 + 3 * sizeof(int)];
 	//itoa(num, buf, 10);
 	snprintf(buf, sizeof(buf), getCSpec(10, true, false), num);
 	return concat(buf, strlen(buf));
 }
 
 unsigned char String::concat(unsigned int num)
 {
-	char buf[6];
+	char buf[1 + 3 * sizeof(unsigned int)];
 	//utoa(num, buf, 10);
 	snprintf(buf, sizeof(buf), getCSpec(10, false, false), num);
 	return concat(buf, strlen(buf));
 }
 
 unsigned char String::concat(long num)
 {
-	char buf[12];
+	char buf[2 + 3 * sizeof(long)];
 	//ltoa(num, buf, 10);
 	snprintf(buf, sizeof(buf), getCSpec(10, true, true), num);
 	return concat(buf, strlen(buf));
 }
 
 unsigned char String::concat(unsigned long num)
+{
+	char buf[1 + 3 * sizeof(unsigned long)];
+	//ultoa(num, buf, 10);
+	snprintf(buf, sizeof(buf), getCSpec(10, false, true), num);
+	return concat(buf, strlen(buf));
+}
+
+unsigned char String::concat(long long num)
+{
+	char buf[12];
+	//ltoa(num, buf, 10);
+	snprintf(buf, sizeof(buf), getCSpec(10, true, true), num);
+	return concat(buf, strlen(buf));
+}
+
+unsigned char String::concat(unsigned long long num)
 {
 	char buf[11];
 	//ultoa(num, buf, 10);
@@ -449,6 +483,20 @@ StringSumHelper & operator + (const StringSumHelper &lhs, unsigned long num)
 	return a;
 }
 
+StringSumHelper & operator + (const StringSumHelper &lhs, long long num)
+{
+	StringSumHelper &a = const_cast<StringSumHelper&>(lhs);
+	if (!a.concat(num)) a.invalidate();
+	return a;
+}
+
+StringSumHelper & operator + (const StringSumHelper &lhs, unsigned long long num)
+{
+	StringSumHelper &a = const_cast<StringSumHelper&>(lhs);
+	if (!a.concat(num)) a.invalidate();
+	return a;
+}
+
 StringSumHelper & operator + (const StringSumHelper &lhs, float num)
 {
         StringSumHelper &a = const_cast<StringSumHelper&>(lhs);

cores/arduino/WString.h

@@ -72,6 +72,8 @@ class String
 	explicit String(unsigned int, unsigned char base=10);
 	explicit String(long, unsigned char base=10);
 	explicit String(unsigned long, unsigned char base=10);
+	explicit String(long long, unsigned char base=10);
+	explicit String(unsigned long long, unsigned char base=10);
 	explicit String(float, unsigned char decimalPlaces=2);
 	explicit String(double, unsigned char decimalPlaces=2);
 	~String(void);
@@ -106,6 +108,8 @@ class String
 	unsigned char concat(unsigned int num);
 	unsigned char concat(long num);
 	unsigned char concat(unsigned long num);
+	unsigned char concat(long long num);
+	unsigned char concat(unsigned long long num);
 	unsigned char concat(float num);
 	unsigned char concat(double num);
 
@@ -119,6 +123,8 @@ class String
 	String & operator += (unsigned int num)		{concat(num); return (*this);}
 	String & operator += (long num)			{concat(num); return (*this);}
 	String & operator += (unsigned long num)	{concat(num); return (*this);}
+	String & operator += (long long num)			{concat(num); return (*this);}
+	String & operator += (unsigned long long num)	{concat(num); return (*this);}
 	String & operator += (float num)	        {concat(num); return (*this);}
 	String & operator += (double num)               {concat(num); return (*this);}
 
@@ -130,6 +136,8 @@ class String
 	friend StringSumHelper & operator + (const StringSumHelper &lhs, unsigned int num);
 	friend StringSumHelper & operator + (const StringSumHelper &lhs, long num);
 	friend StringSumHelper & operator + (const StringSumHelper &lhs, unsigned long num);
+	friend StringSumHelper & operator + (const StringSumHelper &lhs, long long num);
+	friend StringSumHelper & operator + (const StringSumHelper &lhs, unsigned long long num);
 	friend StringSumHelper & operator + (const StringSumHelper &lhs, float num);
 	friend StringSumHelper & operator + (const StringSumHelper &lhs, double num);