Skip to content

[jcw-gen] Fix InvalidCastException from Cecil upgrade #79

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
Sep 15, 2016
Merged

[jcw-gen] Fix InvalidCastException from Cecil upgrade #79

Show file tree
Hide file tree
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
6 changes: 3 additions & 3 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 @@ -130,7 +130,7 @@ void AddNestedTypes (TypeDefinition type)
}
}

foreach (MethodDefinition imethod in type.Interfaces.Cast<TypeReference> ()
foreach (MethodDefinition imethod in type.Interfaces.Select (ifaceInfo => ifaceInfo.InterfaceType)
.Select (r => {
var d = r.Resolve ();
if (d == null)
Expand All @@ -141,7 +141,7 @@ void AddNestedTypes (TypeDefinition type)
return d;
})
.Where (d => GetRegisterAttributes (d).Any ())
.SelectMany (d => d.Methods.Cast<MethodDefinition>())) {
.SelectMany (d => d.Methods)) {
AddMethod (imethod, imethod);
}

Expand Down Expand Up @@ -538,7 +538,7 @@ void GenerateHeader (TextWriter sw)
sw.WriteLine ("\textends " + extendsType);
sw.WriteLine ("\timplements");
sw.Write ("\t\tmono.android.IGCUserPeer");
IEnumerable<TypeDefinition> ifaces = type.Interfaces.Cast<TypeReference>()
IEnumerable<TypeDefinition> ifaces = type.Interfaces.Select (ifaceInfo => ifaceInfo.InterfaceType)
.Select (r => r.Resolve ())
.Where (d => GetRegisterAttributes (d).Any ());
if (ifaces.Any ()) {
Expand Down
4 changes: 2 additions & 2 deletions src/Java.Interop.Tools.TypeNameMappings/Java.Interop.Tools.TypeNameMappings/JniType.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -612,14 +612,14 @@ internal static bool IsNonStaticInnerClass (TypeDefinition type)
return false;

return GetBaseConstructors (type)
.Any (ctor => ctor.Parameters.Cast<ParameterDefinition> ().Any (p => p.Name == "__self"));
.Any (ctor => ctor.Parameters.Any (p => p.Name == "__self"));
}

static IEnumerable<MethodDefinition> GetBaseConstructors (TypeDefinition type)
{
var baseType = type.GetBaseTypes ().FirstOrDefault (t => t.GetCustomAttributes (typeof (RegisterAttribute)).Any ());
if (baseType != null)
return baseType.Methods.Where (m => m.IsConstructor && !m.IsStatic).Cast<MethodDefinition> ();
return baseType.Methods.Where (m => m.IsConstructor && !m.IsStatic);
return Enumerable.Empty<MethodDefinition> ();
}
#endif // HAVE_CECIL
Expand Down