* DeclSecurity.cs (IDeclSecurityTarget): Remove AddPermission &

AddPermissionSet methods. Add 'DeclSecurity' property.
* TypeDef.cs: Update implementation of IDeclSecurityTarget interface.
* MethodDef.cs: Likewise.
* ExternTable.cs: Likewise.
* CodeGen.cs (CodeGen.AddPermission): Use IDeclSecurityTarget.DeclSecurity .

svn path=/trunk/mcs/; revision=60978

6 files changed, 36 insertions, 52 deletions

diff --git a/mcs/ilasm/codegen/ChangeLog b/mcs/ilasm/codegen/ChangeLog
index c94d374a2db..e47bf30af71 100644
--- a/mcs/ilasm/codegen/ChangeLog
+++ b/mcs/ilasm/codegen/ChangeLog
@@ -1,3 +1,12 @@
+2006-05-23  Ankit Jain  <jankit@novell.com>
+
+	* DeclSecurity.cs (IDeclSecurityTarget): Remove AddPermission &
+	AddPermissionSet methods. Add 'DeclSecurity' property.
+	* TypeDef.cs: Update implementation of IDeclSecurityTarget interface.
+	* MethodDef.cs: Likewise.
+	* ExternTable.cs: Likewise.
+	* CodeGen.cs (CodeGen.AddPermission): Use IDeclSecurityTarget.DeclSecurity .
+
 2006-05-11  Ankit Jain  <jankit@novell.com>
 
 	* CodeGen.cs (CodeGen.AddDataDef): Use Report.Error for consistent error
diff --git a/mcs/ilasm/codegen/CodeGen.cs b/mcs/ilasm/codegen/CodeGen.cs
index eb653af93ae..eab7668acac 100644
--- a/mcs/ilasm/codegen/CodeGen.cs
+++ b/mcs/ilasm/codegen/CodeGen.cs
@@ -476,9 +476,9 @@ namespace Mono.ILASM {
 

                         PermissionSet ps = perm as PermissionSet;

                         if (ps == null)

-                                CurrentDeclSecurityTarget.AddPermission (sec_action, (IPermission) perm);

+                                CurrentDeclSecurityTarget.DeclSecurity.AddPermission (sec_action, (IPermission) perm);

                         else

-                                CurrentDeclSecurityTarget.AddPermissionSet (sec_action, ps);

+                                CurrentDeclSecurityTarget.DeclSecurity.AddPermissionSet (sec_action, ps);

                 }

 

                 public void Write ()

diff --git a/mcs/ilasm/codegen/DeclSecurity.cs b/mcs/ilasm/codegen/DeclSecurity.cs
index 274d05e1d15..66e5e9338f6 100644
--- a/mcs/ilasm/codegen/DeclSecurity.cs
+++ b/mcs/ilasm/codegen/DeclSecurity.cs
@@ -16,8 +16,7 @@ using System.Security.Permissions;
 namespace Mono.ILASM {
 
         public interface IDeclSecurityTarget {
-                void AddPermission (PEAPI.SecurityAction sec_action, IPermission iper);
-                void AddPermissionSet (PEAPI.SecurityAction sec_action, PermissionSet perm_set);
+                DeclSecurity DeclSecurity { get; }
         }
 
         public class DeclSecurity {
diff --git a/mcs/ilasm/codegen/ExternTable.cs b/mcs/ilasm/codegen/ExternTable.cs
index 659f0b462a5..7d4dd7da229 100644
--- a/mcs/ilasm/codegen/ExternTable.cs
+++ b/mcs/ilasm/codegen/ExternTable.cs
@@ -159,6 +159,14 @@ namespace Mono.ILASM {
                         }
                 }
 
+                public DeclSecurity DeclSecurity {
+                        get {
+                                if (decl_sec == null)
+                                        decl_sec = new DeclSecurity ();
+                                return decl_sec;
+                        }
+                }
+
                 public override void Resolve (CodeGen code_gen)
                 {
                         if (is_resolved)
@@ -193,22 +201,6 @@ namespace Mono.ILASM {
                         return AssemblyRef;
                 }
                 
-                public void AddPermissionSet (PEAPI.SecurityAction sec_action, PermissionSet ps)
-                {
-                        if (decl_sec == null)
-                                decl_sec = new DeclSecurity ();
-
-                        decl_sec.AddPermissionSet (sec_action, ps);        
-                }
-                
-                public void AddPermission (PEAPI.SecurityAction sec_action, IPermission iper)
-                {
-                        if (decl_sec == null)
-                                decl_sec = new DeclSecurity ();
-
-                        decl_sec.AddPermission (sec_action, iper);
-                }
-
                 public void SetVersion (int major, int minor, int build, int revision)
                 {
                         this.major = major;
diff --git a/mcs/ilasm/codegen/MethodDef.cs b/mcs/ilasm/codegen/MethodDef.cs
index d8329115bf6..90bbd29e840 100644
--- a/mcs/ilasm/codegen/MethodDef.cs
+++ b/mcs/ilasm/codegen/MethodDef.cs
@@ -128,6 +128,14 @@ namespace Mono.ILASM {
                         get { return (meth_attr & PEAPI.MethAttr.Abstract) != 0; }
                 }
 
+                public DeclSecurity DeclSecurity {
+                        get {
+                                if (decl_sec == null)
+                                        decl_sec = new DeclSecurity ();
+                                return decl_sec;
+                        }
+                }
+
                 public BaseTypeRef[] ParamTypeList () {
 
                         if (param_list == null)
@@ -192,22 +200,6 @@ namespace Mono.ILASM {
                         customattr_list.Add (customattr);
                 }
 
-                public void AddPermissionSet (PEAPI.SecurityAction sec_action, PermissionSet ps)
-                {
-                        if (decl_sec == null)
-                                decl_sec = new DeclSecurity ();
-                        
-                        decl_sec.AddPermissionSet (sec_action, ps);
-                }
-                
-                public void AddPermission (PEAPI.SecurityAction sec_action, IPermission iper)
-                {
-                        if (decl_sec == null)
-                                decl_sec = new DeclSecurity ();
-                        
-                        decl_sec.AddPermission (sec_action, iper);
-                }
-
                 public void AddRetTypeMarshalInfo (PEAPI.NativeType native_type)
                 {
                         this.ret_native_type = native_type;
diff --git a/mcs/ilasm/codegen/TypeDef.cs b/mcs/ilasm/codegen/TypeDef.cs
index 6dafb428c43..b391f838bdc 100644
--- a/mcs/ilasm/codegen/TypeDef.cs
+++ b/mcs/ilasm/codegen/TypeDef.cs
@@ -132,6 +132,14 @@ namespace Mono.ILASM {
                         get { return gen_params; }
                 }
 
+                public DeclSecurity DeclSecurity {
+                        get {
+                                if (decl_sec == null)
+                                        decl_sec = new DeclSecurity ();
+                                return decl_sec;
+                        }
+                }
+
                 public void AddOverride (MethodDef body, BaseTypeRef parent, string name)
                 {
                         if (override_list == null)
@@ -237,22 +245,6 @@ namespace Mono.ILASM {
                         customattr_list.Add (customattr);
                 }
 
-                public void AddPermissionSet (PEAPI.SecurityAction sec_action, PermissionSet ps)
-                {
-                        if (decl_sec == null)
-                                decl_sec = new DeclSecurity ();
-
-                        decl_sec.AddPermissionSet (sec_action, ps);
-                }
-
-                public void AddPermission (PEAPI.SecurityAction sec_action, IPermission iper)
-                {
-                        if (decl_sec == null)
-                                decl_sec = new DeclSecurity ();
-
-                        decl_sec.AddPermission (sec_action, iper);
-                }
-
                 public GenericParameter GetGenericParam (string id)
                 {
                         if (gen_params == null)