Merge pull request #409 from Alkarex/patch-1

[mono.git] / mcs / ilasm / codegen / ExternTable.cs

diff --git a/mcs/ilasm/codegen/ExternTable.cs b/mcs/ilasm/codegen/ExternTable.cs
index 037ecfada85d04521baabf5c74d462dce137c0a0..25a46efbf3180a5898d536eb0b2224a4bc0132f8 100644 (file)
--- a/mcs/ilasm/codegen/ExternTable.cs
+++ b/mcs/ilasm/codegen/ExternTable.cs
@@ -9,9 +9,11 @@
 
 using System;
 using System.Collections;
+using System.Collections.Generic;
 using System.Reflection;
 using System.Security;
 using System.Globalization;
+using PEAPI;
 
 namespace Mono.ILASM {
 
@@ -146,11 +148,14 @@ namespace Mono.ILASM {
                 private byte [] hash;
                 private DeclSecurity decl_sec;
                 private AssemblyName asmb_name;
+                //flags
+                private PEAPI.AssemAttr attr;
 
-                public ExternAssembly (string name, AssemblyName asmb_name) : base (name)
+                public ExternAssembly (string name, AssemblyName asmb_name, PEAPI.AssemAttr attr) : base (name)
                 {
                         this.name = name;
                         this.asmb_name = asmb_name;
+                        this.attr = attr;
                         major = minor = build = revision = -1;
                 }
 
@@ -180,6 +185,7 @@ namespace Mono.ILASM {
                                 return;
 
                         AssemblyRef = code_gen.PEFile.AddExternAssembly (name);
+                        AssemblyRef.AddAssemblyAttr (attr);
                         if (major != -1)
                                 AssemblyRef.AddVersionInfo (major, minor, build, revision);
                         if (public_key != null)
@@ -243,11 +249,34 @@ namespace Mono.ILASM {
 
         }
 
+        public class ExternClass
+        {
+            string name;
+            TypeAttr ta;
+            string assemblyReference;
+
+            public ExternClass (string name, TypeAttr ta, string assemblyReference)
+            {
+                this.name = name;
+                this.ta = ta;
+                this.assemblyReference = assemblyReference;
+            }
+
+            public void Resolve (CodeGen code_gen, ExternTable table)
+            {
+                var ar = table.GetAssemblyRef (assemblyReference);
+                if (ar != null)
+                    code_gen.PEFile.AddExternClass (name, ta, ar.AssemblyRef);
+            }
+        }
+
         
         public class ExternTable {
 
                 Hashtable assembly_table;
                 Hashtable module_table;
+                List<ExternClass> class_table;
+
                 bool is_resolved;
                 
                 public void AddCorlib ()
@@ -256,14 +285,14 @@ namespace Mono.ILASM {
                         string mscorlib_name = "mscorlib";
                         AssemblyName mscorlib = new AssemblyName ();
                         mscorlib.Name = mscorlib_name;
-                        AddAssembly (mscorlib_name, mscorlib);
+                        AddAssembly (mscorlib_name, mscorlib, 0);
 
                         // Also need to alias corlib, normally corlib and
                         // mscorlib are used interchangably
                         assembly_table["corlib"] = assembly_table["mscorlib"];
                 }
 
-                public ExternAssembly AddAssembly (string name, AssemblyName asmb_name)
+                public ExternAssembly AddAssembly (string name, AssemblyName asmb_name, PEAPI.AssemAttr attr)
                 {
                         ExternAssembly ea = null;
 
@@ -275,7 +304,7 @@ namespace Mono.ILASM {
                                         return ea;
                         }
 
-                        ea = new ExternAssembly (name, asmb_name);
+                        ea = new ExternAssembly (name, asmb_name, attr);
 
                         assembly_table [name] = ea;
 
@@ -301,6 +330,14 @@ namespace Mono.ILASM {
                         return em;
                 }
 
+                public void AddClass (string name, TypeAttr ta, string assemblyReference)
+                {
+                    if (class_table == null)
+                        class_table = new List<ExternClass> ();
+
+                    class_table.Add (new ExternClass (name, ta, assemblyReference));
+                }
+
                 public void Resolve (CodeGen code_gen)
                 {
                         if (is_resolved)
@@ -309,12 +346,16 @@ namespace Mono.ILASM {
                         if (assembly_table != null)
                                 foreach (ExternAssembly ext in assembly_table.Values)
                                         ext.Resolve (code_gen);
-                        if (module_table == null)
-                                return;
-                        foreach (ExternModule ext in module_table.Values)
-                                ext.Resolve (code_gen);
 
-                       is_resolved = true;     
+                        if (module_table != null)
+                            foreach (ExternModule ext in module_table.Values)
+                                    ext.Resolve (code_gen);
+
+                        if (class_table != null)
+                            foreach (var entry in class_table)
+                                entry.Resolve (code_gen, this);
+
+                        is_resolved = true;    
                 }
 
                 public ExternTypeRef GetTypeRef (string asmb_name, string full_name, bool is_valuetype)
@@ -334,7 +375,7 @@ namespace Mono.ILASM {
                                 asmname.Name = asmb_name;
 
                                 Report.Warning (String.Format ("Reference to undeclared extern assembly '{0}', adding.", asmb_name));
-                                ext_asmb = AddAssembly (asmb_name, asmname);
+                                ext_asmb = AddAssembly (asmb_name, asmname, 0);
                         }
 
                         return ext_asmb.GetTypeRef (full_name, is_valuetype);
@@ -352,6 +393,18 @@ namespace Mono.ILASM {
                         return mod.GetTypeRef (full_name, is_valuetype);
                 }
 
+                public ExternAssembly GetAssemblyRef (string assembly_name)
+                {
+                        ExternAssembly ass = null;
+                        if (assembly_table != null)
+                                ass = assembly_table [assembly_name] as ExternAssembly;
+
+                        if (ass == null)
+                                Report.Error ("Assembly " + assembly_name + " is not defined.");
+
+                        return ass;
+                }
+
                 public static void GetNameAndNamespace (string full_name,
                         out string name_space, out string name) {