Ooops.
[mono.git] / mcs / class / corlib / System.Reflection.Emit / ModuleBuilder.cs
index a7d4888d6d730510849b034e52acbaa8401a3356..3925bcb9f4e0f225bc6bd1a7b53376fcbafcff0e 100644 (file)
@@ -39,10 +39,14 @@ using System.Runtime.InteropServices;
 using System.Diagnostics.SymbolStore;
 using System.IO;
 using System.Resources;
-using Mono.CSharp.Debugger;
 using System.Globalization;
 
 namespace System.Reflection.Emit {
+#if NET_2_0
+       [ComVisible (true)]
+       [ClassInterfaceAttribute (ClassInterfaceType.None)]
+       [ComDefaultInterfaceAttribute (typeof (_ModuleBuilder))]
+#endif
        public class ModuleBuilder : Module {
                #region Sync with reflection.h
                private IntPtr dynamic_image;
@@ -59,13 +63,13 @@ namespace System.Reflection.Emit {
                #endregion
                private TypeBuilder global_type;
                private Type global_type_created;
-               internal IMonoSymbolWriter symbol_writer;
                Hashtable name_cache;
                Hashtable us_string_cache = new Hashtable ();
                private int[] table_indexes;
                bool transient;
                ModuleBuilderTokenGenerator token_gen;
                ArrayList resource_writers = null;
+               ISymbolWriter symbolWriter;
 
                [MethodImplAttribute(MethodImplOptions.InternalCall)]
                private static extern void basic_init (ModuleBuilder ab);
@@ -81,44 +85,20 @@ namespace System.Reflection.Emit {
                        table_idx = get_next_table_index (this, 0x00, true);
                        name_cache = new Hashtable ();
 
-                       if (emitSymbolInfo)
-                               GetSymbolWriter (fullyqname);
                        basic_init (this);
-               }
-
-               internal void GetSymbolWriter (string filename)
-               {
-                       Assembly assembly;
-                       try {
-                               assembly = Assembly.Load (Consts.AssemblyMono_CSharp_Debugger);
-                       } catch (FileNotFoundException) {
-                               return;
-                       }
 
-                       Type type = assembly.GetType ("Mono.CSharp.Debugger.MonoSymbolWriter");
-                       if (type == null)
-                               return;
-
-                       // First get the constructor.
-                       {
-                               Type[] arg_types = new Type [1];
-                               arg_types [0] = typeof (ModuleBuilder);
-                               ConstructorInfo constructor = type.GetConstructor (arg_types);
-
-                               object[] args = new object [1];
-                               args [0] = this;
-
-                               if (constructor == null)
-                                       return;
-
-                               Object instance = constructor.Invoke (args);
-                               if (instance == null)
-                                       return;
-
-                               if (!(instance is IMonoSymbolWriter))
-                                       return;
-
-                               symbol_writer = (IMonoSymbolWriter) instance;
+                       CreateGlobalType ();
+                       
+                       if (emitSymbolInfo) {
+                               Assembly asm = Assembly.LoadWithPartialName ("Mono.CompilerServices.SymbolWriter");
+                               Type t = asm.GetType ("Mono.CompilerServices.SymbolWriter.SymbolWriterImpl");
+                               if (t != null) {
+                                       symbolWriter = (ISymbolWriter) Activator.CreateInstance (t, new object[] { this });
+                                       string fileName = fqname;
+                                       if (assemblyb.AssemblyDir != null)
+                                               fileName = Path.Combine (assemblyb.AssemblyDir, fileName);
+                                       symbolWriter.Initialize (IntPtr.Zero, fileName, true);
+                               }
                        }
                }
 
@@ -244,6 +224,8 @@ namespace System.Reflection.Emit {
                }
 
                public TypeBuilder DefineType (string name, TypeAttributes attr) {
+                       if ((attr & TypeAttributes.Interface) != 0)
+                               return DefineType (name, attr, null, null);
                        return DefineType (name, attr, typeof(object), null);
                }
 
@@ -251,8 +233,8 @@ namespace System.Reflection.Emit {
                        return DefineType (name, attr, parent, null);
                }
 
-               private TypeBuilder DefineType (string name, TypeAttributes attr, Type parent, Type[] interfaces, PackingSize packsize, int typesize) {
-                       TypeBuilder res = new TypeBuilder (this, name, attr, parent, interfaces, packsize, typesize, null);
+               private void AddType (TypeBuilder tb)
+               {
                        if (types != null) {
                                if (types.Length == num_types) {
                                        TypeBuilder[] new_types = new TypeBuilder [types.Length * 2];
@@ -262,8 +244,16 @@ namespace System.Reflection.Emit {
                        } else {
                                types = new TypeBuilder [1];
                        }
-                       types [num_types] = res;
+                       types [num_types] = tb;
                        num_types ++;
+               }
+
+               private TypeBuilder DefineType (string name, TypeAttributes attr, Type parent, Type[] interfaces, PackingSize packsize, int typesize) {
+                       if (name_cache.Contains (name))
+                               throw new ArgumentException ("Duplicate type name within an assembly.");
+
+                       TypeBuilder res = new TypeBuilder (this, name, attr, parent, interfaces, packsize, typesize, null);
+                       AddType (res);
                        name_cache.Add (name, res);
                        return res;
                }
@@ -272,6 +262,9 @@ namespace System.Reflection.Emit {
                        name_cache.Add (name, tb);
                }
 
+#if NET_2_0
+               [ComVisible (true)]
+#endif
                public TypeBuilder DefineType (string name, TypeAttributes attr, Type parent, Type[] interfaces) {
                        return DefineType (name, attr, parent, interfaces, PackingSize.Unspecified, TypeBuilder.UnspecifiedTypeSize);
                }
@@ -293,14 +286,26 @@ namespace System.Reflection.Emit {
                }
 
                public EnumBuilder DefineEnum( string name, TypeAttributes visibility, Type underlyingType) {
+                       if (name_cache.Contains (name))
+                               throw new ArgumentException ("Duplicate type name within an assembly.");
+
                        EnumBuilder eb = new EnumBuilder (this, name, visibility, underlyingType);
+                       TypeBuilder res = eb.GetTypeBuilder ();
+                       AddType (res);
+                       name_cache.Add (name, res);
                        return eb;
                }
 
+#if NET_2_0
+               [ComVisible (true)]
+#endif
                public override Type GetType( string className) {
                        return GetType (className, false, false);
                }
                
+#if NET_2_0
+               [ComVisible (true)]
+#endif
                public override Type GetType( string className, bool ignoreCase) {
                        return GetType (className, false, ignoreCase);
                }
@@ -348,7 +353,10 @@ namespace System.Reflection.Emit {
                        }
                        return null;
                }
-               
+
+#if NET_2_0
+               [ComVisible (true)]
+#endif         
                public override Type GetType (string className, bool throwOnError, bool ignoreCase) {
                        int subt;
                        string orig = className;
@@ -413,19 +421,24 @@ namespace System.Reflection.Emit {
                                cattrs [0] = customBuilder;
                        }
                }
+
+#if NET_2_0
+               [ComVisible (true)]
+#endif
                public void SetCustomAttribute( ConstructorInfo con, byte[] binaryAttribute) {
                        SetCustomAttribute (new CustomAttributeBuilder (con, binaryAttribute));
                }
 
                public ISymbolWriter GetSymWriter () {
-                       return symbol_writer;
+                       return symbolWriter;
                }
 
-               public ISymbolDocumentWriter DefineDocument (string url, Guid language, Guid languageVendor, Guid documentType) {
-                       if (symbol_writer == null)
-                               throw new InvalidOperationException ();
-
-                       return symbol_writer.DefineDocument (url, language, languageVendor, documentType);
+               public ISymbolDocumentWriter DefineDocument (string url, Guid language, Guid languageVendor, Guid documentType)
+               {
+                       if (symbolWriter != null)
+                               return symbolWriter.DefineDocument (url, language, languageVendor, documentType);
+                       else
+                               return null;
                }
 
                public override Type [] GetTypes ()
@@ -433,7 +446,7 @@ namespace System.Reflection.Emit {
                        if (types == null)
                                return new TypeBuilder [0];
 
-                       int n = types.Length;
+                       int n = num_types;
                        TypeBuilder [] copy = new TypeBuilder [n];
                        Array.Copy (types, copy, n);
 
@@ -527,7 +540,9 @@ namespace System.Reflection.Emit {
                        return GetMethodToken (GetArrayMethod (arrayClass, methodName, callingConvention, returnType, parameterTypes));
                }
 
-
+#if NET_2_0
+               [ComVisible (true)]
+#endif
                public MethodToken GetConstructorToken (ConstructorInfo con)
                {
                        if (con == null)
@@ -620,13 +635,19 @@ namespace System.Reflection.Emit {
                private static extern void build_metadata (ModuleBuilder mb);
 
                [MethodImplAttribute(MethodImplOptions.InternalCall)]
-               private static extern int getDataChunk (ModuleBuilder mb, byte[] buf, int offset);
+               private extern void WriteToFile (IntPtr handle);
 
                internal void Save ()
                {
-                       if (transient)
+                       if (transient && !is_main)
                                return;
 
+                       if (types != null) {
+                               for (int i = 0; i < num_types; ++i)
+                                       if (!types [i].is_created)
+                                               throw new NotSupportedException ("Type '" + types [i].FullName + "' was not completed.");
+                       }
+
                        if ((global_type != null) && (global_type_created == null))
                                global_type_created = global_type.CreateType ();
 
@@ -643,37 +664,23 @@ namespace System.Reflection.Emit {
 
                        build_metadata (this);
 
-                       if (symbol_writer != null) {
-                               string res_name;
-                               if (is_main)
-                                       res_name = "MonoSymbolFile";
-                               else
-                                       res_name = "MonoSymbolFile:" + fqname;
-                               byte[] data = symbol_writer.CreateSymbolFile (assemblyb);
-                               assemblyb.EmbedResource (res_name, data, ResourceAttributes.Public);
-                       }
-
                        string fileName = fqname;
                        if (assemblyb.AssemblyDir != null)
-                               fileName = System.IO.Path.Combine (assemblyb.AssemblyDir, fileName);
-
-                       byte[] buf = new byte [65536];
-                       FileStream file;
-                       int count, offset;
-
-                       file = new FileStream (fileName, FileMode.Create, FileAccess.Write);
-
-                       offset = 0;
-                       while ((count = getDataChunk (this, buf, offset)) != 0) {
-                               file.Write (buf, 0, count);
-                               offset += count;
-                       }
-                       file.Close ();
-
+                               fileName = Path.Combine (assemblyb.AssemblyDir, fileName);
+                       
+                       using (FileStream file = new FileStream (fileName, FileMode.Create, FileAccess.Write))
+                               WriteToFile (file.Handle);
+                       
                        //
                        // The constant 0x80000000 is internal to Mono, it means `make executable'
                        //
                        File.SetAttributes (fileName, (FileAttributes) (unchecked ((int) 0x80000000)));
+                       
+                       if (types != null && symbolWriter != null) {
+                               for (int i = 0; i < num_types; ++i)
+                                       types [i].GenerateDebugInfo (symbolWriter);
+                               symbolWriter.Close ();
+                       }
                }
 
                internal string FileName {
@@ -687,6 +694,16 @@ namespace System.Reflection.Emit {
                                is_main = value;
                        }
                }
+
+               internal void CreateGlobalType () {
+                       if (global_type == null)
+                               global_type = new TypeBuilder (this, 0);
+               }
+
+               internal static Guid Mono_GetGuid (ModuleBuilder mb)
+               {
+                       return new Guid (mb.guid);
+               }
        }
 
        internal class ModuleBuilderTokenGenerator : TokenGenerator {
@@ -714,3 +731,4 @@ namespace System.Reflection.Emit {
                }
        }
 }
+