Fix setFormatedNumber() in FString for separator > 127

gansm · May 31, 2023 · 382891a · 382891a
1 parent 143a4eb
commit 382891a
Show file tree

Hide file tree

Showing 7 changed files with 43 additions and 23 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,7 @@
+2023-05-31  Markus Gans  <guru.mail@muenster.de>
+	* Fix setFormatedNumber() in FString for separator > 127 
+	  (e.g. non-breaking space)
+
 2023-05-18  Markus Gans  <guru.mail@muenster.de>
 	* Version 0.9.0
 

diff --git a/examples/string-operations.cpp b/examples/string-operations.cpp
@@ -532,7 +532,7 @@ void convertToNumberExample()
   try
   {
     const double double_num = \
-        finalcut::FString("2.718'281'828'459'045'235'3").toDouble();
+        finalcut::FString("2.7182818284590452353").toDouble();
     std::ios_base::fmtflags save_flags = std::cout.flags();
     std::cout << "  toDouble:  " << std::setprecision(11)
                                  << double_num << std::endl;
@@ -579,11 +579,11 @@ void formatedNumberExample()
   finalcut::FString fnum2{};
 #if defined(__LP64__) || defined(_LP64)
   // 64-bit architecture
-  fnum1.setFormatedNumber(0xffffffffffffffffU, '\'');
+  fnum1.setFormatedNumber(0xffffffffffffffffU, finalcut::C_STR("'"));
   fnum2.setFormatedNumber(-9223372036854775807);
 #else
   // 32-bit architecture
-  fnum1.setFormatedNumber(0xffffffffU, '\'');
+  fnum1.setFormatedNumber(0xffffffffU, finalcut::C_STR("'"));
   fnum2.setFormatedNumber(-2147483647);
 #endif
   std::cout << "setFormatedNumber: "

diff --git a/final/fobject.h b/final/fobject.h
@@ -23,9 +23,9 @@
 /*  Inheritance diagram
  *  ═══════════════════
  *
- *      ▕▔▔▔▔▔▔▔▔▏
- *      ▕ FTimer ▏
- *      ▕▁▁▁▁▁▁▁▁▏
+ *    ▕▔▔▔▔▔▔▔▔▔▔▔▔▔▔▏
+ *    ▕ FObjectTimer ▏
+ *    ▕▁▁▁▁▁▁▁▁▁▁▁▁▁▁▏
  *           ▲
  *           │
  *      ▕▔▔▔▔▔▔▔▔▔▏

diff --git a/final/ftimer.h b/final/ftimer.h
@@ -20,12 +20,13 @@
 * <http://www.gnu.org/licenses/>.                                      *
 ***********************************************************************/
 
-/*  Base class
- *  ══════════
+/*  Standalone class    Base class
+ *  ════════════════    ══════════
+ *                     
+ *     ▕▔▔▔▔▔▔▔▔▏    ▕▔▔▔▔▔▔▔▔▔▔▔▔▔▔▏
+ *     ▕ FTimer ▏    ▕ FObjectTimer ▏
+ *     ▕▁▁▁▁▁▁▁▁▏    ▕▁▁▁▁▁▁▁▁▁▁▁▁▁▁▏
  *
- * ▕▔▔▔▔▔▔▔▔▏
- * ▕ FTimer ▏
- * ▕▁▁▁▁▁▁▁▁▏
  */
 
 #ifndef FTIMER_H

diff --git a/final/util/fstring.cpp b/final/util/fstring.cpp
@@ -760,15 +760,15 @@ auto FString::setNumber (lDouble f_num, int precision) -> FString&
 }
 
 //----------------------------------------------------------------------
-auto FString::setFormatedNumber (sInt64 num, char separator) -> FString&
+auto FString::setFormatedNumber (sInt64 num, FString separator) -> FString&
 {
   int n{0};
   std::array<wchar_t, 30> buf{};
   wchar_t* s = &buf[29];  // Pointer to the last character
   auto abs_num = static_cast<uInt64>(num);
 
-  if ( separator == 0 )
-    separator = ' ';
+  if ( separator[0] == 0 )
+    separator = L" ";
 
   if ( num < 0 )
     abs_num = static_cast<uInt64>(-num);
@@ -782,7 +782,7 @@ auto FString::setFormatedNumber (sInt64 num, char separator) -> FString&
     n++;
 
     if ( abs_num && n % 3 == 0 )
-      *--s = separator;
+      *--s = separator[0];
   }
   while ( abs_num );
 
@@ -795,15 +795,15 @@ auto FString::setFormatedNumber (sInt64 num, char separator) -> FString&
 }
 
 //----------------------------------------------------------------------
-auto FString::setFormatedNumber (uInt64 num, char separator) -> FString&
+auto FString::setFormatedNumber (uInt64 num, FString separator) -> FString&
 {
   int n{0};
   std::array<wchar_t, 30> buf{};
   wchar_t* s = &buf[29];  // Pointer to the last character
   *s = L'\0';
 
-  if ( separator == 0 )
-    separator = ' ';
+  if ( separator[0] == 0 )
+    separator = L" ";
 
   do
   {
@@ -812,7 +812,7 @@ auto FString::setFormatedNumber (uInt64 num, char separator) -> FString&
     n++;
 
     if ( num && n % 3 == 0 )
-      *--s = separator;
+      *--s = separator[0];
   }
   while ( num );
 

diff --git a/final/util/fstring.h b/final/util/fstring.h
@@ -292,9 +292,9 @@ class FString
     auto setNumber (lDouble, int = int(getPrecision<lDouble>())) -> FString&;
 
     template <typename NumT>
-    auto setFormatedNumber (NumT, char = nl_langinfo(THOUSEP)[0]) -> FString&;
-    auto setFormatedNumber (sInt64, char = nl_langinfo(THOUSEP)[0]) -> FString&;
-    auto setFormatedNumber (uInt64, char = nl_langinfo(THOUSEP)[0]) -> FString&;
+    auto setFormatedNumber (NumT, FString = nl_langinfo(THOUSEP)) -> FString&;
+    auto setFormatedNumber (sInt64, FString = nl_langinfo(THOUSEP)) -> FString&;
+    auto setFormatedNumber (uInt64, FString = nl_langinfo(THOUSEP)) -> FString&;
 
     auto insert (const FString&, int) -> const FString&;
     auto insert (const FString&, std::size_t) -> const FString&;
@@ -690,7 +690,7 @@ inline auto FString::setNumber (NumT num, int precision) -> FString&
 
 //----------------------------------------------------------------------
 template <typename NumT>
-inline auto FString::setFormatedNumber (NumT num, char separator) -> FString&
+inline auto FString::setFormatedNumber (NumT num, FString separator) -> FString&
 {
   if ( isNegative(num) )
     return setFormatedNumber (sInt64(num), separator);

diff --git a/test/fstring-test.cpp b/test/fstring-test.cpp
@@ -1376,6 +1376,14 @@ void FStringTest::formatTest()
 
   fnum2.setFormatedNumber(uInt64(9223372036854775807u), '\0');
   CPPUNIT_ASSERT ( fnum2 == "9 223 372 036 854 775 807" );
+
+  // Non-breaking space
+  //   value: 0xa0 = \240
+  //   UTF-8: 0xc2 0xa0 = \302 \204
+  fnum2.setFormatedNumber(uInt64(9223372036854775807u), L"\240");
+  CPPUNIT_ASSERT ( fnum2 == "9\302\240" "223\302\240" "372\302\240"
+                            "036\302\240" "854\302\240" "775\302\240"
+                            "807" );
 #else
   // 32-bit architecture
   fnum1.setFormatedNumber(0xffffffffu, '\'');
@@ -1395,6 +1403,13 @@ void FStringTest::formatTest()
 
   fnum2.setFormatedNumber(uInt32(2147483647u), '\0');
   CPPUNIT_ASSERT ( fnum2 == "2 147 483 647" );
+
+  // Non-breaking space
+  //   value: 0xa0 = \240
+  //   UTF-8: 0xc2 0xa0 = \302 \204
+  fnum2.setFormatedNumber(uInt32(2147483647u), L"\240");
+  CPPUNIT_ASSERT ( fnum2 == "2\302\240" "147\302\240" "483\302\240"
+                            "647" );
 #endif
 
   fnum1.setFormatedNumber(sInt16(-2048), '_');