Extern/Beef
1
0
Fork 0
mirror of https://github.com/beefytech/Beef.git synced 2025-06-11 12:54:15 +02:00
Code Activity

Renamed mPtr to mPtrOrBuffer

Browse source
This commit is contained in:
Brian Fiete 2022-06-11 05:58:24 -07:00
parent 8163d5b647
commit 86fdca03db
1 changed files with 26 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

52
BeefLibs/corlib/src/String.bf
View file

@ -48,7 +48,7 @@ namespace System
int_strsize mLength; int_strsize mLength;
uint_strsize mAllocSizeAndFlags; uint_strsize mAllocSizeAndFlags;
char8* mPtr = null; char8* mPtrOrBuffer = null;
extern const String* sStringLiterals; extern const String* sStringLiterals;
extern const String* sIdStringLiterals; extern const String* sIdStringLiterals;
@ -326,7 +326,7 @@ namespace System
public ~this() public ~this()
{ {
if (IsDynAlloc) if (IsDynAlloc)
delete:this mPtr; delete:this mPtrOrBuffer;
} }
void FakeMethod () void FakeMethod ()
@ -390,7 +390,7 @@ namespace System
//[Optimize] //[Optimize]
get get
{ {
return ((mAllocSizeAndFlags & cStrPtrFlag) != 0) ? mPtr : (char8*)&mPtr; return ((mAllocSizeAndFlags & cStrPtrFlag) != 0) ? mPtrOrBuffer : (char8*)&mPtrOrBuffer;
} }
} }
@ -660,10 +660,10 @@ namespace System
{ {
if (str.IsDynAlloc) if (str.IsDynAlloc)
{ {
delete str.mPtr; delete str.mPtrOrBuffer;
} }
str.mPtr = mPtr; str.mPtrOrBuffer = mPtrOrBuffer;
str.mAllocSizeAndFlags = mAllocSizeAndFlags; str.mAllocSizeAndFlags = mAllocSizeAndFlags;
str.mLength = mLength; str.mLength = mLength;
@ -673,7 +673,7 @@ namespace System
} }
else else
{ {
mPtr = null; mPtrOrBuffer = null;
mAllocSizeAndFlags = (int_strsize)sizeof(char8*); mAllocSizeAndFlags = (int_strsize)sizeof(char8*);
mLength = 0; mLength = 0;
} }
@ -689,8 +689,8 @@ namespace System
public void Reference(String str) public void Reference(String str)
{ {
if (IsDynAlloc) if (IsDynAlloc)
delete:this mPtr; delete:this mPtrOrBuffer;
mPtr = str.Ptr; mPtrOrBuffer = str.Ptr;
mLength = str.mLength; mLength = str.mLength;
mAllocSizeAndFlags = cStrPtrFlag; mAllocSizeAndFlags = cStrPtrFlag;
} }
@ -698,8 +698,8 @@ namespace System
public void Reference(char8* ptr, int length, int allocSize) public void Reference(char8* ptr, int length, int allocSize)
{ {
if (IsDynAlloc) if (IsDynAlloc)
delete:this mPtr; delete:this mPtrOrBuffer;
mPtr = ptr; mPtrOrBuffer = ptr;
mLength = (int_strsize)length; mLength = (int_strsize)length;
mAllocSizeAndFlags = cStrPtrFlag; mAllocSizeAndFlags = cStrPtrFlag;
} }
@ -707,8 +707,8 @@ namespace System
public void Reference(char8* ptr, int length) public void Reference(char8* ptr, int length)
{ {
if (IsDynAlloc) if (IsDynAlloc)
delete:this mPtr; delete:this mPtrOrBuffer;
mPtr = ptr; mPtrOrBuffer = ptr;
mLength = (int_strsize)length; mLength = (int_strsize)length;
mAllocSizeAndFlags = cStrPtrFlag; mAllocSizeAndFlags = cStrPtrFlag;
} }
@ -721,8 +721,8 @@ namespace System
public void Reference(char8* ptr) public void Reference(char8* ptr)
{ {
if (IsDynAlloc) if (IsDynAlloc)
delete:this mPtr; delete:this mPtrOrBuffer;
mPtr = ptr; mPtrOrBuffer = ptr;
mLength = StrLen(ptr); mLength = StrLen(ptr);
mAllocSizeAndFlags = cStrPtrFlag; mAllocSizeAndFlags = cStrPtrFlag;
} }
@ -734,7 +734,7 @@ namespace System
Debug.Assert(!IsDynAlloc); Debug.Assert(!IsDynAlloc);
Debug.Assert(AllocSize == 0); // Assert is reference Debug.Assert(AllocSize == 0); // Assert is reference
Debug.Assert((uint)mLength >= (uint)adjBytes); Debug.Assert((uint)mLength >= (uint)adjBytes);
mPtr += adjBytes; mPtrOrBuffer += adjBytes;
mLength -= (int_strsize)adjBytes; mLength -= (int_strsize)adjBytes;
} }
@ -763,8 +763,8 @@ namespace System
Internal.MemSet(newPtr + mLength, 0, newSize - mLength); Internal.MemSet(newPtr + mLength, 0, newSize - mLength);
#endif #endif
if (IsDynAlloc) if (IsDynAlloc)
delete:this mPtr; delete:this mPtrOrBuffer;
mPtr = newPtr; mPtrOrBuffer = newPtr;
mAllocSizeAndFlags = (uint_strsize)newSize | cDynAllocFlag | cStrPtrFlag; mAllocSizeAndFlags = (uint_strsize)newSize | cDynAllocFlag | cStrPtrFlag;
} }
@ -780,8 +780,8 @@ namespace System
Debug.Assert((uint)newSize <= cSizeFlags); Debug.Assert((uint)newSize <= cSizeFlags);
Internal.MemCpy(newPtr, Ptr, mLength); Internal.MemCpy(newPtr, Ptr, mLength);
if (IsDynAlloc) if (IsDynAlloc)
delete:this mPtr; delete:this mPtrOrBuffer;
mPtr = newPtr; mPtrOrBuffer = newPtr;
mAllocSizeAndFlags = (uint_strsize)newSize | cDynAllocFlag | cStrPtrFlag; mAllocSizeAndFlags = (uint_strsize)newSize | cDynAllocFlag | cStrPtrFlag;
} }
@ -1603,8 +1603,8 @@ namespace System
newPtr[outIdx] = '\0'; newPtr[outIdx] = '\0';
if (IsDynAlloc) if (IsDynAlloc)
delete mPtr; delete mPtrOrBuffer;
mPtr = newPtr; mPtrOrBuffer = newPtr;
mAllocSizeAndFlags = (uint_strsize)newSize | cDynAllocFlag | cStrPtrFlag; mAllocSizeAndFlags = (uint_strsize)newSize | cDynAllocFlag | cStrPtrFlag;
} }
} }
@ -1633,8 +1633,8 @@ namespace System
int newLen = UTF8Map(Ptr, mLength, newStr, allocSize, (int32)unicodeNormalizationOptions); int newLen = UTF8Map(Ptr, mLength, newStr, allocSize, (int32)unicodeNormalizationOptions);
if (IsDynAlloc) if (IsDynAlloc)
delete:this mPtr; delete:this mPtrOrBuffer;
mPtr = newStr; mPtrOrBuffer = newStr;
mLength = (int_strsize)newLen; mLength = (int_strsize)newLen;
mAllocSizeAndFlags = (uint32)(allocSize) | cDynAllocFlag | cStrPtrFlag; mAllocSizeAndFlags = (uint32)(allocSize) | cDynAllocFlag | cStrPtrFlag;
return .Ok; return .Ok;
@ -1656,8 +1656,8 @@ namespace System
int newLen = UTF8Map(Ptr, mLength, newStr, allocSize, (int32)unicodeNormalizationOptions); int newLen = UTF8Map(Ptr, mLength, newStr, allocSize, (int32)unicodeNormalizationOptions);
if (destStr.IsDynAlloc) if (destStr.IsDynAlloc)
delete:destStr destStr.mPtr; delete:destStr destStr.mPtrOrBuffer;
destStr.mPtr = newStr; destStr.mPtrOrBuffer = newStr;
destStr.mLength = (int_strsize)newLen; destStr.mLength = (int_strsize)newLen;
destStr.mAllocSizeAndFlags = (uint_strsize)(newLen + 1) | cDynAllocFlag | cStrPtrFlag; destStr.mAllocSizeAndFlags = (uint_strsize)(newLen + 1) | cDynAllocFlag | cStrPtrFlag;
return .Ok; return .Ok;
@ -2059,7 +2059,7 @@ namespace System
{ {
if (mLength != str.[Friend]mLength) if (mLength != str.[Friend]mLength)
return false; return false;
return EqualsHelper(str.Ptr, mPtr, mLength); return EqualsHelper(str.Ptr, Ptr, mLength);
} }
public bool Equals(StringView str, StringComparison comparisonType = StringComparison.Ordinal) public bool Equals(StringView str, StringComparison comparisonType = StringComparison.Ordinal)