2004-08-06 Bernie Solomon <bernard@ugsolutions.com>

[mono.git] / mcs / mbas / const.cs

diff --git a/mcs/mbas/const.cs b/mcs/mbas/const.cs
index 44bce7bac54aa2aa43bd5ed229eed73570aeaed9..9e197c55642ba293f8b0d497c0ce99ddfc55e2bb 100644 (file)
--- a/mcs/mbas/const.cs
+++ b/mcs/mbas/const.cs
@@ -132,18 +132,30 @@ namespace Mono.MonoBASIC {
                                
                                if ((list.Count > 0) && ((ModFlags & Modifiers.SHADOWS) == 0))
                                        Report.Warning (
-                                                       40004, 2, Location, 
-                                                       "Const '" + Name + "' should be declared " +
-                            "Shadows since the base type '" + ptype.Name /*parent.MakeName (Name)*/ + 
-                                                       "' has a Const with same name");
-
-                               /*if (list.Count == 0)
-                                       if ((ModFlags & Modifiers.NEW) != 0)
+                                               40004, 2, Location, 
+                                               "Const '" + Name + "' should be declared " +
+                                               "Shadows since the base type '" + ptype.Name + 
+                                               "' has a Const with same name");
+                               if (list.Count == 0) {
+                                       // if a member of module is not inherited from Object class
+                                       // can not be declared protected
+                                       if ((parent is Module) && ((ModFlags & Modifiers.PROTECTED) != 0))
+                                               Report.Error (30593, Location,
+                                                       "'Const' inside a 'Module' can not be " +
+                                                       "declared as 'Protected'");
+
+                                       /*if ((ModFlags & Modifiers.NEW) != 0)
                                                WarningNotHiding (parent);*/
-
-                       } /*else if ((ModFlags & Modifiers.NEW) != 0)
+                               }
+                       } 
+                       /*else if ((ModFlags & Modifiers.NEW) != 0)
                                WarningNotHiding (parent);*/
 
+                       if ((parent is Struct) && ((ModFlags & Modifiers.PROTECTED) != 0))
+                               Report.Error (30435, Location,
+                                       "'Const' inside a 'Structure' can not be " +
+                                       "declared as 'Protected'");
+
                        FieldBuilder = parent.TypeBuilder.DefineField (Name, type, FieldAttr);
 
                        TypeManager.RegisterConstant (FieldBuilder, this);