Skip to content

[api-xml-adjuster] reduce extraneous override marking. #85

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
jonpryor merged 1 commit into from
Sep 21, 2016
Merged

[api-xml-adjuster] reduce extraneous override marking. #85

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
32 changes: 13 additions & 19 deletions src/Xamarin.Android.Tools.ApiXmlAdjuster/JavaApiOverrideMarkerExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,36 +6,30 @@ namespace Xamarin.Android.Tools.ApiXmlAdjuster
{
public static class JavaApiOverrideMarkerExtensions
{

public static void MarkOverrides (this JavaApi api)
{
api.MarkOverrides (new HashSet<JavaClass> ());
}

public static void MarkOverrides (this JavaApi api, HashSet<JavaClass> doneList)
{
foreach (var kls in api.Packages.SelectMany (p => p.Types).OfType<JavaClass> ())
kls.MarkOverrides ();
kls.MarkOverrides (doneList);
}

static void MarkOverrides (this JavaClass cls)
static void MarkOverrides (this JavaClass cls, HashSet<JavaClass> doneList)
{
if (doneList.Contains (cls))
return;
doneList.Add (cls);

var baseClass = cls.ResolvedExtends == null ? null :cls.ResolvedExtends.ReferencedType as JavaClass;
if (baseClass != null)
baseClass.MarkOverrides ();
baseClass.MarkOverrides (doneList);

foreach (var method in cls.Members.OfType<JavaMethod> ())
cls.MarkBaseMethod (method);
/*
foreach (var m in cls.Members.OfType<JavaMethod> ().Where (_ => _.BaseMethod != null)) {
var b = m.BaseMethod.Method;
if (m.ExtendedJniSignature != b.ExtendedJniSignature)
Console.WriteLine ("Method {0}.{1}#{2}({3}) | {8}\n overrides {4}.{5}#{6}({7}) | {9}",
m.Parent.Parent.Name, m.Parent.Name, m.Name, string.Join (", ", m.Parameters.Select (p => p.Type)),
b.Parent.Parent.Name, b.Parent.Name, b.Name, string.Join (", ", b.Parameters.Select (p => p.Type)),
m.ExtendedJniSignature, b.ExtendedJniSignature);
}
foreach (var m in cls.Members.OfType<JavaMethod> ())
foreach (var para in m.Parameters.Where (p => p.InstantiatedGenericArgumentName != null))
Console.WriteLine ("Method {0}.{1}#{2}({3}) has generics-instantiated parameter {4} ({5} -> {6})",
m.Parent.Parent.Name, m.Parent.Name, m.Name, string.Join (", ", m.Parameters.Select (p => p.Type)),
para.Name, para.InstantiatedGenericArgumentName, para.Type);
*/
}

static void MarkBaseMethod (this JavaClass cls, JavaMethod method)
Expand Down