projects
/
mono.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[nunitlite] Port babysitter work from nunit24
[mono.git]
/
mcs
/
mcs
/
pending.cs
diff --git
a/mcs/mcs/pending.cs
b/mcs/mcs/pending.cs
index ab8650cd09d139e7ed74e244986557751033914f..661142822f802a9f55ed7560eb510ca5c30c1f50 100644
(file)
--- a/
mcs/mcs/pending.cs
+++ b/
mcs/mcs/pending.cs
@@
-108,7
+108,7
@@
namespace Mono.CSharp {
throw new NotImplementedException ();
}
throw new NotImplementedException ();
}
- public ExtensionMethodCandidates LookupExtensionMethod (
TypeSpec extensionType,
string name, int arity)
+ public ExtensionMethodCandidates LookupExtensionMethod (string name, int arity)
{
throw new NotImplementedException ();
}
{
throw new NotImplementedException ();
}
@@
-534,10
+534,14
@@
namespace Mono.CSharp {
// about mismatch at return type when the check bellow rejects them
//
var parameters = mi.Parameters;
// about mismatch at return type when the check bellow rejects them
//
var parameters = mi.Parameters;
+ MethodSpec close_match = null;
+
while (true) {
var candidates = MemberCache.FindMembers (base_type, mi.Name, false);
while (true) {
var candidates = MemberCache.FindMembers (base_type, mi.Name, false);
- if (candidates == null)
+ if (candidates == null) {
+ base_method = close_match;
return false;
return false;
+ }
MethodSpec similar_candidate = null;
foreach (var candidate in candidates) {
MethodSpec similar_candidate = null;
foreach (var candidate in candidates) {
@@
-590,19
+594,29
@@
namespace Mono.CSharp {
// From this point the candidate is used for detailed error reporting
// because it's very close match to what we are looking for
//
// From this point the candidate is used for detailed error reporting
// because it's very close match to what we are looking for
//
- base_method = (MethodSpec) candidate;
+ var m = (MethodSpec) candidate;
+
+ if (!m.IsPublic) {
+ if (close_match == null)
+ close_match = m;
- if (!candidate.IsPublic)
- return false;
+ continue;
+ }
- if (!TypeSpecComparer.Override.IsEqual (mi.ReturnType, base_method.ReturnType))
- return false;
+ if (!TypeSpecComparer.Override.IsEqual (mi.ReturnType, m.ReturnType)) {
+ if (close_match == null)
+ close_match = m;
- if (mi.IsGeneric && !Method.CheckImplementingMethodConstraints (container, base_method, mi)) {
+ continue;
+ }
+
+ base_method = m;
+
+ if (mi.IsGeneric && !Method.CheckImplementingMethodConstraints (container, m, mi)) {
return true;
}
}
return true;
}
}
-
+
if (base_method != null) {
if (similar_candidate != null) {
Report.SymbolRelatedToPreviousError (similar_candidate);
if (base_method != null) {
if (similar_candidate != null) {
Report.SymbolRelatedToPreviousError (similar_candidate);
@@
-617,8
+631,10
@@
namespace Mono.CSharp {
}
base_type = candidates[0].DeclaringType.BaseType;
}
base_type = candidates[0].DeclaringType.BaseType;
- if (base_type == null)
+ if (base_type == null) {
+ base_method = close_match;
return false;
return false;
+ }
}
if (!base_method.IsVirtual) {
}
if (!base_method.IsVirtual) {
@@
-673,7
+689,7
@@
namespace Mono.CSharp {
if (pending_implementations [i].optional)
continue;
if (pending_implementations [i].optional)
continue;
- MethodSpec candidate
= null
;
+ MethodSpec candidate;
if (base_implements_type || BaseImplements (type, mi, out candidate))
continue;
if (base_implements_type || BaseImplements (type, mi, out candidate))
continue;