Author: ankit
Date: 2005-11-28 05:04:12 -0500 (Mon, 28 Nov 2005)
New Revision: 53543
Modified:
trunk/mcs/ilasm/codegen/ChangeLog
trunk/mcs/ilasm/codegen/ExternTable.cs
trunk/mcs/ilasm/codegen/ExternTypeRef.cs
Log:
* ExternTypeRef.cs (extern_table): Remove unused field.
(.ctor): Remove parameter for extern_table. Update usage accordingly.
* ExternTable.cs (IScope): Remove unused 'table' parameter.
(ExternRef): Change IScope interface implementation accordingly. Update
call to ExternTypeRef.ctor for the previous change.
Modified: trunk/mcs/ilasm/codegen/ChangeLog
===================================================================
--- trunk/mcs/ilasm/codegen/ChangeLog 2005-11-28 09:52:05 UTC (rev 53542)
+++ trunk/mcs/ilasm/codegen/ChangeLog 2005-11-28 10:04:12 UTC (rev 53543)
@@ -1,3 +1,11 @@
+2005-11-28 Ankit Jain <[EMAIL PROTECTED]>
+
+ * ExternTypeRef.cs (extern_table): Remove unused field.
+ (.ctor): Remove parameter for extern_table. Update usage accordingly.
+ * ExternTable.cs (IScope): Remove unused 'table' parameter.
+ (ExternRef): Change IScope interface implementation accordingly. Update
+ call to ExternTypeRef.ctor for the previous change.
+
2005-09-15 Ankit Jain <[EMAIL PROTECTED]>
* DeclSecurity.cs (IDeclSecurityTarget.AddDeclSecurity): Remove.
Modified: trunk/mcs/ilasm/codegen/ExternTable.cs
===================================================================
--- trunk/mcs/ilasm/codegen/ExternTable.cs 2005-11-28 09:52:05 UTC (rev
53542)
+++ trunk/mcs/ilasm/codegen/ExternTable.cs 2005-11-28 10:04:12 UTC (rev
53543)
@@ -15,7 +15,7 @@
namespace Mono.ILASM {
public interface IScope {
- ExternTypeRef GetTypeRef (string full_name, bool is_valuetype,
ExternTable table);
+ ExternTypeRef GetTypeRef (string full_name, bool is_valuetype);
PEAPI.ClassRef GetType (string full_name, bool is_valuetype);
}
@@ -49,7 +49,7 @@
customattr_list.Add (customattr);
}
- public ExternTypeRef GetTypeRef (string full_name, bool
is_valuetype, ExternTable table)
+ public ExternTypeRef GetTypeRef (string full_name, bool
is_valuetype)
{
string first= full_name;
string rest = "";
@@ -65,11 +65,11 @@
if (is_valuetype && rest == "")
type_ref.MakeValueClass ();
} else {
- type_ref = new ExternTypeRef (this, first,
is_valuetype, table);
+ type_ref = new ExternTypeRef (this, first,
is_valuetype);
typeref_table [first] = type_ref;
}
- return (rest == "" ? type_ref : type_ref.GetTypeRef
(rest, is_valuetype, table));
+ return (rest == "" ? type_ref : type_ref.GetTypeRef
(rest, is_valuetype));
}
public PEAPI.ClassRef GetType (string full_name, bool
is_valuetype)
@@ -305,7 +305,7 @@
if (ext_asmb == null)
throw new Exception (String.Format ("Assembly
{0} not defined.", asmb_name));
- return ext_asmb.GetTypeRef (full_name, is_valuetype,
this);
+ return ext_asmb.GetTypeRef (full_name, is_valuetype);
}
public ExternTypeRef GetModuleTypeRef (string mod_name, string
full_name, bool is_valuetype)
@@ -316,7 +316,7 @@
if (mod == null)
throw new Exception (String.Format ("Module
{0} not defined.", mod_name));
- return mod.GetTypeRef (full_name, is_valuetype, this);
+ return mod.GetTypeRef (full_name, is_valuetype);
}
public static void GetNameAndNamespace (string full_name,
Modified: trunk/mcs/ilasm/codegen/ExternTypeRef.cs
===================================================================
--- trunk/mcs/ilasm/codegen/ExternTypeRef.cs 2005-11-28 09:52:05 UTC (rev
53542)
+++ trunk/mcs/ilasm/codegen/ExternTypeRef.cs 2005-11-28 10:04:12 UTC (rev
53543)
@@ -23,7 +23,6 @@
private string full_name;
private string sig_mod;
private bool is_valuetype;
- private ExternTable extern_table;
private bool is_resolved;
@@ -33,12 +32,11 @@
private Hashtable field_table;
public ExternTypeRef (IScope extern_ref, string full_name,
- bool is_valuetype, ExternTable extern_table)
+ bool is_valuetype)
{
this.extern_ref = extern_ref;
this.full_name = full_name;
this.is_valuetype = is_valuetype;
- this.extern_table = extern_table;
sig_mod = String.Empty;
nestedclass_table = new Hashtable ();
@@ -50,9 +48,8 @@
}
private ExternTypeRef (IScope extern_ref, string full_name,
- bool is_valuetype, ExternTable extern_table,
- ArrayList conv_list) : this (extern_ref,
full_name,
- is_valuetype, extern_table)
+ bool is_valuetype, ArrayList conv_list) : this
(
+ extern_ref, full_name, is_valuetype)
{
ConversionList = conv_list;
}
@@ -60,7 +57,7 @@
public ExternTypeRef Clone ()
{
return new ExternTypeRef (extern_ref, full_name,
is_valuetype,
- extern_table, (ArrayList)
ConversionList.Clone ());
+ (ArrayList) ConversionList.Clone ());
}
public PEAPI.Type PeapiType {
@@ -132,7 +129,7 @@
return fr;
}
- public ExternTypeRef GetTypeRef (string _name, bool
is_valuetype, ExternTable table)
+ public ExternTypeRef GetTypeRef (string _name, bool
is_valuetype)
{
string first= _name;
string rest = "";
@@ -149,11 +146,11 @@
if (is_valuetype && rest == "")
ext_typeref.MakeValueClass ();
} else {
- ext_typeref = new ExternTypeRef (this, first,
is_valuetype, table);
+ ext_typeref = new ExternTypeRef (this, first,
is_valuetype);
nestedtypes_table [first] = ext_typeref;
}
- return (rest == "" ? ext_typeref :
ext_typeref.GetTypeRef (rest, is_valuetype, table));
+ return (rest == "" ? ext_typeref :
ext_typeref.GetTypeRef (rest, is_valuetype));
}
public PEAPI.IExternRef GetExternTypeRef ()
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
