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

Compare commits

base: Redstone1024:3859070d534c0f8c1051c9d5f8c155c01ff50f48
Branches Tags
Redstone1024:master
...
compare: Redstone1024:1c0c93ee252807465848ef546767b313249b3a4f
Branches Tags
Redstone1024:master

2 Commits
3859070d53 ... 1c0c93ee25

Author SHA1 Message Date
Redstone1024
1c0c93ee25 refactor(string): refactor string conversion but not fully tested 2024-11-13 22:41:44 +08:00
Redstone1024
646d0cb7a4 fix(string): fix string trimming function's return value 2024-11-13 12:53:27 +08:00
5 changed files with 893 additions and 387 deletions
Show Stats Expand all files Collapse all files

16
Redcraft.Utility/Source/Private/Testing/StringTesting.cpp
View File

@ -81,9 +81,25 @@ void TestChar()
always_check(0xF == TChar<T>::ToDigit(LITERAL(T, 'f'))); always_check(0xF == TChar<T>::ToDigit(LITERAL(T, 'f')));
always_check(0xF == TChar<T>::ToDigit(LITERAL(T, 'F'))); always_check(0xF == TChar<T>::ToDigit(LITERAL(T, 'F')));
always_check(0x0 == TChar<T>::ToDigit(LITERAL(T, '0'), false));
always_check(0xF != TChar<T>::ToDigit(LITERAL(T, 'f'), false));
always_check(0xF == TChar<T>::ToDigit(LITERAL(T, 'F'), false));
always_check(0x0 == TChar<T>::ToDigit(LITERAL(T, '0'), true));
always_check(0xF == TChar<T>::ToDigit(LITERAL(T, 'f'), true));
always_check(0xF != TChar<T>::ToDigit(LITERAL(T, 'F'), true));
always_check(LITERAL(T, '0') == TChar<T>::FromDigit(0x0)); always_check(LITERAL(T, '0') == TChar<T>::FromDigit(0x0));
always_check(LITERAL(T, 'f') != TChar<T>::FromDigit(0xF)); always_check(LITERAL(T, 'f') != TChar<T>::FromDigit(0xF));
always_check(LITERAL(T, 'F') == TChar<T>::FromDigit(0xF)); always_check(LITERAL(T, 'F') == TChar<T>::FromDigit(0xF));
always_check(LITERAL(T, '0') == TChar<T>::FromDigit(0x0, false));
always_check(LITERAL(T, 'f') != TChar<T>::FromDigit(0xF, false));
always_check(LITERAL(T, 'F') == TChar<T>::FromDigit(0xF, false));
always_check(LITERAL(T, '0') == TChar<T>::FromDigit(0x0, true));
always_check(LITERAL(T, 'f') == TChar<T>::FromDigit(0xF, true));
always_check(LITERAL(T, 'F') != TChar<T>::FromDigit(0xF, true));
}; };
Test(InPlaceType<char>); Test(InPlaceType<char>);

60
Redcraft.Utility/Source/Public/String/Char.h
View File

@ -839,6 +839,66 @@ struct TChar
return DigitFromChar[InChar]; return DigitFromChar[InChar];
} }
NODISCARD FORCEINLINE static constexpr unsigned ToDigit(CharType InChar, bool bLowercase)
{
static_assert(TChar::IsASCII());
if (bLowercase)
{
constexpr uint8 DigitFromChar[] =
{
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
0xFF, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18,
0x19, 0x1A, 0x1B, 0x1C, 0x1D, 0x1E, 0x1F, 0x20, 0x21, 0x22, 0x23, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
};
static_assert(sizeof(DigitFromChar) == 256);
if constexpr (sizeof(CharType) > 1) if (InChar >> 8) return DigitFromChar[0];
return DigitFromChar[InChar];
}
constexpr uint8 DigitFromChar[] =
{
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
0xFF, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18,
0x19, 0x1A, 0x1B, 0x1C, 0x1D, 0x1E, 0x1F, 0x20, 0x21, 0x22, 0x23, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
};
static_assert(sizeof(DigitFromChar) == 256);
if constexpr (sizeof(CharType) > 1) if (InChar >> 8) return DigitFromChar[0];
return DigitFromChar[InChar];
}
NODISCARD FORCEINLINE static constexpr CharType FromDigit(unsigned InDigit) NODISCARD FORCEINLINE static constexpr CharType FromDigit(unsigned InDigit)
{ {
checkf(InDigit < 36, TEXT("Digit must be in the range [0, 35].")); checkf(InDigit < 36, TEXT("Digit must be in the range [0, 35]."));

1186
Redcraft.Utility/Source/Public/String/Conversion.h.inl
View File

File diff suppressed because it is too large Load Diff

6
Redcraft.Utility/Source/Public/String/String.h
View File

@ -1296,7 +1296,7 @@ public:
{ {
TStringView<ElementType> View = *this; TStringView<ElementType> View = *this;
bool Result = View.ToBool(); bool Result = View.ToBoolAndTrim();
size_t TrimNum = this->Num() - View.Num(); size_t TrimNum = this->Num() - View.Num();
@ -1311,7 +1311,7 @@ public:
{ {
TStringView<ElementType> View = *this; TStringView<ElementType> View = *this;
U Result = View.template ToInt<U>(Base); U Result = View.template ToIntAndTrim<U>(Base);
size_t TrimNum = this->Num() - View.Num(); size_t TrimNum = this->Num() - View.Num();
@ -1326,7 +1326,7 @@ public:
{ {
TStringView<ElementType> View = *this; TStringView<ElementType> View = *this;
U Result = View.template ToFloat<U>(bFixed, bScientific); U Result = View.template ToFloatAndTrim<U>(bFixed, bScientific);
size_t TrimNum = this->Num() - View.Num(); size_t TrimNum = this->Num() - View.Num();

12
Redcraft.Utility/Source/Public/String/StringView.h
View File

@ -116,7 +116,7 @@ public:
public: public:
/** Shrinks the view by moving its start forward. */ /** Shrinks the view by moving its start forward. */
FORCEINLINE constexpr TStringView RemovePrefix(size_t Count) FORCEINLINE constexpr TStringView& RemovePrefix(size_t Count)
{ {
checkf(Count <= this->Num(), TEXT("Illegal subview range. Please check Count.")); checkf(Count <= this->Num(), TEXT("Illegal subview range. Please check Count."));
@ -126,7 +126,7 @@ public:
} }
/** Shrinks the view by moving its end backward. */ /** Shrinks the view by moving its end backward. */
FORCEINLINE constexpr TStringView RemoveSuffix(size_t Count) FORCEINLINE constexpr TStringView& RemoveSuffix(size_t Count)
{ {
checkf(Count <= this->Num(), TEXT("Illegal subview range. Please check Count.")); checkf(Count <= this->Num(), TEXT("Illegal subview range. Please check Count."));
@ -136,7 +136,7 @@ public:
} }
/** Removes whitespace characters from the start of this string. */ /** Removes whitespace characters from the start of this string. */
FORCEINLINE constexpr TStringView TrimStart() FORCEINLINE constexpr TStringView& TrimStart()
{ {
auto Index = Find([](ElementType Char) { return !TChar<ElementType>::IsSpace(Char); }); auto Index = Find([](ElementType Char) { return !TChar<ElementType>::IsSpace(Char); });
@ -150,7 +150,7 @@ public:
} }
/** Removes whitespace characters from the end of this string. */ /** Removes whitespace characters from the end of this string. */
FORCEINLINE constexpr TStringView TrimEnd() FORCEINLINE constexpr TStringView& TrimEnd()
{ {
auto Index = RFind([](ElementType Char) { return !TChar<ElementType>::IsSpace(Char); }); auto Index = RFind([](ElementType Char) { return !TChar<ElementType>::IsSpace(Char); });
@ -164,7 +164,7 @@ public:
} }
/** Removes whitespace characters from the start and end of this string. */ /** Removes whitespace characters from the start and end of this string. */
FORCEINLINE constexpr TStringView TrimStartAndEnd() FORCEINLINE constexpr TStringView& TrimStartAndEnd()
{ {
TrimStart(); TrimStart();
TrimEnd(); TrimEnd();
@ -173,7 +173,7 @@ public:
} }
/** Removes characters after the first null-terminator. */ /** Removes characters after the first null-terminator. */
FORCEINLINE constexpr TStringView TrimToNullTerminator() FORCEINLINE constexpr TStringView& TrimToNullTerminator()
{ {
auto Index = Find(LITERAL(ElementType, '\0')); auto Index = Find(LITERAL(ElementType, '\0'));