2004-05-30 Martin Baulig <martin@ximian.com>

	* rootcontext.cs (RootContext.LookupType): Don't cache things if
	we're doing a silent lookup.  Don't try to lookup nested types in
	TypeManager.object_type (thanks to Ben Maurer).

2004-05-30  Martin Baulig  <martin@ximian.com>

	Committing a patch from Ben Maurer.

	* rootcontext.cs (RootContext.LookupType): Cache negative results.

svn path=/trunk/mcs/; revision=28521

mcs/mcs/ChangeLog

@@ -2,6 +2,18 @@
 
 	* convert.cs: add a trivial cache for overload operator resolution.
 
+2004-05-30  Martin Baulig  <martin@ximian.com>
+
+	* rootcontext.cs (RootContext.LookupType): Don't cache things if
+	we're doing a silent lookup.  Don't try to lookup nested types in
+	TypeManager.object_type (thanks to Ben Maurer).
+
+2004-05-30  Martin Baulig  <martin@ximian.com>
+
+	Committing a patch from Ben Maurer.
+
+	* rootcontext.cs (RootContext.LookupType): Cache negative results.
+
 2004-05-29  Martin Baulig  <martin@ximian.com>
 
 	* class.cs (IMethodData.ShouldIgnore): New method.

mcs/mcs/rootcontext.cs

@@ -516,10 +516,8 @@ static public Type LookupType (DeclSpace ds, string name, bool silent, Location
 		{
 			Type t;
 
-			if (ds.Cache.Contains (name)){
+			if (ds.Cache.Contains (name)) {
 				t = (Type) ds.Cache [name];
-				if (t != null)
-					return t;
 			} else {
 				//
 				// For the case the type we are looking for is nested within this one
@@ -529,7 +527,8 @@ static public Type LookupType (DeclSpace ds, string name, bool silent, Location
 				while (containing_ds != null){
 					Type current_type = containing_ds.TypeBuilder;
 
-					while (current_type != null) {
+					while (current_type != null &&
+					       current_type != TypeManager.object_type) {
 						//
 						// nested class
 						//
@@ -546,16 +545,14 @@ static public Type LookupType (DeclSpace ds, string name, bool silent, Location
 				}
 
 				t = NamespaceLookup (ds, name, silent, loc);
-				if (t != null){
+				if (!silent)
 					ds.Cache [name] = t;
-					return t;
-				}
 			}
 
-			if (!silent)
+			if (t == null && !silent)
 				Report.Error (246, loc, "Cannot find type `"+name+"'");
 
-			return null;
+			return t;
 		}
 
 		// <summary>