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

refactor(*): remove TObserverPtr and use raw pointer instead

Browse Source
This commit is contained in:
Redstone1024
2024-11-01 19:51:44 +08:00
parent 9785326b18
commit ec2a240c23
13 changed files with 58 additions and 298 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -12,7 +12,6 @@
#include "TypeTraits/TypeTraits.h"
#include "Miscellaneous/Compare.h"
#include "Memory/MemoryOperator.h"
#include "Memory/ObserverPointer.h"
#include "Miscellaneous/AssertionMacros.h"
NAMESPACE_REDCRAFT_BEGIN
@ -129,9 +128,9 @@ public:
NODISCARD friend FORCEINLINE auto operator<=>(const TString& LHS, const TString& RHS) { return TStringView<ElementType>(LHS) <=> TStringView<ElementType>(RHS); }
/** Compares the contents of 'LHS' and 'RHS' lexicographically. */
NODISCARD friend FORCEINLINE auto operator<=>(const TString& LHS, ElementType RHS) { return TStringView<ElementType>(LHS) <=> RHS; }
NODISCARD friend FORCEINLINE auto operator<=>(const TString& LHS, ElementType RHS) { return TStringView<ElementType>(LHS) <=> RHS; }
NODISCARD friend FORCEINLINE auto operator<=>(const TString& LHS, const ElementType* RHS) { return TStringView<ElementType>(LHS) <=> RHS; }
NODISCARD friend FORCEINLINE auto operator<=>(ElementType LHS, const TString& RHS) { return LHS <=> TStringView<ElementType>(RHS); }
NODISCARD friend FORCEINLINE auto operator<=>( ElementType LHS, const TString& RHS) { return LHS <=> TStringView<ElementType>(RHS); }
NODISCARD friend FORCEINLINE auto operator<=>(const ElementType* LHS, const TString& RHS) { return LHS <=> TStringView<ElementType>(RHS); }
/** Inserts 'InValue' before 'Index' in the string. */
@ -663,8 +662,8 @@ public:
NAMESPACE_STD::mbstate_t State = NAMESPACE_STD::mbstate_t();
const char* BeginFrom = View.GetData().Get();
const char* EndFrom = BeginFrom + View.Num();
const char* BeginFrom = ToAddress(View.Begin());
const char* EndFrom = ToAddress(View.End());
wchar Buffer[FWChar::MaxCodeUnitLength];
@ -711,8 +710,8 @@ public:
NAMESPACE_STD::mbstate_t State = NAMESPACE_STD::mbstate_t();
const wchar* BeginFrom = View.GetData().Get();
const wchar* EndFrom = BeginFrom + View.Num();
const wchar* BeginFrom = ToAddress(View.Begin());
const wchar* EndFrom = ToAddress(View.End());
char Buffer[FChar::MaxCodeUnitLength];
@ -836,7 +835,7 @@ public:
// wchar -> unicodechar -> ... for Linux
else if constexpr (PLATFORM_LINUX && CSameAs<W, wchar>)
{
return Self(Self, TStringView(reinterpret_cast<const u32char*>(View.GetData().Get()), View.Num()));
return Self(Self, TStringView(reinterpret_cast<const u32char*>(View.GetData()), View.Num()));
}
// unicodechar u32char -> u8char
@ -930,7 +929,7 @@ public:
if constexpr (PLATFORM_LINUX && (CSameAs<T, char> || CSameAs<T, wchar>))
{
return Self(Self, TStringView(reinterpret_cast<const wchar*>(View.GetData().Get()), View.Num()));
return Self(Self, TStringView(reinterpret_cast<const wchar*>(View.GetData()), View.Num()));
}
else NativeData.Insert(NativeData.End(), View.Begin(), View.End());
@ -967,7 +966,7 @@ public:
}
/** @return The non-modifiable standard C character string version of the string. */
NODISCARD FORCEINLINE const ElementType* ToCString() const { return NativeData.GetData().Get(); }
NODISCARD FORCEINLINE const ElementType* ToCString() const { return GetData(); }
/** @return The target-encoded string from the T-encoded string. */
NODISCARD FORCEINLINE auto ToString() const { return EncodeTo<char>(); }
@ -990,8 +989,8 @@ public:
FORCEINLINE void Shrink() { NativeData.Shrink(); }
/** @return The pointer to the underlying character storage. */
NODISCARD FORCEINLINE TObserverPtr< ElementType[]> GetData() { return NativeData.GetData(); }
NODISCARD FORCEINLINE TObserverPtr<const ElementType[]> GetData() const { return NativeData.GetData(); }
NODISCARD FORCEINLINE ElementType* GetData() { return NativeData.GetData(); }
NODISCARD FORCEINLINE const ElementType* GetData() const { return NativeData.GetData(); }
/** @return The iterator to the first or end character. */
NODISCARD FORCEINLINE Iterator Begin() { return NativeData.Begin(); }
@ -1068,7 +1067,7 @@ using FU32String = TString<u32char>;
using FUnicodeString = TString<unicodechar>;
template <CCharType T> template <typename Allocator> constexpr TStringView<T>::TStringView(const TString<ElementType, Allocator>& InString)
: TStringView(InString.GetData().Get(), InString.Num()) { }
: TStringView(InString.GetData(), InString.Num()) { }
NAMESPACE_MODULE_END(Utility)
NAMESPACE_MODULE_END(Redcraft)

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

@ -11,7 +11,6 @@
#include "TypeTraits/TypeTraits.h"
#include "Miscellaneous/Compare.h"
#include "Memory/MemoryOperator.h"
#include "Memory/ObserverPointer.h"
#include "Miscellaneous/AssertionMacros.h"
#include "Miscellaneous/ConstantIterator.h"
@ -155,7 +154,7 @@ public:
Count = Num() - Offset;
}
Memory::CopyAssign(Dest, GetData().Get() + Offset, Count);
Memory::CopyAssign(Dest, GetData() + Offset, Count);
return Count;
}
@ -405,7 +404,7 @@ public:
}
/** @return The pointer to the underlying element storage. */
NODISCARD FORCEINLINE constexpr TObserverPtr<const ElementType[]> GetData() const { return NativeData.GetData(); }
NODISCARD FORCEINLINE constexpr const ElementType* GetData() const { return NativeData.GetData(); }
/** @return The iterator to the first or end element. */
NODISCARD FORCEINLINE constexpr Iterator Begin() const { return NativeData.Begin(); }