Rename lookup method for consistency

diff --git a/mcs/mcs/doc.cs b/mcs/mcs/doc.cs
index eb2fc1ea0699ae6746070919243532030d3aec6c..46da315aaedeb0a015589573e39aaeabfd6ffccf 100644 (file)
--- a/mcs/mcs/doc.cs
+++ b/mcs/mcs/doc.cs
@@ -237,7 +237,7 @@ namespace Mono.CSharp
                        var left = ResolveMemberName (context, mn.Left);
                        var ns = left as Namespace;
                        if (ns != null)
-                               return ns.Lookup (context, mn.Name, mn.Arity, Location.Null);
+                               return ns.LookupTypeOrNamespace (context, mn.Name, mn.Arity, Location.Null);
 
                        TypeExpr texpr = left as TypeExpr;
                        if (texpr != null) {
@@ -320,7 +320,7 @@ namespace Mono.CSharp
                                                if (fne != null) {
                                                        var ns = fne as Namespace;
                                                        if (ns != null) {
-                                                               fne = ns.Lookup (mc, ParsedName.Name, ParsedName.Arity, Location.Null);
+                                                               fne = ns.LookupTypeOrNamespace (mc, ParsedName.Name, ParsedName.Arity, Location.Null);
                                                                if (fne != null) {
                                                                        member = fne.Type;
                                                                }

diff --git a/mcs/mcs/expression.cs b/mcs/mcs/expression.cs
index 7add8a0e60131c47c91f5cf0215146c0d68d6307..c7800c989e755332da7f59f1e5e56c98fa11ee3a 100644 (file)
--- a/mcs/mcs/expression.cs
+++ b/mcs/mcs/expression.cs
@@ -7539,7 +7539,7 @@ namespace Mono.CSharp
 
                        Namespace ns = expr as Namespace;
                        if (ns != null) {
-                               FullNamedExpression retval = ns.Lookup (rc, Name, Arity, loc);
+                               var retval = ns.LookupTypeOrNamespace (rc, Name, Arity, loc);
 
                                if (retval == null) {
                                        ns.Error_NamespaceDoesNotExist (loc, Name, Arity, rc);
@@ -7691,7 +7691,7 @@ namespace Mono.CSharp
 
                        Namespace ns = expr_resolved as Namespace;
                        if (ns != null) {
-                               FullNamedExpression retval = ns.Lookup (rc, Name, Arity, loc);
+                               FullNamedExpression retval = ns.LookupTypeOrNamespace (rc, Name, Arity, loc);
 
                                if (retval == null) {
                                        ns.Error_NamespaceDoesNotExist (loc, Name, Arity, rc);

diff --git a/mcs/mcs/namespace.cs b/mcs/mcs/namespace.cs
index 81d68052e9c953174b2b4493a3aeffcb3254b85e..a19f5938a784baa4eccbcf7faffd5e8a04aa3a80 100644 (file)
--- a/mcs/mcs/namespace.cs
+++ b/mcs/mcs/namespace.cs
@@ -161,7 +161,7 @@ namespace Mono.CSharp {
 
                public virtual void Error_NamespaceDoesNotExist (Location loc, string name, int arity, IMemberContext ctx)
                {
-                       FullNamedExpression retval = Lookup (ctx, name, -System.Math.Max (1, arity), loc);
+                       var retval = LookupType (ctx, name, -System.Math.Max (1, arity), loc);
                        if (retval != null) {
                                Error_TypeArgumentsCannotBeUsed (ctx, retval.Type, arity, loc);
                                return;
@@ -317,7 +317,7 @@ namespace Mono.CSharp {
                        return null;
                }
 
-               public FullNamedExpression Lookup (IMemberContext ctx, string name, int arity, Location loc)
+               public FullNamedExpression LookupTypeOrNamespace (IMemberContext ctx, string name, int arity, Location loc)
                {
                        var texpr = LookupType (ctx, name, arity, loc);
 
@@ -877,7 +877,7 @@ namespace Mono.CSharp {
                        //
                        // Check whether it's in the namespace.
                        //
-                       FullNamedExpression fne = ns.Lookup (this, name, arity, loc);
+                       FullNamedExpression fne = ns.LookupTypeOrNamespace (this, name, arity, loc);
 
                        //
                        // Check aliases.