Improve String support for 64 bit integers

PaulStoffregen · Mar 29, 2023 · 1bf479e · 1bf479e
1 parent c26cb0f
commit 1bf479e
Show file tree

Hide file tree

Showing 4 changed files with 78 additions and 6 deletions.
diff --git a/teensy3/WString.cpp b/teensy3/WString.cpp
@@ -74,15 +74,15 @@ String::String(unsigned char c)
 String::String(const int value, unsigned char base)
 {
 	init();
-	char buf[18];
+	char buf[34];
 	itoa(value, buf, base);
 	*this = buf;
 }
 
 String::String(unsigned int value, unsigned char base)
 {
 	init();
-	char buf[17];
+	char buf[33];
   	utoa(value, buf, base);
 	*this = buf;
 }
@@ -103,6 +103,22 @@ String::String(unsigned long value, unsigned char base)
 	*this = buf;
 }
 
+String::String(long long value, unsigned char base)
+{
+	init();
+	char buf[66];
+	lltoa(value, buf, base);
+	*this = buf;
+}
+
+String::String(unsigned long long value, unsigned char base)
+{
+	init();
+	char buf[65];
+	ulltoa(value, buf, base);
+	*this = buf;
+}
+
 String::String(float num, unsigned char digits)
 {
 	init();
@@ -306,7 +322,7 @@ String & String::append(unsigned long num)
 
 String & String::append(long long num)
 {
-	char buf[21];
+	char buf[22];
 	lltoa(num, buf, 10);
 	append(buf, strlen(buf));
 	return *this;
@@ -397,6 +413,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);
+	a.append(num);
+	return a;
+}
+
+StringSumHelper & operator + (const StringSumHelper &lhs, unsigned long long num)
+{
+	StringSumHelper &a = const_cast<StringSumHelper&>(lhs);
+	a.append(num);
+	return a;
+}
+
 StringSumHelper & operator + (const StringSumHelper &lhs, float num)
 {
 	StringSumHelper &a = const_cast<StringSumHelper&>(lhs);

diff --git a/teensy3/WString.h b/teensy3/WString.h
@@ -128,6 +128,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);
 	String & concat(const String &str)		{return append(str);}
@@ -139,6 +141,8 @@ class String
 	String & concat(unsigned int num)		{return append(num);}
 	String & concat(long num)			{return append(num);}
 	String & concat(unsigned long num)		{return append(num);}
+	String & concat(long long num)			{return append(num);}
+	String & concat(unsigned long long num)		{return append(num);}
 	String & concat(float num)			{return append(num);}
 	String & concat(double num)			{return append(num);}
 
@@ -236,6 +240,8 @@ class StringSumHelper : public String
 	StringSumHelper(unsigned int num) : String(num, 10) {}
 	StringSumHelper(long num) : String(num, 10) {}
 	StringSumHelper(unsigned long num) : String(num, 10) {}
+	StringSumHelper(long long num) : String(num, 10) {}
+	StringSumHelper(unsigned long long num) : String(num, 10) {}
 };
 
 #endif  // __cplusplus

diff --git a/teensy4/WString.cpp b/teensy4/WString.cpp
@@ -74,15 +74,15 @@ String::String(unsigned char c)
 String::String(const int value, unsigned char base)
 {
 	init();
-	char buf[18];
+	char buf[34];
 	itoa(value, buf, base);
 	*this = buf;
 }
 
 String::String(unsigned int value, unsigned char base)
 {
 	init();
-	char buf[17];
+	char buf[33];
   	utoa(value, buf, base);
 	*this = buf;
 }
@@ -103,6 +103,22 @@ String::String(unsigned long value, unsigned char base)
 	*this = buf;
 }
 
+String::String(long long value, unsigned char base)
+{
+	init();
+	char buf[66];
+	lltoa(value, buf, base);
+	*this = buf;
+}
+
+String::String(unsigned long long value, unsigned char base)
+{
+	init();
+	char buf[65];
+	ulltoa(value, buf, base);
+	*this = buf;
+}
+
 String::String(float num, unsigned char digits)
 {
 	init();
@@ -306,7 +322,7 @@ String & String::append(unsigned long num)
 
 String & String::append(long long num)
 {
-	char buf[21];
+	char buf[22];
 	lltoa(num, buf, 10);
 	append(buf, strlen(buf));
 	return *this;
@@ -397,6 +413,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);
+	a.append(num);
+	return a;
+}
+
+StringSumHelper & operator + (const StringSumHelper &lhs, unsigned long long num)
+{
+	StringSumHelper &a = const_cast<StringSumHelper&>(lhs);
+	a.append(num);
+	return a;
+}
+
 StringSumHelper & operator + (const StringSumHelper &lhs, float num)
 {
 	StringSumHelper &a = const_cast<StringSumHelper&>(lhs);

diff --git a/teensy4/WString.h b/teensy4/WString.h
@@ -128,6 +128,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);
 	String & concat(const String &str)		{return append(str);}
@@ -139,6 +141,8 @@ class String
 	String & concat(unsigned int num)		{return append(num);}
 	String & concat(long num)			{return append(num);}
 	String & concat(unsigned long num)		{return append(num);}
+	String & concat(long long num)			{return append(num);}
+	String & concat(unsigned long long num)		{return append(num);}
 	String & concat(float num)			{return append(num);}
 	String & concat(double num)			{return append(num);}
 
@@ -236,6 +240,8 @@ class StringSumHelper : public String
 	StringSumHelper(unsigned int num) : String(num, 10) {}
 	StringSumHelper(long num) : String(num, 10) {}
 	StringSumHelper(unsigned long num) : String(num, 10) {}
+	StringSumHelper(long long num) : String(num, 10) {}
+	StringSumHelper(unsigned long long num) : String(num, 10) {}
 };
 
 #endif  // __cplusplus