Skip to content

[wasm] clean up js argument parsing #98537

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 9 commits into from
Closed

[wasm] clean up js argument parsing #98537

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
ec25b71
Reduce the allocations in parsing the js
lewing Feb 15, 2024
bd0c5e4
Update JSHostImplementation.cs
lewing Feb 16, 2024
ac53783
Update JSHostImplementation.cs
lewing Feb 16, 2024
8a7fbaa
Update JSHostImplementation.cs
lewing Feb 16, 2024
b4c5020
Merge branch 'main' into fqn-alloc
lewing Feb 21, 2024
b1d941e
Update JSHostImplementation.cs
lewing Feb 21, 2024
4847ee6
Update JSHostImplementation.cs
lewing Feb 21, 2024
0e88264
Merge branch 'main' into fqn-alloc
lewing Feb 21, 2024
a1f5b3e
Merge branch 'main' into fqn-alloc
lewing Feb 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 28 additions & 18 deletions ...Services.JavaScript/src/System/Runtime/InteropServices/JavaScript/JSHostImplementation.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -319,26 +319,36 @@ public static RuntimeMethodHandle GetMethodHandleFromIntPtr(IntPtr ptr)

public static (string assemblyName, string nameSpace, string shortClassName, string methodName) ParseFQN(string fqn)
{
var assembly = fqn.Substring(fqn.IndexOf('[') + 1, fqn.IndexOf(']') - 1).Trim();
fqn = fqn.Substring(fqn.IndexOf(']') + 1).Trim();
var methodName = fqn.Substring(fqn.IndexOf(':') + 1);
var className = fqn.Substring(0, fqn.IndexOf(':')).Trim();

var nameSpace = "";
var shortClassName = className;
var idx = fqn.LastIndexOf(".");
if (idx != -1)
{
nameSpace = fqn.Substring(0, idx);
shortClassName = className.Substring(idx + 1);
}
ReadOnlySpan<char> fqnSpan = fqn.AsSpan();
ReadOnlySpan<char> assemblyStart = fqnSpan.Slice(fqnSpan.IndexOf('[') + 1);
int assemblyEnd = assemblyStart.IndexOf(']');

if (assemblyEnd == -1 || assemblyStart.Length == fqnSpan.Length)
throw new InvalidOperationException($"No assembly name specified {fqn}");

string assembly = assemblyStart.Slice(assemblyEnd -1).Trim().ToString();
ReadOnlySpan<char> classAndMethod = assemblyStart.Slice(assemblyEnd + 1).Trim();

int classNameEnd = classAndMethod.IndexOf(':');
if (classNameEnd == -1)
throw new InvalidOperationException($"No class name specified {fqn}");

ReadOnlySpan<char> classSpan = classAndMethod.Slice(0, classNameEnd).Trim();
string methodName = classAndMethod.Slice(classNameEnd + 1).Trim().ToString();

if (string.IsNullOrEmpty(assembly))
throw new InvalidOperationException("No assembly name specified " + fqn);
if (string.IsNullOrEmpty(className))
throw new InvalidOperationException("No class name specified " + fqn);
if (string.IsNullOrEmpty(methodName))
throw new InvalidOperationException("No method name specified " + fqn);
throw new InvalidOperationException($"No method name specified {fqn}");

int namespaceEnd = classSpan.LastIndexOf('.');
string shortClassName;
string nameSpace = string.Empty;
if (namespaceEnd != -1)
{
shortClassName = classSpan.Slice(namespaceEnd + 1).ToString();
nameSpace = classSpan.Slice(0, namespaceEnd).ToString();
} else {
shortClassName = classSpan.ToString();
}
return (assembly, nameSpace, shortClassName, methodName);
}
}
Expand Down