Merge pull request #1172 from cppalliance/fix_locale

Author: mborland

doc/modules/ROOT/pages/format.adoc

@@ -83,7 +83,7 @@ IMPORTANT: `std::format` only supports `char` and `wchar_t` types per the pass:[
 
 The appropriate order for the full format specifier is:
 
-String literal pass:["{Locale, Sign, Padding, Precision, Type}"]
+String literal pass:["{Sign, Padding, Precision, Type, Locale}"]
 
 === Examples
 

include/boost/decimal/fmt_format.hpp

@@ -67,13 +67,6 @@ constexpr auto parse_impl(ParseContext &ctx)
         return std::make_tuple(ctx_precision, fmt, is_upper, padding_digits, sign_character, use_locale, it);
     }
 
-    // Check for the locale character
-    if (*it == static_cast<CharType>('L'))
-    {
-        use_locale = true;
-        ++it;
-    }
-
     // Check for a sign character
     if (it != ctx.end())
     {
@@ -177,6 +170,13 @@ constexpr auto parse_impl(ParseContext &ctx)
         ++it;
     }
 
+    // Check for the locale character
+    if (it != ctx.end() && *it == static_cast<CharType>('L'))
+    {
+        use_locale = true;
+        ++it;
+    }
+
     // Verify we're at the closing brace
     if (it != ctx.end() && *it != static_cast<CharType>('}'))
     {

include/boost/decimal/format.hpp

@@ -52,13 +52,6 @@ constexpr auto parse_impl(ParseContext &ctx)
     int padding_digits = 0;
     bool use_locale = false;
 
-    // Check for the locale character
-    if (*it == static_cast<CharType>('L'))
-    {
-        use_locale = true;
-        ++it;
-    }
-
     // Check for a sign character
     if (it != ctx.end())
     {
@@ -153,6 +146,13 @@ constexpr auto parse_impl(ParseContext &ctx)
         ++it;
     }
 
+    // Check for the locale character
+    if (it != ctx.end() && *it == static_cast<CharType>('L'))
+    {
+        use_locale = true;
+        ++it;
+    }
+
     // Verify we're at the closing brace
     if (it != ctx.end() && *it != static_cast<CharType>('}'))
     {

test/test_format.cpp

@@ -255,7 +255,7 @@ void test_locale_conversion(const char* locale, const std::string& result)
         std::locale::global(a);
 
         const T value {112289, -2};
-        BOOST_TEST_EQ(std::format("{:L.2f}", value), result);
+        BOOST_TEST_EQ(std::format("{:.2fL}", value), result);
     }
     // LCOV_EXCL_START
     catch (...)

test/test_format_fmtlib.cpp

@@ -279,7 +279,7 @@ void test_locale_conversion(const char* locale, const std::string& result)
         std::locale::global(a);
 
         const T value {112289, -2};
-        BOOST_TEST_EQ(fmt::format("{:L.2f}", value), result);
+        BOOST_TEST_EQ(fmt::format("{:.2fL}", value), result);
     }
     // LCOV_EXCL_START
     catch (...)