Skip to content

[registrar] Cope with nameless parameters. #91

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 1 commit into from
May 26, 2016
Merged

[registrar] Cope with nameless parameters. #91

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 11 additions & 3 deletions tools/common/StaticRegistrar.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3397,6 +3397,14 @@ public void GeneratePInvokeWrappersEnd ()
FlushTrace ();
}

static string GetParamName (MethodDefinition method, int i)
{
var p = method.Parameters [i];
if (p.Name != null)
return p.Name;
return "__p__" + i.ToString ();
}

public void GeneratePInvokeWrapper (PInvokeWrapperGenerator state, MethodDefinition method)
{
var signatures = state.signatures;
Expand Down Expand Up @@ -3456,7 +3464,7 @@ public void GeneratePInvokeWrapper (PInvokeWrapperGenerator state, MethodDefinit
sb.Write (", ");
sb.Write (ToObjCParameterType (method.Parameters[i].ParameterType, descriptiveMethodName, exceptions, method));
sb.Write (" ");
sb.Write (method.Parameters[i].Name);
sb.Write (GetParamName (method, i));
}
sb.WriteLine (");");

Expand All @@ -3468,7 +3476,7 @@ public void GeneratePInvokeWrapper (PInvokeWrapperGenerator state, MethodDefinit
sb.Write (", ");
sb.Write (ToObjCParameterType (method.Parameters[i].ParameterType, descriptiveMethodName, exceptions, method));
sb.Write (" ");
sb.Write (method.Parameters [i].Name);
sb.Write (GetParamName (method, i));
}
sb.WriteLine (")");
sb.WriteLine ("{");
Expand All @@ -3479,7 +3487,7 @@ public void GeneratePInvokeWrapper (PInvokeWrapperGenerator state, MethodDefinit
for (int i = first_parameter; i < method.Parameters.Count; i++) {
if (i > first_parameter)
sb.Write (", ");
sb.Write (method.Parameters [i].Name);
sb.Write (GetParamName (method, i));
}
sb.WriteLine (");");
sb.WriteLine ("} @catch (NSException *exc) {");
Expand Down