Skip to content

Fix marshal method descriptors #987

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

Merged
merged 4 commits into from
May 19, 2022
Merged

Fix marshal method descriptors #987

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e8922dd
Fix marshal method descriptors
grendello May 17, 2022
0f9274e
Apply requested changes
grendello May 19, 2022
aa578fe
Behave
grendello May 19, 2022
75d9efe
Allow null values
jonpryor May 19, 2022
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
6 changes: 4 additions & 2 deletions src/Java.Interop.Tools.Cecil/Java.Interop.Tools.Cecil/TypeDefinitionRocks.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ public static string GetPartialAssemblyQualifiedName (this TypeReference type, I
return string.Format ("{0}, {1}",
// Cecil likes to use '/' as the nested type separator, while
// Reflection uses '+' as the nested type separator. Use Reflection.
type.FullName.Replace ('/', '+'),
CecilTypeNameToReflectionTypeName (type.FullName),
type.GetPartialAssemblyName (resolver));
}

Expand All @@ -160,7 +160,7 @@ public static string GetAssemblyQualifiedName (this TypeReference type, IMetadat
return string.Format ("{0}, {1}",
// Cecil likes to use '/' as the nested type separator, while
// Reflection uses '+' as the nested type separator. Use Reflection.
type.FullName.Replace ('/', '+'),
CecilTypeNameToReflectionTypeName (type.FullName),
(def ?? type).Module.Assembly.Name.FullName);
}

Expand Down Expand Up @@ -188,5 +188,7 @@ public static string GetAssemblyQualifiedName (this TypeReference type, IMetadat

return null;
}

public static string? CecilTypeNameToReflectionTypeName (string? typeName) => typeName?.Replace ('/', '+');
}
}
34 changes: 18 additions & 16 deletions ...aCallableWrappers/Java.Interop.Tools.JavaCallableWrappers/JavaCallableWrapperGenerator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,11 @@ public class OverriddenMethodDescriptor
public string JniSignature { get; }
public string Connector { get; }
public string ManagedTypeName { get; }
public string OriginalDescString { get; }

public OverriddenMethodDescriptor (string javaPackageName, string methodDescription)
public OverriddenMethodDescriptor (string javaPackageName, string methodDescription, string fallbackManagedTypeName)
{
OriginalDescString = methodDescription;
JavaPackageName = javaPackageName;
string[] parts = methodDescription.Split (methodDescSplitChars, 4);

Expand All @@ -49,9 +51,13 @@ public OverriddenMethodDescriptor (string javaPackageName, string methodDescript
if (parts.Length > 2) {
Connector = parts[2];
if (parts.Length > 3) {
ManagedTypeName = parts[3];
ManagedTypeName = TypeDefinitionRocks.CecilTypeNameToReflectionTypeName (parts[3]);
}
}

if (String.IsNullOrEmpty (ManagedTypeName)) {
ManagedTypeName = fallbackManagedTypeName;
}
}
}

Expand Down Expand Up @@ -529,7 +535,6 @@ string GetManagedParameters (MethodDefinition ctor, string outerType)

public void Generate (TextWriter writer)
{
overriddenMethodDescriptors = new List<OverriddenMethodDescriptor> ();
if (!string.IsNullOrEmpty (package)) {
writer.WriteLine ("package " + package + ";");
writer.WriteLine ();
Expand Down Expand Up @@ -563,17 +568,6 @@ public void Generate (TextWriter writer)
}

GenerateFooter (writer);

string javaTypeName = $"{package}.{name}";
AddOverridenMethods (methods);
AddOverridenMethods (ctors);

void AddOverridenMethods (List<Signature> list)
{
foreach (Signature sig in list) {
overriddenMethodDescriptors.Add (new OverriddenMethodDescriptor (javaTypeName, sig.Method));
}
}
}

public void Generate (string outputPath)
Expand Down Expand Up @@ -716,9 +710,17 @@ void GenerateBody (TextWriter sw)

void GenerateRegisterType (TextWriter sw, JavaCallableWrapperGenerator self, string field)
{
if (overriddenMethodDescriptors == null) {
overriddenMethodDescriptors = new List<OverriddenMethodDescriptor> ();
}

sw.WriteLine ("\t\t{0} = ", field);
foreach (Signature method in self.methods)
string managedTypeName = self.type.GetPartialAssemblyQualifiedName (cache);
string javaTypeName = $"{package}.{name}";
foreach (Signature method in self.methods) {
sw.WriteLine ("\t\t\t\"{0}\\n\" +", method.Method);
overriddenMethodDescriptors.Add (new OverriddenMethodDescriptor (javaTypeName, method.Method, managedTypeName));
}
sw.WriteLine ("\t\t\t\"\";");
if (CannotRegisterInStaticConstructor (self.type))
return;
Expand All @@ -732,7 +734,7 @@ void GenerateRegisterType (TextWriter sw, JavaCallableWrapperGenerator self, str
break;
}
sw.Write ("\t\t");
sw.WriteLine (format, self.type.GetPartialAssemblyQualifiedName (cache), self.name, field);
sw.WriteLine (format, managedTypeName, self.name, field);
}

void GenerateFooter (TextWriter sw)
Expand Down