Skip to content

Commit a32e0e1

Browse files
committed
[jcw-gen] Use + for ntested types, not /
TODO: full explanation. #1302 and dotnet/android#9750 has turned into a bit of a boondoggle. Maybe the better approach is to just update `jcw-gen` to use `+` instead of `/` for nested types, instead of *both* `jcw-gen` *and* `generator`, because the `generator` changes just require changes *everywhere*. Will this smaller fix work?
1 parent dd3c1d0 commit a32e0e1

File tree

2 files changed

+2
-2
lines changed
  • src

2 files changed

+2
-2
lines changed

src/Java.Interop.Tools.JavaCallableWrappers/Java.Interop.Tools.JavaCallableWrappers.Adapters/CecilImporter.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,7 @@ static CallableWrapperMethod CreateMethod (MethodDefinition methodDefinition, Ca
269269
static CallableWrapperMethod CreateMethod (string name, CallableWrapperType declaringType, string? signature, string? connector, string? managedParameters, string? outerType, string? superCall)
270270
{
271271
signature = signature ?? throw new ArgumentNullException ("`connector` cannot be null.", nameof (connector));
272-
var method_name = "n_" + name + ":" + signature + ":" + connector;
272+
var method_name = "n_" + name + ":" + signature + ":" + connector?.Replace ('/', '+');
273273

274274
var method = new CallableWrapperMethod (declaringType, name, method_name, signature);
275275

src/Java.Interop.Tools.TypeNameMappings/Java.Interop.Tools.TypeNameMappings/JavaNativeTypeManager.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ static string ToCliTypePart (string part)
150150
for (int i = 0; i < parts.Length; ++i) {
151151
parts [i] = ToPascalCase (parts [i], 1);
152152
}
153-
return string.Join ("/", parts);
153+
return string.Join ("+", parts);
154154
}
155155

156156
static string ToPascalCase (string value, int minLength)

0 commit comments

Comments
 (0)