Put the merging back.
[mono.git] / mcs / gmcs / rootcontext.cs
index 7f74cd5fb4477c6a90c25baa5307f74e8a00bd79..184fd139ca37c9f23518ebfd48d0b5b863307dbf 100755 (executable)
@@ -16,6 +16,12 @@ using System.Diagnostics;
 
 namespace Mono.CSharp {
 
+       public enum LanguageVersion
+       {
+               Default = 0,
+               ISO_1   = 1
+       }
+
        public class RootContext {
 
                //
@@ -46,7 +52,6 @@ namespace Mono.CSharp {
                // override).
                //
                static ArrayList type_container_resolve_order;
-               static ArrayList interface_resolve_order;
                static ArrayList attribute_types;
 
                //
@@ -62,17 +67,24 @@ namespace Mono.CSharp {
                public static Target Target = Target.Exe;
                public static string TargetExt = ".exe";
 
+               public static bool VerifyClsCompliance = true;
+
+               public static LanguageVersion Version = LanguageVersion.Default;
+
                //
-               // If set, enable C# version 2 features
+               // We keep strongname related info here because
+               // it's also used as complier options from CSC 8.x
                //
-               public static bool V2 = true;
+               public static string StrongNameKeyFile;
+               public static string StrongNameKeyContainer;
+               public static bool StrongNameDelaySign = false;
+
                //
                // Constructor
                //
                static RootContext ()
                {
                        tree = new Tree ();
-                       interface_resolve_order = new ArrayList ();
                        type_container_resolve_order = new ArrayList ();
                }
 
@@ -90,11 +102,6 @@ namespace Mono.CSharp {
 
                static public string MainClass;
                
-               public static void RegisterOrder (Interface iface)
-               {
-                       interface_resolve_order.Add (iface);
-               }
-               
                public static void RegisterOrder (TypeContainer tc)
                {
                        type_container_resolve_order.Add (tc);
@@ -262,7 +269,7 @@ namespace Mono.CSharp {
                        object o = root.GetDefinition (name);
                        if (o == null){
                                Report.Error (518, "The predefined type `" + name + "' is not defined");
-                               Environment.Exit (0);
+                               Environment.Exit (1);
                        }
 
                        if (!(o is Delegate)){
@@ -299,7 +306,13 @@ namespace Mono.CSharp {
                                "System.Runtime.Serialization.ISerializable",
 
                                "System.Reflection.IReflect",
-                               "System.Reflection.ICustomAttributeProvider"
+                               "System.Reflection.ICustomAttributeProvider",
+
+                               //
+                               // Generic types
+                               //
+                               "System.Collections.Generic.IEnumerator`1",
+                               "System.Collections.Generic.IEnumerable`1"
                        };
 
                        foreach (string iname in interfaces_first_stage)
@@ -329,8 +342,11 @@ namespace Mono.CSharp {
                                "System.Char",    "System.Boolean",
                                "System.Decimal", "System.Void",
                                "System.RuntimeFieldHandle",
+                               "System.RuntimeArgumentHandle",
                                "System.RuntimeTypeHandle",
-                               "System.IntPtr"
+                               "System.IntPtr",
+                               "System.TypedReference",
+                               "System.ArgIterator"
                        };
                        
                        foreach (string cname in structs_second_stage)
@@ -361,11 +377,17 @@ namespace Mono.CSharp {
                                "System.Diagnostics.ConditionalAttribute",
                                "System.ObsoleteAttribute",
                                "System.ParamArrayAttribute",
+                               "System.CLSCompliantAttribute",
                                "System.Security.UnverifiableCodeAttribute",
+                               "System.Security.Permissions.SecurityAttribute",
                                "System.Runtime.CompilerServices.IndexerNameAttribute",
                                "System.Runtime.InteropServices.InAttribute",
-                               "System.InvalidOperationException"
-
+                               "System.Runtime.InteropServices.StructLayoutAttribute",
+                               "System.Runtime.InteropServices.FieldOffsetAttribute",
+                               "System.InvalidOperationException",
+                               "System.NotSupportedException",
+                               "System.MarshalByRefObject",
+                               "System.Security.CodeAccessPermission"
                        };
 
                        // We must store them here before calling BootstrapCorlib_ResolveDelegate.
@@ -403,9 +425,6 @@ namespace Mono.CSharp {
                                foreach (TypeContainer tc in attribute_types)
                                        tc.CloseType ();
                        
-                       foreach (Interface iface in interface_resolve_order)
-                               iface.CloseType ();
-
                        //
                        // We do this in two passes, first we close the structs,
                        // then the classes, because it seems the code needs it this
@@ -413,13 +432,13 @@ namespace Mono.CSharp {
                        // make sure that we define the structs in order as well.
                        //
                        foreach (TypeContainer tc in type_container_resolve_order){
-                               if (tc is Struct && tc.Parent == tree.Types){
+                               if (tc.Kind == Kind.Struct && tc.Parent == tree.Types){
                                        tc.CloseType ();
                                }
                        }
 
                        foreach (TypeContainer tc in type_container_resolve_order){
-                               if (!(tc is Struct && tc.Parent == tree.Types))
+                               if (!(tc.Kind == Kind.Struct && tc.Parent == tree.Types))
                                        tc.CloseType ();                                        
                        }
                        
@@ -437,10 +456,9 @@ namespace Mono.CSharp {
                        }
                        
                        attribute_types = null;
-                       interface_resolve_order = null;
                        type_container_resolve_order = null;
                        helper_classes = null;
-                       tree = null;
+                       //tree = null;
                        TypeManager.CleanUp ();
                }
 
@@ -470,33 +488,29 @@ namespace Mono.CSharp {
                        return ns.Substring (0, i);
                }
 
-               static Type NamespaceLookup (DeclSpace ds, string name,
-                                            int num_type_args, Location loc)
+               static TypeExpr NamespaceLookup (DeclSpace ds, string name,
+                                                int num_type_args, Location loc)
                {
                        //
                        // Try in the current namespace and all its implicit parents
                        //
                        for (NamespaceEntry ns = ds.NamespaceEntry; ns != null; ns = ns.ImplicitParent) {
-                               object result = ns.Lookup (ds, name, loc);
+                               IAlias result = ns.Lookup (ds, name, num_type_args, false, loc);
+
                                if (result == null)
                                        continue;
 
-                               Type t = result as Type;
-                               if (t != null) {
-                                       if (TypeManager.CheckGeneric (t, num_type_args))
-                                               return t;
-                                       else
-                                               continue;
-                               }
+                               if (!result.IsType)
+                                       return null;
 
-                               return null;
+                               return result.Type;
                        }
 
                        return null;
                }
                
-               static public Type LookupType (DeclSpace ds, string name, bool silent,
-                                              Location loc)
+               static public TypeExpr LookupType (DeclSpace ds, string name, bool silent,
+                                                  Location loc)
                {
                        return LookupType (ds, name, silent, 0, loc);
                }
@@ -509,13 +523,13 @@ namespace Mono.CSharp {
                //
                // Come to think of it, this should be a DeclSpace
                //
-               static public Type LookupType (DeclSpace ds, string name, bool silent,
-                                              int num_type_params, Location loc)
+               static public TypeExpr LookupType (DeclSpace ds, string name, bool silent,
+                                                  int num_type_params, Location loc)
                {
-                       Type t;
+                       TypeExpr t;
 
                        if (ds.Cache.Contains (name)){
-                               t = (Type) ds.Cache [name];
+                               t = (TypeExpr) ds.Cache [name];
                                if (t != null)
                                        return t;
                        } else {
@@ -531,8 +545,10 @@ namespace Mono.CSharp {
                                                //
                                                // nested class
                                                //
-                                               t = TypeManager.LookupType (current_type.FullName + "." + name);
-                                               if (t != null){
+                                               Type type = TypeManager.LookupType (current_type.FullName + "." + name);
+                                               if (type != null){
+                                                       type = ds.ResolveNestedType (type, loc);
+                                                       t = new TypeExpression (type, loc);
                                                        ds.Cache [name] = t;
                                                        return t;
                                                }
@@ -560,25 +576,11 @@ namespace Mono.CSharp {
                //   This is the silent version of LookupType, you can use this
                //   to `probe' for a type
                // </summary>
-               static public Type LookupType (TypeContainer tc, string name, Location loc)
+               static public TypeExpr LookupType (TypeContainer tc, string name, Location loc)
                {
                        return LookupType (tc, name, true, loc);
                }
 
-               static public bool IsNamespace (string name)
-               {
-                       Namespace ns;
-
-                       if (tree.Namespaces != null){
-                               ns = (Namespace) tree.Namespaces [name];
-
-                               if (ns != null)
-                                       return true;
-                       }
-
-                       return false;
-               }
-
                static void Report1530 (Location loc)
                {
                        Report.Error (1530, loc, "Keyword new not allowed for namespace elements");
@@ -589,7 +591,7 @@ namespace Mono.CSharp {
                        DeclSpace ds = (DeclSpace) root.GetDefinition (name);
 
                        ds.DefineMembers (root);
-                       ds.Define (root);
+                       ds.Define ();
                }
                
                static public void BootCorlib_PopulateCoreTypes ()
@@ -614,15 +616,6 @@ namespace Mono.CSharp {
                        if (attribute_types != null)
                                foreach (TypeContainer tc in attribute_types)
                                        tc.DefineMembers (root);
-                       
-                       if (interface_resolve_order != null){
-                               foreach (Interface iface in interface_resolve_order)
-                                       if ((iface.ModFlags & Modifiers.NEW) == 0)
-                                               iface.DefineMembers (root);
-                                       else
-                                               Report1530 (iface.Location);
-                       }
-
 
                        if (type_container_resolve_order != null){
                                if (RootContext.StdLib){
@@ -659,6 +652,15 @@ namespace Mono.CSharp {
                                        else
                                                Report1530 (en.Location);
                        }
+
+                       //
+                       // Check for cycles in the struct layout
+                       //
+                       if (type_container_resolve_order != null){
+                               Hashtable seen = new Hashtable ();
+                               foreach (TypeContainer tc in type_container_resolve_order)
+                                       TypeManager.CheckStructCycles (tc, seen);
+                       }
                }
 
                //
@@ -680,14 +682,7 @@ namespace Mono.CSharp {
 
                        if (attribute_types != null)
                                foreach (TypeContainer tc in attribute_types)
-                                       tc.Define (root);
-                       
-                       if (interface_resolve_order != null){
-                               foreach (Interface iface in interface_resolve_order)
-                                       if ((iface.ModFlags & Modifiers.NEW) == 0)
-                                               iface.Define (root);
-                       }
-
+                                       tc.Define ();
 
                        if (type_container_resolve_order != null){
                                foreach (TypeContainer tc in type_container_resolve_order) {
@@ -700,7 +695,7 @@ namespace Mono.CSharp {
                                                continue;
 
                                        if ((tc.ModFlags & Modifiers.NEW) == 0)
-                                               tc.Define (root);
+                                               tc.Define ();
                                }
                        }
 
@@ -708,43 +703,40 @@ namespace Mono.CSharp {
                        if (delegates != null){
                                foreach (Delegate d in delegates)
                                        if ((d.ModFlags & Modifiers.NEW) == 0)
-                                               d.Define (root);
+                                               d.Define ();
                        }
 
                        ArrayList enums = root.Enums;
                        if (enums != null){
                                foreach (Enum en in enums)
                                        if ((en.ModFlags & Modifiers.NEW) == 0)
-                                               en.Define (root);
+                                               en.Define ();
                        }
                }
 
                static public void EmitCode ()
                {
-                       //
-                       // Because of the strange way in which we do things, global
-                       // attributes must be processed first.
-                       //
-                       CodeGen.Assembly.Emit ();
-                       CodeGen.Module.Emit ();
-                        
                        if (attribute_types != null)
                                foreach (TypeContainer tc in attribute_types)
-                                       tc.Emit ();
+                                       tc.EmitType ();
+
+                       CodeGen.Assembly.Emit (Tree.Types);
+                       CodeGen.Module.Emit (Tree.Types);
+                        
+                       if (Tree.Types.Enums != null) {
+                               foreach (Enum e in Tree.Types.Enums)
+                                       e.Emit ();
+                       }
 
-                        if (interface_resolve_order != null){
-                               foreach (Interface iface in interface_resolve_order)
-                                        iface.Emit ();
-                       }                        
-                       
                        if (type_container_resolve_order != null) {
                                foreach (TypeContainer tc in type_container_resolve_order)
-                                       tc.EmitConstants ();
-                               
-                               foreach (TypeContainer tc in type_container_resolve_order)
-                                       tc.Emit ();
+                                       tc.EmitType ();
                        }
                        
+                       if (Tree.Types.Delegates != null) {
+                               foreach (Delegate d in Tree.Types.Delegates)
+                                       d.Emit ();
+                       }                       
                        //
                        // Run any hooks after all the types have been defined.
                        // This is used to create nested auxiliary classes for example