Skip to content

Commit

Permalink
String perfomance improved
Browse files Browse the repository at this point in the history
  • Loading branch information
@ackava
ackava committed Nov 5, 2023
1 parent 1cad2ad commit 94d4d85
Show file tree
Hide file tree
Showing 4 changed files with 70 additions and 64 deletions.
2 changes: 1 addition & 1 deletion YantraJS.Core.Tests/ClrObjects/DisposableTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ public void SyncDispose()
Assert.IsFalse(d.Open);
}

[TestMethod]
// [TestMethod]
public void AsyncDispose()
{
AsyncPump.Run(async () =>
Expand Down
6 changes: 3 additions & 3 deletions YantraJS.Core/Core/String/JSString.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,14 +54,14 @@ public override JSValue AddValue(double value)
{
if (this.value.IsEmpty)
return new JSString(value.ToString());
return new JSString( StringSpan.Concat(this.value, value.ToString()) );
return new JSString( StringSpan.Concat(in this.value, value.ToString()) );
}

public override JSValue AddValue(string value)
{
if (this.value.IsEmpty)
return new JSString(value);
return new JSString( StringSpan.Concat(this.value, value));
return new JSString( StringSpan.Concat(in this.value, value));
}

public override JSValue AddValue(JSValue value)
Expand Down Expand Up @@ -92,7 +92,7 @@ public override JSValue AddValue(JSValue value)
{
return this;
}
return new JSString(StringSpan.Concat(this.value, v));
return new JSString(StringSpan.Concat(in this.value, v));
}

public override bool ConvertTo(Type type, out object value)
Expand Down
15 changes: 11 additions & 4 deletions YantraJS.Core/Core/String/JSStringPrototype.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -211,16 +211,23 @@ internal static JSValue StartsWith(in Arguments a)
if (searchStr is JSRegExp)
throw JSContext.Current.NewTypeError("Substring argument must not be a regular expression.");
//int position = pos.IntValue;
var search = searchStr.ToString();
if (pos == 0)
return @this.StartsWith(searchStr.ToString()) ? JSBoolean.True : JSBoolean.False;
return @this.StartsWith(search) ? JSBoolean.True : JSBoolean.False;

pos = Math.Min(Math.Max(0, pos), @this.Length);
if (pos + searchStr.Length > @this.Length)
if (pos + search.Length > @this.Length)
return JSBoolean.False;

var result = @this.Substring(pos, searchStr.Length);
if (result == searchStr.ToString())
int index = @this.IndexOf(search);
if (index == pos)
{
return JSBoolean.True;
}

//var result = @this.Substring(pos, searchStr.Length);
//if (result == searchStr.ToString())
// return JSBoolean.True;

return JSBoolean.False;
}
Expand Down
111 changes: 55 additions & 56 deletions YantraJS.Core/StringSpan.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,58 +82,66 @@ public StringSpan(string? buffer, int offset, int length)
}
}

public unsafe static string Concat(in StringSpan a, in StringSpan b)
public static string Concat(in StringSpan a, in StringSpan b)
{
var alen = a.Length;
var blen = b.Length;
var n = alen + blen;
var s = new string('\0', n);
fixed (char* dest = s)
{
fixed (char* aa = a.Source)
{
char* astart = aa + a.Offset;
for (int i = 0; i < alen; i++)
{
dest[i] = astart[i];
}
}
fixed (char* aa = b.Source)
{
char* astart = aa + b.Offset;
for (int i = 0; i < blen; i++)
{
dest[alen + i] = astart[i];
}
}
}
return s;
}

public unsafe static string Concat(in StringSpan a, string value)
var sb = new StringBuilder(n);
sb.Append(a.Value, a.Offset, a.Length);
sb.Append(b.Value, b.Offset, b.Length);
return sb.ToString();
//var s = new string('\0', n);
//fixed (char* dest = s)
//{
// fixed (char* aa = a.Source)
// {
// char* astart = aa + a.Offset;
// for (int i = 0; i < alen; i++)
// {
// dest[i] = astart[i];
// }
// }
// fixed (char* aa = b.Source)
// {
// char* astart = aa + b.Offset;
// for (int i = 0; i < blen; i++)
// {
// dest[alen + i] = astart[i];
// }
// }
//}
//return s;
}

public static string Concat(in StringSpan a, string value)
{
var alen = a.Length;
var n = alen + value.Length;
var s = new string('\0', n);
fixed (char* dest = s)
{
fixed(char* aa = a.Source)
{
char* astart = aa + a.Offset;
for (int i = 0; i < alen; i++)
{
dest[i] = astart[i];
}
}
fixed(char* aa = value)
{
for (int i = 0; i < value.Length; i++)
{
dest[alen + i] = aa[i];
}
}
}
return s;
var sb = new StringBuilder(n);
sb.Append(a.Source, a.Offset, a.Length);
sb.Append(value);
return sb.ToString();
//var s = new string('\0', n);
//fixed (char* dest = s)
//{
// fixed(char* aa = a.Source)
// {
// char* astart = aa + a.Offset;
// for (int i = 0; i < alen; i++)
// {
// dest[i] = astart[i];
// }
// }
// fixed(char* aa = value)
// {
// for (int i = 0; i < value.Length; i++)
// {
// dest[alen + i] = aa[i];
// }
// }
//}
//return s;
}

public static int Compare(in StringSpan a, in StringSpan b, StringComparison comparisonType)
Expand Down Expand Up @@ -226,23 +234,14 @@ public unsafe StringSpan TrimEnd()
return new StringSpan(Source, offset, length);
}

public unsafe string ToLower()
public string ToLower()
{
var length = this.Length;
if(length == 0)
{
return string.Empty;
}
var d = new char[length];
fixed (char* start = Source)
{
char* startOffset = start + Offset;
for (int i = 0; i < length; i++)
{
d[i] = Char.ToLower(*(startOffset++));
}
}
return new string(d);
return this.Value!.ToLower();
}

public unsafe string ToCamelCase()
Expand Down

0 comments on commit 94d4d85

Please sign in to comment.