Redstone1024/Redcraft
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(strings): fix dynamic formatting arguments not working

Browse Source
This commit is contained in:
Redstone1024 2025-01-14 17:53:16 +08:00
parent 23963e0389
commit 88aba14620
1 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
Redcraft.Utility/Source/Public/Strings/Formatting.h
View File

@ -811,8 +811,7 @@ public:
{ {
MinDynamicField = Context.Visit([]<typename U>(U&& Value) -> size_t MinDynamicField = Context.Visit([]<typename U>(U&& Value) -> size_t
{ {
if constexpr (CIntegral<TRemoveReference<U>>)
if constexpr (CIntegral<U>)
{ {
checkf(Value > 0, TEXT("Illegal format argument. The dynamic width argument must be a unsigned non-zero number.")); checkf(Value > 0, TEXT("Illegal format argument. The dynamic width argument must be a unsigned non-zero number."));
@ -833,7 +832,7 @@ public:
{ {
MaxDynamicField = Context.Visit([]<typename U>(U&& Value) -> size_t MaxDynamicField = Context.Visit([]<typename U>(U&& Value) -> size_t
{ {
if constexpr (CIntegral<U>) if constexpr (CIntegral<TRemoveReference<U>>)
{ {
checkf(Value > 0, TEXT("Illegal format argument. The dynamic precision argument must be a unsigned non-zero number.")); checkf(Value > 0, TEXT("Illegal format argument. The dynamic precision argument must be a unsigned non-zero number."));
@ -1641,8 +1640,7 @@ public:
{ {
TargetField = Context.Visit([]<typename U>(U&& Value) -> size_t TargetField = Context.Visit([]<typename U>(U&& Value) -> size_t
{ {
if constexpr (CIntegral<TRemoveReference<U>>)
if constexpr (CIntegral<U>)
{ {
checkf(Value > 0, TEXT("Illegal format argument. The dynamic width argument must be a unsigned non-zero number.")); checkf(Value > 0, TEXT("Illegal format argument. The dynamic width argument must be a unsigned non-zero number."));
@ -1663,9 +1661,9 @@ public:
{ {
TargetBase = Context.Visit([]<typename U>(U&& Value) -> size_t TargetBase = Context.Visit([]<typename U>(U&& Value) -> size_t
{ {
if constexpr (CIntegral<U>) if constexpr (CIntegral<TRemoveReference<U>>)
{ {
checkf(!Math::IsWithinInclusive(Value, 2, 36), TEXT("Illegal format argument. The dynamic base argument must be in the range [2, 36].")); checkf(Math::IsWithinInclusive(Value, 2, 36), TEXT("Illegal format argument. The dynamic base argument must be in the range [2, 36]."));
return Math::Max(Value, 1); return Math::Max(Value, 1);
} }
@ -2451,10 +2449,9 @@ public:
// Visit the dynamic width argument. // Visit the dynamic width argument.
if (bDynamicWidth) if (bDynamicWidth)
{ {
TargetField = Context.Visit([]<typename U>(U && Value) -> size_t TargetField = Context.Visit([]<typename U>(U&& Value) -> size_t
{ {
if constexpr (CIntegral<TRemoveReference<U>>)
if constexpr (CIntegral<U>)
{ {
checkf(Value > 0, TEXT("Illegal format argument. The dynamic width argument must be a unsigned non-zero number.")); checkf(Value > 0, TEXT("Illegal format argument. The dynamic width argument must be a unsigned non-zero number."));
@ -2473,9 +2470,9 @@ public:
// Visit the dynamic precision argument. // Visit the dynamic precision argument.
if (bDynamicPrecision) if (bDynamicPrecision)
{ {
TargetPrecision = Context.Visit([]<typename U>(U && Value) -> size_t TargetPrecision = Context.Visit([]<typename U>(U&& Value) -> size_t
{ {
if constexpr (CIntegral<U>) if constexpr (CIntegral<TRemoveReference<U>>)
{ {
checkf(Value >= 0, TEXT("Illegal format argument. The dynamic precision argument must be a unsigned number.")); checkf(Value >= 0, TEXT("Illegal format argument. The dynamic precision argument must be a unsigned number."));