src: refactor to use locale functions

RaisinTen · jasnell · commit 940f2c2b4750 · 2021-06-14T08:19:51.000-07:00
This makes the code more readable. Signed-off-by: Darshan Sen <raisinten@gmail.com> PR-URL: nodejs#39014 Reviewed-By: Luigi Pinca <luigipinca@gmail.com> Reviewed-By: Richard Lau <rlau@redhat.com> Reviewed-By: James M Snell <jasnell@gmail.com>
diff --git a/src/inspector/node_string.cc b/src/inspector/node_string.cc
@@ -71,14 +71,14 @@ String StringViewToUtf8(v8_inspector::StringView view) {
 
 String fromDouble(double d) {
   std::ostringstream stream;
-  stream.imbue(std::locale("C"));  // Ignore locale
+  stream.imbue(std::locale::classic());  // Ignore current locale
   stream << d;
   return stream.str();
 }
 
 double toDouble(const char* buffer, size_t length, bool* ok) {
   std::istringstream stream(std::string(buffer, length));
-  stream.imbue(std::locale("C"));  // Ignore locale
+  stream.imbue(std::locale::classic());  // Ignore current locale
   double d;
   stream >> d;
   *ok = !stream.fail();
diff --git a/src/tracing/traced_value.cc b/src/tracing/traced_value.cc
@@ -94,7 +94,7 @@ std::string DoubleToCString(double v) {
     default:
       // This is a far less sophisticated version than the one used inside v8.
       std::ostringstream stream;
-      stream.imbue(std::locale("C"));  // Ignore locale
+      stream.imbue(std::locale::classic());  // Ignore current locale
       stream << v;
       return stream.str();
   }
diff --git a/src/util-inl.h b/src/util-inl.h
@@ -26,6 +26,7 @@
 
 #include <cmath>
 #include <cstring>
+#include <locale>
 #include "util.h"
 
 // These are defined by <sys/byteorder.h> or <netinet/in.h> on some systems.
@@ -274,7 +275,7 @@ void SwapBytes64(char* data, size_t nbytes) {
 }
 
 char ToLower(char c) {
-  return c >= 'A' && c <= 'Z' ? c + ('a' - 'A') : c;
+  return std::tolower(c, std::locale::classic());
 }
 
 std::string ToLower(const std::string& in) {
@@ -285,7 +286,7 @@ std::string ToLower(const std::string& in) {
 }
 
 char ToUpper(char c) {
-  return c >= 'a' && c <= 'z' ? (c - 'a') + 'A' : c;
+  return std::toupper(c, std::locale::classic());
 }
 
 std::string ToUpper(const std::string& in) {

Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,7 @@ std::string DoubleToCString(double v) {`
`94`	`94`	`default:`
`95`	`95`	`// This is a far less sophisticated version than the one used inside v8.`
`96`	`96`	`std::ostringstream stream;`
`97`		`- stream.imbue(std::locale("C")); // Ignore locale`
	`97`	`+ stream.imbue(std::locale::classic()); // Ignore current locale`
`98`	`98`	`stream << v;`
`99`	`99`	`return stream.str();`
`100`	`100`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,7 @@`
`26`	`26`
`27`	`27`	`#include <cmath>`
`28`	`28`	`#include <cstring>`
	`29`	`+#include <locale>`
`29`	`30`	`#include "util.h"`
`30`	`31`
`31`	`32`	`// These are defined by <sys/byteorder.h> or <netinet/in.h> on some systems.`
`@@ -274,7 +275,7 @@ void SwapBytes64(char* data, size_t nbytes) {`
`274`	`275`	`}`
`275`	`276`
`276`	`277`	`char ToLower(char c) {`
`277`		`- return c >= 'A' && c <= 'Z' ? c + ('a' - 'A') : c;`
	`278`	`+ return std::tolower(c, std::locale::classic());`
`278`	`279`	`}`
`279`	`280`
`280`	`281`	`std::string ToLower(const std::string& in) {`
`@@ -285,7 +286,7 @@ std::string ToLower(const std::string& in) {`
`285`	`286`	`}`
`286`	`287`
`287`	`288`	`char ToUpper(char c) {`
`288`		`- return c >= 'a' && c <= 'z' ? (c - 'a') + 'A' : c;`
	`289`	`+ return std::toupper(c, std::locale::classic());`
`289`	`290`	`}`
`290`	`291`
`291`	`292`	`std::string ToUpper(const std::string& in) {`