Extern/Beef
1
0
Fork 0
mirror of https://github.com/beefytech/Beef.git synced 2025-06-08 19:48:20 +02:00
Code Activity

String fixes

Browse source
This commit is contained in:
Brian Fiete 2024-12-31 14:32:26 -08:00
parent 73d0499c5d
commit 5d46641e39
1 changed files with 41 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -293,6 +293,14 @@ namespace System
mLength = (int_strsize)count; mLength = (int_strsize)count;
} }
static int StrLengths(Span<StringView> strs)
{
int count = 0;
for (var str in strs)
count += str.Length;
return count;
}
static int StrLengths(Span<String> strs) static int StrLengths(Span<String> strs)
{ {
int count = 0; int count = 0;
@ -302,7 +310,7 @@ namespace System
} }
[AllowAppend] [AllowAppend]
public this(params Span<String> strs) public this(params Span<StringView> strs)
{ {
int count = StrLengths(strs); int count = StrLengths(strs);
int bufferSize = (count == 0) ? 0 : (count - 1) & ~(sizeof(char8*) - 1); int bufferSize = (count == 0) ? 0 : (count - 1) & ~(sizeof(char8*) - 1);
@ -313,7 +321,27 @@ namespace System
int curIdx = 0; int curIdx = 0;
for (var str in strs) for (var str in strs)
{ {
Internal.MemCpy(ptr + curIdx, str.Ptr, str.mLength); Internal.MemCpy(ptr + curIdx, str.Ptr, str.Length);
curIdx += str.Length;
}
mLength = (int_strsize)count;
mAllocSizeAndFlags = (uint_strsize)bufferSize + (int_strsize)sizeof(char8*);
}
[AllowAppend]
public this(Span<String> strs)
{
int count = StrLengths(strs);
int bufferSize = (count == 0) ? 0 : (count - 1) & ~(sizeof(char8*) - 1);
#unwarn
char8* addlPtr = append char8[bufferSize]*(?);
Init(bufferSize);
let ptr = Ptr;
int curIdx = 0;
for (var str in strs)
{
Internal.MemCpy(ptr + curIdx, str.Ptr, str.Length);
curIdx += str.Length; curIdx += str.Length;
} }
@ -2514,6 +2542,16 @@ namespace System
} }
} }
public void Join(StringView separator, Span<String> values)
{
for (int i = 0; i < values.Length; i++)
{
if (i > 0)
Append(separator);
values[i].ToString(this);
}
}
public void Join(StringView separator, params Span<StringView> values) public void Join(StringView separator, params Span<StringView> values)
{ {
for (int i = 0; i < values.Length; i++) for (int i = 0; i < values.Length; i++)
@ -2524,6 +2562,7 @@ namespace System
} }
} }
public StringSplitEnumerator Split(char8 c) public StringSplitEnumerator Split(char8 c)
{ {
return StringSplitEnumerator(Ptr, Length, c, Int32.MaxValue, StringSplitOptions.None); return StringSplitEnumerator(Ptr, Length, c, Int32.MaxValue, StringSplitOptions.None);