Browse Source

Remove unresolved references from new Alias*ResolveResult.

pull/32/merge
Daniel Grunwald 13 years ago
parent
commit
f159810013
  1. 13
      ICSharpCode.NRefactory.CSharp/Resolver/AliasNamespaceResolveResult.cs
  2. 14
      ICSharpCode.NRefactory.CSharp/Resolver/AliasTypeResolveResult.cs
  3. 4
      ICSharpCode.NRefactory.CSharp/TypeSystem/ResolvedUsingScope.cs
  4. 5
      ICSharpCode.NRefactory/TypeSystem/Implementation/SpecializedMethod.cs

13
ICSharpCode.NRefactory.CSharp/Resolver/AliasNamespaceResolveResult.cs

@ -1,4 +1,4 @@
// //
// AliasResolveResult.cs // AliasResolveResult.cs
// //
// Author: // Author:
@ -42,19 +42,10 @@ namespace ICSharpCode.NRefactory.CSharp.Resolver
get; get;
private set; private set;
} }
/// <summary>
/// The namespace reference that was aliased.
/// </summary>
public TypeOrNamespaceReference Reference {
get;
private set;
}
public AliasNamespaceResolveResult(string alias, TypeOrNamespaceReference reference, NamespaceResolveResult underlyingResult) : base (underlyingResult.Namespace) public AliasNamespaceResolveResult(string alias, NamespaceResolveResult underlyingResult) : base (underlyingResult.Namespace)
{ {
this.Alias = alias; this.Alias = alias;
this.Reference = reference;
} }
} }
} }

14
ICSharpCode.NRefactory.CSharp/Resolver/AliasTypeResolveResult.cs

@ -1,4 +1,4 @@
// //
// AliasTypeResolveResult.cs // AliasTypeResolveResult.cs
// //
// Author: // Author:
@ -44,19 +44,9 @@ namespace ICSharpCode.NRefactory.CSharp.Resolver
private set; private set;
} }
/// <summary> public AliasTypeResolveResult(string alias, TypeResolveResult underlyingResult) : base (underlyingResult.Type)
/// The type reference that was aliased.
/// </summary>
public TypeOrNamespaceReference Reference {
get;
private set;
}
public AliasTypeResolveResult(string alias, TypeOrNamespaceReference reference, TypeResolveResult underlyingResult) : base (underlyingResult.Type)
{ {
this.Alias = alias; this.Alias = alias;
this.Reference = reference;
} }
} }
} }

4
ICSharpCode.NRefactory.CSharp/TypeSystem/ResolvedUsingScope.cs

@ -118,9 +118,9 @@ namespace ICSharpCode.NRefactory.CSharp.TypeSystem
for (int i = 0; i < result.Count; i++) { for (int i = 0; i < result.Count; i++) {
var rr = usingScope.UsingAliases[i].Value.Resolve(resolver); var rr = usingScope.UsingAliases[i].Value.Resolve(resolver);
if (rr is TypeResolveResult) { if (rr is TypeResolveResult) {
rr = new AliasTypeResolveResult (usingScope.UsingAliases[i].Key, usingScope.UsingAliases[i].Value, (TypeResolveResult)rr); rr = new AliasTypeResolveResult (usingScope.UsingAliases[i].Key, (TypeResolveResult)rr);
} else if (rr is NamespaceResolveResult) { } else if (rr is NamespaceResolveResult) {
rr = new AliasNamespaceResolveResult (usingScope.UsingAliases[i].Key, usingScope.UsingAliases[i].Value, (NamespaceResolveResult)rr); rr = new AliasNamespaceResolveResult (usingScope.UsingAliases[i].Key, (NamespaceResolveResult)rr);
} }
result[i] = new KeyValuePair<string, ResolveResult>( result[i] = new KeyValuePair<string, ResolveResult>(
usingScope.UsingAliases[i].Key, usingScope.UsingAliases[i].Key,

5
ICSharpCode.NRefactory/TypeSystem/Implementation/SpecializedMethod.cs

@ -192,11 +192,6 @@ namespace ICSharpCode.NRefactory.TypeSystem.Implementation
} }
} }
public IMethod GetDefinition ()
{
return methodDefinition;
}
public override string ToString() public override string ToString()
{ {
StringBuilder b = new StringBuilder("["); StringBuilder b = new StringBuilder("[");

Loading…
Cancel
Save