Attachment 320944 Details for Bug 543537

[patch] Patch v.0.1

mcs.diff (text/plain), 3.32 KB, created by Andres Aragoneses on 2009-10-03 23:26:26 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andres Aragoneses

Created: 2009-10-03 23:26:26 UTC

Size: 3.32 KB

patch

obsolete

>Index: trunk/mcs/mcs/driver.cs
>===================================================================
>--- trunk/mcs/mcs/driver.cs	(revisiÃ³n: 143331)
>+++ trunk/mcs/mcs/driver.cs	(copia de trabajo)
>@@ -8,7 +8,7 @@
> // Dual licensed under the terms of the MIT X11 or GNU GPL
> //
> // Copyright 2001, 2002, 2003 Ximian, Inc (http://www.ximian.com)
>-// Copyright 2004, 2005, 2006, 2007, 2008 Novell, Inc
>+// Copyright 2004, 2005, 2006, 2007, 2008, 2009 Novell, Inc
> //
> 
> namespace Mono.CSharp
>@@ -17,6 +17,7 @@
> 	using System.Reflection;
> 	using System.Reflection.Emit;
> 	using System.Collections;
>+	using System.Collections.Generic;
> 	using System.Collections.Specialized;
> 	using System.IO;
> 	using System.Text;
>@@ -318,9 +319,9 @@
> 			return 1;
> 		}
> 
>-		public void LoadAssembly (string assembly, bool soft)
>+		public Assembly LoadAssembly (string assembly, bool soft)
> 		{
>-			LoadAssembly (assembly, null, soft);
>+			return LoadAssembly (assembly, null, soft);
> 		}
> 
> 		void Error6 (string name, string log)
>@@ -369,7 +370,7 @@
> 			Error9 ("assembly", filename, log);
> 		}
> 
>-		public void LoadAssembly (string assembly, string alias, bool soft)
>+		public Assembly LoadAssembly (string assembly, string alias, bool soft)
> 		{
> 			Assembly a = null;
> 			string total_log = "";
>@@ -399,13 +400,13 @@
> 							break;
> 						} catch (FileNotFoundException ff) {
> 							if (soft)
>-								return;
>+								return null;
> 							total_log += ff.FusionLog;
> 						}
> 					}
> 					if (err) {
> 						Error6 (assembly, total_log);
>-						return;
>+						return null;
> 					}
> 				}
> 
>@@ -422,6 +423,8 @@
> 				// ... while .NET 1.1 throws this
> 				BadAssembly (f.FileName, f.FusionLog);
> 			}
>+			
>+			return a;
> 		}
> 
> 		public void LoadModule (string module)
>@@ -473,17 +476,59 @@
> 			//
> 			// Load Core Library for default compilation
> 			//
>+			string core_lib_name = "mscorlib";
> 			if (RootContext.StdLib)
>-				LoadAssembly ("mscorlib", false);
>+				LoadAssembly (core_lib_name, false);
> 
> 			foreach (string r in soft_references)
> 				LoadAssembly (r, true);
> 
>-			foreach (string r in references)
>-				LoadAssembly (r, false);
>+			List<Assembly> loaded_references = new List<Assembly> ();
>+			foreach (string r in references) {
>+				Assembly a = LoadAssembly (r, false);
>+				if (a != null)
>+					loaded_references.Add (a);
>+			}
> 
> 			foreach (DictionaryEntry entry in external_aliases)
> 				LoadAssembly ((string) entry.Value, (string) entry.Key, false);
>+
>+			string mscorlib_name = core_lib_name + ", Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089";
>+
>+			bool failed_refs = false;
>+			foreach (Assembly a in loaded_references) {
>+				foreach (AssemblyName an in a.GetReferencedAssemblies ()) {
>+					if (an.ToString () == mscorlib_name)
>+						continue;
>+
>+					Assembly match = null;
>+					foreach (Assembly candidate in loaded_references) {
>+						if (an.ToString () == candidate.GetName ().ToString ())
>+							match = candidate;
>+					}
>+					if (match == null) {
>+						Report.Error (12, "The reference `{0}' depends on a type which is defined in an assembly that is not referenced. You must add a reference to assembly `{1}'",
>+						              a.GetName ().Name,
>+						              an.ToString ());
>+						failed_refs = true;
>+					}
>+				}
>+			}
>+			
>+			if (failed_refs)
>+				Environment.Exit (1);
> 				
> 			GlobalRootNamespace.Instance.ComputeNamespaces (ctx);
> 		}

Actions: View | Diff

Attachments on bug 543537: 320682 | 320944