public const int VIRTUAL = 0x0200;
public const int OVERRIDE = 0x0400;
public const int EXTERN = 0x0800;
- public const int TOP = 0x0800;
+ public const int VOLATILE = 0x1000;
+ public const int UNSAFE = 0x2000;
+ public const int TOP = 0x2000;
+
+ public const int PROPERTY_CUSTOM = 0x4000; // Custom property modifier
+ public const int PARTIAL = 0x20000;
+ public const int DEFAULT_ACCESS_MODIFER = 0x40000;
+
+ //
+ // We use this internally to flag that the method contains an iterator
+ //
+ public const int METHOD_YIELDS = 0x8000;
+ public const int METHOD_GENERIC = 0x10000;
public const int Accessibility =
PUBLIC | PROTECTED | INTERNAL | PRIVATE;
+ public const int AllowedExplicitImplFlags =
+ UNSAFE | EXTERN;
static public string Name (int i)
{
s = "override"; break;
case Modifiers.EXTERN:
s = "extern"; break;
+ case Modifiers.VOLATILE:
+ s = "volatile"; break;
+ case Modifiers.UNSAFE:
+ s = "unsafe"; break;
}
return s;
}
- public static TypeAttributes TypeAttr (int mod_flags, TypeContainer caller)
+ public static string GetDescription (MethodAttributes ma)
+ {
+ if ((ma & MethodAttributes.Assembly) != 0)
+ return "internal";
+
+ if ((ma & MethodAttributes.Family) != 0)
+ return "protected";
+
+ if ((ma & MethodAttributes.Public) != 0)
+ return "public";
+
+ if ((ma & MethodAttributes.FamANDAssem) != 0)
+ return "protected internal";
+
+ if ((ma & MethodAttributes.Private) != 0)
+ return "private";
+
+ throw new NotImplementedException (ma.ToString ());
+ }
+
+ public static TypeAttributes TypeAttr (int mod_flags, bool is_toplevel)
{
TypeAttributes t = 0;
- bool top_level = caller.IsTopLevel;
-
- if (top_level){
+
+ if (is_toplevel){
if ((mod_flags & PUBLIC) != 0)
t |= TypeAttributes.Public;
if ((mod_flags & PRIVATE) != 0)
if ((mod_flags & ABSTRACT) != 0)
t |= TypeAttributes.Abstract;
- // If we do not have static constructors, static methods
- // can be invoked without initializing the type.
- if (!caller.HaveStaticConstructor)
- t |= TypeAttributes.BeforeFieldInit;
-
return t;
}
fa |= FieldAttributes.Public;
if ((mod_flags & PRIVATE) != 0)
fa |= FieldAttributes.Private;
- if ((mod_flags & PROTECTED) != 0 && (mod_flags & INTERNAL) != 0)
- fa |= FieldAttributes.FamORAssem;
- if ((mod_flags & PROTECTED) != 0)
- fa |= FieldAttributes.Family;
- if ((mod_flags & INTERNAL) != 0)
- fa |= FieldAttributes.Assembly;
+ if ((mod_flags & PROTECTED) != 0){
+ if ((mod_flags & INTERNAL) != 0)
+ fa |= FieldAttributes.FamORAssem;
+ else
+ fa |= FieldAttributes.Family;
+ } else {
+ if ((mod_flags & INTERNAL) != 0)
+ fa |= FieldAttributes.Assembly;
+ }
if ((mod_flags & STATIC) != 0)
fa |= FieldAttributes.Static;
public static MethodAttributes MethodAttr (int mod_flags)
{
- MethodAttributes ma = 0;
+ MethodAttributes ma = MethodAttributes.HideBySig;
if ((mod_flags & PUBLIC) != 0)
ma |= MethodAttributes.Public;
if ((mod_flags & PRIVATE) != 0)
ma |= MethodAttributes.Private;
- if ((mod_flags & PROTECTED) != 0 && (mod_flags & INTERNAL) != 0)
- ma |= MethodAttributes.FamORAssem;
- if ((mod_flags & PROTECTED) != 0)
- ma |= MethodAttributes.Family;
- if ((mod_flags & INTERNAL) != 0)
- ma |= MethodAttributes.Assembly;
-
+ if ((mod_flags & PROTECTED) != 0){
+ if ((mod_flags & INTERNAL) != 0)
+ ma |= MethodAttributes.FamORAssem;
+ else
+ ma |= MethodAttributes.Family;
+ } else {
+ if ((mod_flags & INTERNAL) != 0)
+ ma |= MethodAttributes.Assembly;
+ }
if ((mod_flags & STATIC) != 0)
ma |= MethodAttributes.Static;
if ((mod_flags & ABSTRACT) != 0){
- ma |= MethodAttributes.Abstract | MethodAttributes.Virtual |
- MethodAttributes.NewSlot;
+ ma |= MethodAttributes.Abstract | MethodAttributes.Virtual;
}
if ((mod_flags & SEALED) != 0)
ma |= MethodAttributes.Final;
+
if ((mod_flags & VIRTUAL) != 0)
ma |= MethodAttributes.Virtual;
if ((mod_flags & OVERRIDE) != 0)
- ma |= MethodAttributes.Virtual | MethodAttributes.HideBySig;
+ ma |= MethodAttributes.Virtual;
else {
if ((ma & MethodAttributes.Virtual) != 0)
ma |= MethodAttributes.NewSlot;
}
- if ((mod_flags & NEW) != 0)
- ma |= MethodAttributes.HideBySig;
-
return ma;
}
// Returns the new mask. Side effect: reports any
// incorrect attributes.
// </summary>
- public static int Check (int allowed, int mod, int def_access)
+ public static int Check (int allowed, int mod, int def_access, Location l)
{
int invalid_flags = (~allowed) & mod;
int i;
if (invalid_flags == 0){
int a = mod;
+ if ((mod & Modifiers.UNSAFE) != 0){
+ RootContext.CheckUnsafeOption (l);
+ }
+
//
// If no accessibility bits provided
// then provide the defaults.
//
if ((mod & Accessibility) == 0){
mod |= def_access;
+ if (def_access != 0)
+ mod |= DEFAULT_ACCESS_MODIFER;
return mod;
}
a = ((a & 2) >> 1) + (a & 5);
a = ((a & 4) >> 2) + (a & 3);
if (a > 1)
- CSharpParser.error (107, "More than one protection modifier specified");
+ Report.Error (107, l, "More than one protection modifier specified");
return mod;
}
- for (i = 1; i < TOP; i <<= 1){
+ for (i = 1; i <= TOP; i <<= 1){
if ((i & invalid_flags) == 0)
continue;
- CSharpParser.error (106, "the modifier `" + Name (i) + "' is not valid for this item");
+ Error_InvalidModifier (l, Name (i));
}
return allowed & mod;
}
+
+ public static void Error_InvalidModifier (Location l, string name)
+ {
+ Report.Error (106, l, "The modifier `" + name + "' is not valid for this item");
+ }
}
}
projects / mono.git / blobdiff