2002-03-06 Miguel de Icaza <miguel@ximian.com>

[mono.git] / mcs / mcs / decl.cs

diff --git a/mcs/mcs/decl.cs b/mcs/mcs/decl.cs
index ebda903b5cf3484b6f12b65414caf569fed59d45..012a246f161f78867b769cf192375255d8e3d649 100755 (executable)
--- a/mcs/mcs/decl.cs
+++ b/mcs/mcs/decl.cs
@@ -72,11 +72,20 @@ namespace Mono.CSharp {
                                if (!(mb.IsAbstract || mb.IsVirtual)){
                                        Report.Error (
                                                506, Location, parent.MakeName (Name) +
-                                               ": cannot override inherited member `" +
-                                               mb.ReflectedType.Name + "' because it is not " +
+                                               ": cannot override inherited member " +
+                                               MethodBaseName (mb) + " because it is not " +
                                                "virtual, abstract or override");
                                        ok = false;
                                }
+                               
+                               // Now we check that the overriden method is not final
+                               
+                               if (mb.IsFinal) {
+                                       Report.Error (239, Location, parent.MakeName (Name) + " : cannot " +
+                                                     "override inherited member " + MethodBaseName (mb) +
+                                                     " because it is sealed.");
+                                       ok = false;
+                               }
                        }
 
                        if (mb.IsVirtual || mb.IsAbstract){
@@ -94,6 +103,24 @@ namespace Mono.CSharp {
                }
 
                public abstract bool Define (TypeContainer parent);
+
+               // 
+               // Whehter is it ok to use an unsafe pointer in this type container
+               //
+               public bool UnsafeOK (DeclSpace parent)
+               {
+                       //
+                       // First check if this MemberCore modifier flags has unsafe set
+                       //
+                       if ((ModFlags & Modifiers.UNSAFE) != 0)
+                               return true;
+
+                       if (parent.UnsafeContext)
+                               return true;
+
+                       Expression.UnsafeError (Location);
+                       return false;
+               }
        }
 
        //
@@ -170,11 +197,14 @@ namespace Mono.CSharp {
                /// </summary>
                protected Hashtable defined_names;
 
-               public DeclSpace (string name, Location l)
+               TypeContainer parent;           
+
+               public DeclSpace (TypeContainer parent, string name, Location l)
                        : base (name, l)
                {
                        Basename = name.Substring (1 + name.LastIndexOf ('.'));
                        defined_names = new Hashtable ();
+                       this.parent = parent;
                }
 
                /// <summary>
@@ -228,6 +258,12 @@ namespace Mono.CSharp {
                        }
                }
 
+               public TypeContainer Parent {
+                       get {
+                               return parent;
+                       }
+               }
+
                public virtual void CloseType ()
                {
                        if (!Created){
@@ -248,5 +284,19 @@ namespace Mono.CSharp {
                                Created = true;
                        }
                }
+
+               //
+               // Whether this is an `unsafe context'
+               //
+               public bool UnsafeContext {
+                       get {
+                               if ((ModFlags & Modifiers.UNSAFE) != 0)
+                                       return true;
+                               if (parent != null)
+                                       return parent.UnsafeContext;
+                               return false;
+                       }
+               }
+
        }
 }