static public Type ienumerator_type;
static public Type ienumerable_type;
static public Type idisposable_type;
+ static public Type iconvertible_type;
static public Type default_member_type;
static public Type iasyncresult_type;
static public Type asynccallback_type;
static public Type intptr_type;
static public Type monitor_type;
static public Type runtime_field_handle_type;
+ static public Type runtime_argument_handle_type;
static public Type attribute_type;
static public Type attribute_usage_type;
static public Type dllimport_type;
static public Type indexer_name_type;
static public Type exception_type;
static public Type invalid_operation_exception_type;
- static public object obsolete_attribute_type;
- static public object conditional_attribute_type;
+ static public Type obsolete_attribute_type;
+ static public Type conditional_attribute_type;
static public Type in_attribute_type;
+ static public Type cls_compliant_attribute_type;
+ static public Type typed_reference_type;
+ static public Type arg_iterator_type;
+ static public Type mbr_type;
+ static public Type struct_layout_attribute_type;
+ static public Type field_offset_attribute_type;
//
// An empty array of types
//
static public Type [] NoTypes;
+ static public TypeExpr [] NoTypeExprs;
//
// Expressions representing the internal types. Used during declaration
// definition.
//
- static public Expression system_object_expr, system_string_expr;
- static public Expression system_boolean_expr, system_decimal_expr;
- static public Expression system_single_expr, system_double_expr;
- static public Expression system_sbyte_expr, system_byte_expr;
- static public Expression system_int16_expr, system_uint16_expr;
- static public Expression system_int32_expr, system_uint32_expr;
- static public Expression system_int64_expr, system_uint64_expr;
- static public Expression system_char_expr, system_void_expr;
- static public Expression system_asynccallback_expr;
- static public Expression system_iasyncresult_expr;
+ static public TypeExpr system_object_expr, system_string_expr;
+ static public TypeExpr system_boolean_expr, system_decimal_expr;
+ static public TypeExpr system_single_expr, system_double_expr;
+ static public TypeExpr system_sbyte_expr, system_byte_expr;
+ static public TypeExpr system_int16_expr, system_uint16_expr;
+ static public TypeExpr system_int32_expr, system_uint32_expr;
+ static public TypeExpr system_int64_expr, system_uint64_expr;
+ static public TypeExpr system_char_expr, system_void_expr;
+ static public TypeExpr system_asynccallback_expr;
+ static public TypeExpr system_iasyncresult_expr;
+ static public TypeExpr system_valuetype_expr;
//
// This is only used when compiling corlib
static public MethodInfo string_concat_string_string;
static public MethodInfo string_concat_string_string_string;
static public MethodInfo string_concat_string_string_string_string;
+ static public MethodInfo string_concat_string_dot_dot_dot;
static public MethodInfo string_concat_object_object;
+ static public MethodInfo string_concat_object_object_object;
+ static public MethodInfo string_concat_object_dot_dot_dot;
static public MethodInfo string_isinterneted_string;
static public MethodInfo system_type_get_type_from_handle;
static public MethodInfo object_getcurrent_void;
static Assembly [] assemblies;
// <remarks>
- // Keeps a list of module builders. We used this to do lookups
- // on the modulebuilder using GetType -- needed for arrays
+ // Keeps a list of modules. We used this to do lookups
+ // on the module using GetType -- needed for arrays
// </remarks>
- static ModuleBuilder [] modules;
+ static Module [] modules;
// <remarks>
// This is the type_cache from the assemblies to avoid
static Hashtable method_internal_params;
// <remarks>
- // Keeps track of attribute types
+ // Keeps track of methods
// </remarks>
- static Hashtable builder_to_attr;
+ static Hashtable builder_to_method;
// <remarks>
- // Keeps track of methods
+ // Contains all public types from referenced assemblies.
+ // This member is used only if CLS Compliance verification is required.
// </remarks>
-
- static Hashtable builder_to_method;
+ public static Hashtable all_imported_types;
struct Signature {
public string name;
public Type [] args;
}
+
+ public static void CleanUp ()
+ {
+ // Lets get everything clean so that we can collect before generating code
+ assemblies = null;
+ modules = null;
+ types = null;
+ typecontainers = null;
+ user_types = null;
+ builder_to_declspace = null;
+ builder_to_ifaces = null;
+ method_arguments = null;
+ indexer_arguments = null;
+ method_internal_params = null;
+ builder_to_method = null;
+
+ fields = null;
+ references = null;
+ negative_hits = null;
+ builder_to_constant = null;
+ fieldbuilders_to_fields = null;
+ events = null;
+ priv_fields_events = null;
+ properties = null;
+
+ TypeHandle.CleanUp ();
+ }
/// <summary>
/// A filter for Findmembers that uses the Signature object to
system_void_expr = new TypeLookupExpression ("System.Void");
system_asynccallback_expr = new TypeLookupExpression ("System.AsyncCallback");
system_iasyncresult_expr = new TypeLookupExpression ("System.IAsyncResult");
+ system_valuetype_expr = new TypeLookupExpression ("System.ValueType");
}
-
+
static TypeManager ()
{
assemblies = new Assembly [0];
typecontainers = new Hashtable ();
builder_to_declspace = new PtrHashtable ();
- builder_to_attr = new PtrHashtable ();
builder_to_method = new PtrHashtable ();
method_arguments = new PtrHashtable ();
method_internal_params = new PtrHashtable ();
builder_to_ifaces = new PtrHashtable ();
NoTypes = new Type [0];
+ NoTypeExprs = new TypeExpr [0];
signature_filter = new MemberFilter (SignatureFilter);
InitExpressionTypes ();
return;
}
- Location l;
tc = builder_to_declspace [t] as TypeContainer;
if (tc != null){
Report.Warning (
types.Add (name, t);
}
- public static void AddUserType (string name, TypeBuilder t, Type [] ifaces)
+ public static void AddUserType (string name, TypeBuilder t, TypeExpr[] ifaces)
{
try {
types.Add (name, t);
//
// This entry point is used by types that we define under the covers
//
- public static void RegisterBuilder (TypeBuilder tb, Type [] ifaces)
+ public static void RegisterBuilder (TypeBuilder tb, TypeExpr [] ifaces)
{
if (ifaces != null)
builder_to_ifaces [tb] = ifaces;
}
- public static void AddUserType (string name, TypeBuilder t, TypeContainer tc, Type [] ifaces)
+ public static void AddUserType (string name, TypeBuilder t, TypeContainer tc, TypeExpr [] ifaces)
{
builder_to_declspace.Add (t, tc);
typecontainers.Add (name, tc);
builder_to_declspace.Add (t, en);
}
- public static void AddUserInterface (string name, TypeBuilder t, Interface i, Type [] ifaces)
+ public static void AddUserInterface (string name, TypeBuilder t, Interface i, TypeExpr [] ifaces)
{
AddUserType (name, t, ifaces);
builder_to_declspace.Add (t, i);
}
- public static void AddMethod (MethodBuilder builder, MethodData method)
+
+ public static void AddMethod (MethodBase builder, IMethodData method)
{
builder_to_method.Add (builder, method);
}
- public static void RegisterAttrType (Type t, TypeContainer tc)
+ public static IMethodData GetMethod (MethodBase builder)
{
- builder_to_attr.Add (t, tc);
+ return (IMethodData) builder_to_method [builder];
}
/// <summary>
{
return builder_to_declspace [t] as Enum;
}
-
- public static TypeContainer LookupAttr (Type t)
+
+ public static Class LookupClass (Type t)
{
- return (TypeContainer) builder_to_attr [t];
+ return (Class) builder_to_declspace [t];
}
/// <summary>
/// </summary>
public static void AddAssembly (Assembly a)
{
+ foreach (Assembly assembly in assemblies) {
+ if (a == assembly)
+ return;
+ }
+
int top = assemblies.Length;
Assembly [] n = new Assembly [top + 1];
assemblies = n;
}
+ public static Assembly [] GetAssemblies ()
+ {
+ return assemblies;
+ }
+
/// <summary>
/// Registers a module builder to lookup types from
/// </summary>
- public static void AddModule (ModuleBuilder mb)
+ public static void AddModule (Module mb)
{
int top = modules != null ? modules.Length : 0;
- ModuleBuilder [] n = new ModuleBuilder [top + 1];
+ Module [] n = new Module [top + 1];
if (modules != null)
modules.CopyTo (n, 0);
modules = n;
}
+ public static Module[] Modules {
+ get {
+ return modules;
+ }
+ }
+
static Hashtable references = new Hashtable ();
//
//
if (ret == null){
if (references [t] == null)
- references [t] = CodeGen.ModuleBuilder.GetType (tname);
+ references [t] = CodeGen.Module.Builder.GetType (tname);
ret = (Type) references [t];
}
//
if (ret == null){
if (pointers [t] == null)
- pointers [t] = CodeGen.ModuleBuilder.GetType (tname);
+ pointers [t] = CodeGen.Module.Builder.GetType (tname);
ret = (Type) pointers [t];
}
if (t == null)
continue;
- TypeAttributes ta = t.Attributes & TypeAttributes.VisibilityMask;
- if (ta == TypeAttributes.NotPublic ||
- ta == TypeAttributes.NestedPrivate ||
- ta == TypeAttributes.NestedAssembly ||
- ta == TypeAttributes.NestedFamANDAssem)
- continue;
- return t;
+ do {
+ TypeAttributes ta = t.Attributes & TypeAttributes.VisibilityMask;
+ if (ta == TypeAttributes.NotPublic ||
+ ta == TypeAttributes.NestedPrivate ||
+ ta == TypeAttributes.NestedAssembly ||
+ ta == TypeAttributes.NestedFamANDAssem){
+
+ //
+ // In .NET pointers turn out to be private, even if their
+ // element type is not
+ //
+ if (t.IsPointer){
+ t = t.GetElementType ();
+ continue;
+ } else
+ t = null;
+ } else {
+ return t;
+ }
+ } while (t != null);
}
- foreach (ModuleBuilder mb in modules) {
+ foreach (Module mb in modules) {
t = mb.GetType (name);
- if (t != null){
+ if (t != null)
return t;
- }
}
+
return null;
}
Type t = (Type) types [name];
if (t != null)
return t;
-
+
+ if (negative_hits.Contains (name))
+ return null;
+
t = LookupTypeReflection (name);
+
if (t == null)
- return null;
-
- types [name] = t;
+ negative_hits [name] = null;
+ else
+ types [name] = t;
+
return t;
}
+
+ static readonly char [] dot_array = { '.' };
/// <summary>
/// Returns the Type associated with @name, takes care of the fact that
if (negative_hits.Contains (name))
return null;
- string [] elements = name.Split ('.');
+ // Sadly, split takes a param array, so this ends up allocating *EVERY TIME*
+ string [] elements = name.Split (dot_array);
int count = elements.Length;
for (int n = 1; n <= count; n++){
if (t == null){
t = LookupTypeReflection (top_level_type);
if (t == null){
- negative_hits [top_level_type] = true;
+ negative_hits [top_level_type] = null;
continue;
}
}
//Console.WriteLine ("Looking up: " + newt + " " + name);
t = LookupTypeReflection (newt);
if (t == null)
- negative_hits [name] = true;
+ negative_hits [name] = null;
else
types [name] = t;
return t;
}
- negative_hits [name] = true;
+ negative_hits [name] = null;
return null;
}
/// </summary>
public static void ComputeNamespaces ()
{
- MethodInfo assembly_get_namespaces = typeof (Assembly).GetMethod ("GetNamespaces");
+ MethodInfo assembly_get_namespaces = typeof (Assembly).GetMethod ("GetNamespaces", BindingFlags.Instance|BindingFlags.NonPublic);
//
// First add the assembly namespaces
//
if (assembly_get_namespaces != null){
int count = assemblies.Length;
- int total;
for (int i = 0; i < count; i++){
Assembly a = assemblies [i];
}
}
} else {
- foreach (Assembly a in assemblies){
- foreach (Type t in a.GetTypes ()){
+ Hashtable cache = new Hashtable ();
+ cache.Add ("", null);
+ foreach (Assembly a in assemblies) {
+ foreach (Type t in a.GetExportedTypes ()) {
string ns = t.Namespace;
-
- // t.Namespace returns null for <PrivateImplDetails>
- if (ns == ""|| ns == null)
+ if (ns == null || cache.Contains (ns))
continue;
+
Namespace.LookupNamespace (ns, true);
+ cache.Add (ns, null);
}
}
}
}
+ /// <summary>
+ /// Fills static table with exported types from all referenced assemblies.
+ /// This information is required for CLS Compliance tests.
+ /// </summary>
+ public static void LoadAllImportedTypes ()
+ {
+ if (!CodeGen.Assembly.IsClsCompliant)
+ return;
+
+ all_imported_types = new Hashtable ();
+ foreach (Assembly a in assemblies) {
+ foreach (Type t in a.GetExportedTypes ()) {
+ all_imported_types [t.FullName] = t;
+ }
+ }
+ }
+
public static bool NamespaceClash (string name, Location loc)
{
if (Namespace.LookupNamespace (name, false) == null)
}
/// <summary>
- /// Returns the signature of the method
- /// </summary>
- static public string CSharpSignature (MethodBase mb)
- {
- string sig = "(";
+ /// Returns the signature of the method with full namespace classification
+ /// </summary>
+ static public string GetFullNameSignature (MemberInfo mi)
+ {
+ return mi.DeclaringType.FullName.Replace ('+', '.') + '.' + mi.Name;
+ }
+
+ static public string GetFullNameSignature (MethodBase mb)
+ {
+ string name = mb.Name;
+ if (name == ".ctor")
+ name = mb.DeclaringType.Name;
+
+ if (mb.IsSpecialName) {
+ if (name.StartsWith ("get_") || name.StartsWith ("set_")) {
+ name = name.Remove (0, 4);
+ }
+
+ if (name == "Item")
+ name = "this";
+ }
+
+ return mb.DeclaringType.FullName.Replace ('+', '.') + '.' + name;
+ }
+
+ /// <summary>
+ /// Returns the signature of the property and indexer
+ /// </summary>
+ static public string CSharpSignature (PropertyBuilder pb, bool is_indexer)
+ {
+ if (!is_indexer) {
+ return GetFullNameSignature (pb);
+ }
+
+ MethodBase mb = pb.GetSetMethod (true) != null ? pb.GetSetMethod (true) : pb.GetGetMethod (true);
+ string signature = GetFullNameSignature (mb);
+ string arg = TypeManager.LookupParametersByBuilder (mb).ParameterDesc (0);
+ return String.Format ("{0}.this[{1}]", signature.Substring (0, signature.LastIndexOf ('.')), arg);
+ }
+
+ /// <summary>
+ /// Returns the signature of the method
+ /// </summary>
+ static public string CSharpSignature (MethodBase mb)
+ {
+ StringBuilder sig = new StringBuilder ("(");
//
// FIXME: We should really have a single function to do
// everything instead of the following 5 line pattern
//
- ParameterData iparams = LookupParametersByBuilder (mb);
+ ParameterData iparams = LookupParametersByBuilder (mb);
- if (iparams == null){
- ParameterInfo [] pi = mb.GetParameters ();
- iparams = new ReflectionParameters (pi);
- }
+ if (iparams == null)
+ iparams = new ReflectionParameters (mb);
+
+ // Is property
+ if (mb.IsSpecialName && iparams.Count == 0)
+ return GetFullNameSignature (mb);
- for (int i = 0; i < iparams.Count; i++) {
- if (i > 0) {
- sig += ", ";
- }
- sig += iparams.ParameterDesc(i);
- }
- sig += ")";
-
- return mb.DeclaringType.Name + "." + mb.Name + sig;
- }
+ for (int i = 0; i < iparams.Count; i++) {
+ if (i > 0) {
+ sig.Append (", ");
+ }
+ sig.Append (iparams.ParameterDesc (i));
+ }
+ sig.Append (")");
+
+ // Is indexer
+ if (mb.IsSpecialName && iparams.Count == 1) {
+ sig.Replace ('(', '[');
+ sig.Replace (')', ']');
+ }
+
+ return GetFullNameSignature (mb) + sig.ToString ();
+ }
/// <summary>
/// Looks up a type, and aborts if it is not found. This is used
if (t == null){
Report.Error (518, "The predefined type `" + name + "' is not defined or imported");
- Environment.Exit (0);
+ Environment.Exit (1);
}
return t;
/// Returns the MethodInfo for a method named `name' defined
/// in type `t' which takes arguments of types `args'
/// </summary>
- static MethodInfo GetMethod (Type t, string name, Type [] args, bool report_errors)
+ static MethodInfo GetMethod (Type t, string name, Type [] args, bool is_private, bool report_errors)
{
MemberList list;
Signature sig;
+ BindingFlags flags = instance_and_static | BindingFlags.Public;
sig.name = name;
sig.args = args;
-
- list = FindMembers (t, MemberTypes.Method, instance_and_static | BindingFlags.Public,
- signature_filter, sig);
+
+ if (is_private)
+ flags |= BindingFlags.NonPublic;
+
+ list = FindMembers (t, MemberTypes.Method, flags, signature_filter, sig);
if (list.Count == 0) {
if (report_errors)
Report.Error (-19, "Can not find the core function `" + name + "'");
return mi;
}
+ static MethodInfo GetMethod (Type t, string name, Type [] args, bool report_errors)
+ {
+ return GetMethod (t, name, args, false, report_errors);
+ }
+
static MethodInfo GetMethod (Type t, string name, Type [] args)
{
return GetMethod (t, name, args, true);
type_type = CoreLookupType ("System.Type");
runtime_field_handle_type = CoreLookupType ("System.RuntimeFieldHandle");
+ runtime_argument_handle_type = CoreLookupType ("System.RuntimeArgumentHandle");
runtime_helpers_type = CoreLookupType ("System.Runtime.CompilerServices.RuntimeHelpers");
default_member_type = CoreLookupType ("System.Reflection.DefaultMemberAttribute");
runtime_handle_type = CoreLookupType ("System.RuntimeTypeHandle");
ienumerable_type = CoreLookupType ("System.Collections.IEnumerable");
idisposable_type = CoreLookupType ("System.IDisposable");
icloneable_type = CoreLookupType ("System.ICloneable");
+ iconvertible_type = CoreLookupType ("System.IConvertible");
monitor_type = CoreLookupType ("System.Threading.Monitor");
intptr_type = CoreLookupType ("System.IntPtr");
marshal_as_attr_type = CoreLookupType ("System.Runtime.InteropServices.MarshalAsAttribute");
param_array_type = CoreLookupType ("System.ParamArrayAttribute");
in_attribute_type = CoreLookupType ("System.Runtime.InteropServices.InAttribute");
+ typed_reference_type = CoreLookupType ("System.TypedReference");
+ arg_iterator_type = CoreLookupType ("System.ArgIterator");
+ mbr_type = CoreLookupType ("System.MarshalByRefObject");
//
// Sigh. Remove this before the release. Wonder what versions of Mono
//
obsolete_attribute_type = CoreLookupType ("System.ObsoleteAttribute");
conditional_attribute_type = CoreLookupType ("System.Diagnostics.ConditionalAttribute");
+ cls_compliant_attribute_type = CoreLookupType ("System.CLSCompliantAttribute");
+ struct_layout_attribute_type = CoreLookupType ("System.Runtime.InteropServices.StructLayoutAttribute");
+ field_offset_attribute_type = CoreLookupType ("System.Runtime.InteropServices.FieldOffsetAttribute");
//
// When compiling corlib, store the "real" types here.
MethodInfo set_corlib_type_builders = GetMethod (
system_assemblybuilder_type, "SetCorlibTypeBuilders",
- system_4_type_arg, false);
+ system_4_type_arg, true, false);
if (set_corlib_type_builders != null) {
object[] args = new object [4];
args [2] = enum_type;
args [3] = void_type;
- set_corlib_type_builders.Invoke (CodeGen.AssemblyBuilder, args);
+ set_corlib_type_builders.Invoke (CodeGen.Assembly.Builder, args);
} else {
// Compatibility for an older version of the class libs.
set_corlib_type_builders = GetMethod (
system_assemblybuilder_type, "SetCorlibTypeBuilders",
- system_3_type_arg, true);
+ system_3_type_arg, true, true);
if (set_corlib_type_builders == null) {
Report.Error (-26, "Corlib compilation is not supported in Microsoft.NET due to bugs in it");
args [1] = value_type;
args [2] = enum_type;
- set_corlib_type_builders.Invoke (CodeGen.AssemblyBuilder, args);
+ set_corlib_type_builders.Invoke (CodeGen.Assembly.Builder, args);
}
}
+
+ system_object_expr.Type = object_type;
+ system_string_expr.Type = string_type;
+ system_boolean_expr.Type = bool_type;
+ system_decimal_expr.Type = decimal_type;
+ system_single_expr.Type = float_type;
+ system_double_expr.Type = double_type;
+ system_sbyte_expr.Type = sbyte_type;
+ system_byte_expr.Type = byte_type;
+ system_int16_expr.Type = short_type;
+ system_uint16_expr.Type = ushort_type;
+ system_int32_expr.Type = int32_type;
+ system_uint32_expr.Type = uint32_type;
+ system_int64_expr.Type = int64_type;
+ system_uint64_expr.Type = uint64_type;
+ system_char_expr.Type = char_type;
+ system_void_expr.Type = void_type;
+ system_asynccallback_expr.Type = asynccallback_type;
+ system_iasyncresult_expr.Type = iasyncresult_type;
+ system_valuetype_expr.Type = value_type;
}
//
Type [] string_string_string_string = { string_type, string_type, string_type, string_type };
string_concat_string_string_string_string = GetMethod (
string_type, "Concat", string_string_string_string);
+ Type[] params_string = { TypeManager.LookupType ("System.String[]") };
+ string_concat_string_dot_dot_dot = GetMethod (
+ string_type, "Concat", params_string);
Type [] object_object = { object_type, object_type };
string_concat_object_object = GetMethod (
string_type, "Concat", object_object);
+ Type [] object_object_object = { object_type, object_type, object_type };
+ string_concat_object_object_object = GetMethod (
+ string_type, "Concat", object_object_object);
+ Type[] params_object = { TypeManager.LookupType ("System.Object[]") };
+ string_concat_object_dot_dot_dot = GetMethod (
+ string_type, "Concat", params_object);
Type [] string_ = { string_type };
string_isinterneted_string = GetMethod (
const BindingFlags instance_and_static = BindingFlags.Static | BindingFlags.Instance;
- static Hashtable type_hash = new Hashtable ();
-
/// <remarks>
/// This is the "old", non-cache based FindMembers() function. We cannot use
/// the cache here because there is no member name argument.
/// our return value will already contain all inherited members and the caller don't need
/// to check base classes and interfaces anymore.
/// </summary>
- private static MemberList MemberLookup_FindMembers (Type t, MemberTypes mt, BindingFlags bf,
+ private static MemberInfo [] MemberLookup_FindMembers (Type t, MemberTypes mt, BindingFlags bf,
string name, out bool used_cache)
{
//
}
// If there is no MemberCache, we need to use the "normal" FindMembers.
-
+ // Note, this is a VERY uncommon route!
+
MemberList list;
Timer.StartTimer (TimerType.FindMembers);
list = decl.FindMembers (mt, bf | BindingFlags.DeclaredOnly,
FilterWithClosure_delegate, name);
Timer.StopTimer (TimerType.FindMembers);
used_cache = false;
- return list;
+
+ return (MemberInfo []) list;
}
//
return false;
}
+ public static bool IsBuiltinType (TypeContainer tc)
+ {
+ return IsBuiltinType (tc.TypeBuilder);
+ }
+
//
// This is like IsBuiltinType, but lacks decimal_type, we should also clean up
// the pieces in the code where we use IsBuiltinType and special case decimal_type.
else
return false;
}
+ public static bool IsBuiltinOrEnum (Type t)
+ {
+ if (IsBuiltinType (t))
+ return true;
+
+ if (IsEnumType (t))
+ return true;
+
+ return false;
+ }
//
// Whether a type is unmanaged. This is used by the unsafe code (25.2)
if (t is TypeBuilder){
TypeContainer tc = LookupTypeContainer (t);
- foreach (Field f in tc.Fields){
- if (f.FieldBuilder.IsStatic)
- continue;
- if (!IsUnmanagedType (f.FieldBuilder.FieldType))
- return false;
- }
+ if (tc.Fields != null){
+ foreach (Field f in tc.Fields){
+ if (f.FieldBuilder.IsStatic)
+ continue;
+ if (!IsUnmanagedType (f.FieldBuilder.FieldType))
+ return false;
+ }
+ } else
+ return true;
} else {
FieldInfo [] fields = t.GetFields ();
return false;
}
+ //
+ // Do the right thing when returning the element type of an
+ // array type based on whether we are compiling corlib or not
+ //
+ public static Type GetElementType (Type t)
+ {
+ if (RootContext.StdLib)
+ return t.GetElementType ();
+ else
+ return TypeToCoreType (t.GetElementType ());
+ }
+
/// <summary>
/// Returns the User Defined Types
/// </summary>
}
}
- static Hashtable attr_to_allowmult;
-
- public static void RegisterAttributeAllowMultiple (Type attr_type, bool allow)
- {
- if (attr_to_allowmult == null)
- attr_to_allowmult = new PtrHashtable ();
-
- if (attr_to_allowmult.Contains (attr_type))
- return;
-
- attr_to_allowmult.Add (attr_type, allow);
-
- }
-
- public static bool AreMultipleAllowed (Type attr_type)
- {
- if (!(attr_type is TypeBuilder)) {
- System.Attribute [] attrs = System.Attribute.GetCustomAttributes (attr_type);
-
- foreach (System.Attribute tmp in attrs)
- if (tmp is AttributeUsageAttribute) {
- return ((AttributeUsageAttribute) tmp).AllowMultiple;
- }
-
- return false;
- }
-
- if (attr_to_allowmult == null)
- return false;
-
- return (bool) attr_to_allowmult [attr_type];
- }
-
static Hashtable builder_to_constant;
public static void RegisterConstant (FieldBuilder fb, Const c)
return true;
}
+ //
+ // The return value can be null; This will be the case for
+ // auxiliary FieldBuilders created by the compiler that have no
+ // real field being declared on the source code
+ //
static public FieldBase GetField (FieldInfo fb)
{
return (FieldBase) fieldbuilders_to_fields [fb];
return true;
}
- static public bool RegisterIndexer (PropertyBuilder pb, MethodBase get, MethodBase set, Type[] args)
+ static public bool RegisterIndexer (PropertyBuilder pb, MethodBase get,
+ MethodBase set, Type[] args)
{
if (!RegisterProperty (pb, get,set))
return false;
return true;
}
+ public static bool CheckStructCycles (TypeContainer tc, Hashtable seen)
+ {
+ Hashtable hash = new Hashtable ();
+ return CheckStructCycles (tc, seen, hash);
+ }
+
+ public static bool CheckStructCycles (TypeContainer tc, Hashtable seen,
+ Hashtable hash)
+ {
+ if (!(tc is Struct) || IsBuiltinType (tc))
+ return true;
+
+ //
+ // `seen' contains all types we've already visited.
+ //
+ if (seen.Contains (tc))
+ return true;
+ seen.Add (tc, null);
+
+ if (tc.Fields == null)
+ return true;
+
+ foreach (Field field in tc.Fields) {
+ if (field.FieldBuilder.IsStatic)
+ continue;
+
+ Type ftype = field.FieldBuilder.FieldType;
+ TypeContainer ftc = LookupTypeContainer (ftype);
+ if (ftc == null)
+ continue;
+
+ if (hash.Contains (ftc)) {
+ Report.Error (523, tc.Location,
+ "Struct member `{0}.{1}' of type `{2}' " +
+ "causes a cycle in the struct layout",
+ tc.Name, field.Name, ftc.Name);
+ return false;
+ }
+
+ //
+ // `hash' contains all types in the current path.
+ //
+ hash.Add (tc, null);
+
+ bool ok = CheckStructCycles (ftc, seen, hash);
+
+ hash.Remove (tc);
+
+ if (!ok)
+ return false;
+
+ if (!seen.Contains (ftc))
+ seen.Add (ftc, null);
+ }
+
+ return true;
+ }
+
/// <summary>
/// Given an array of interface types, expand and eliminate repeated ocurrences
/// of an interface.
/// This expands in context like: IA; IB : IA; IC : IA, IB; the interface "IC" to
/// be IA, IB, IC.
/// </remarks>
- public static Type [] ExpandInterfaces (Type [] base_interfaces)
+ public static TypeExpr[] ExpandInterfaces (TypeExpr [] base_interfaces)
{
ArrayList new_ifaces = new ArrayList ();
- foreach (Type iface in base_interfaces){
+ foreach (TypeExpr iface in base_interfaces){
if (!new_ifaces.Contains (iface))
new_ifaces.Add (iface);
- Type [] implementing = TypeManager.GetInterfaces (iface);
+ TypeExpr [] implementing = iface.GetInterfaces ();
- foreach (Type imp in implementing){
+ foreach (TypeExpr imp in implementing){
if (!new_ifaces.Contains (imp))
new_ifaces.Add (imp);
}
}
- Type [] ret = new Type [new_ifaces.Count];
+ TypeExpr [] ret = new TypeExpr [new_ifaces.Count];
new_ifaces.CopyTo (ret, 0);
return ret;
}
+
+ static PtrHashtable iface_cache = new PtrHashtable ();
/// <summary>
/// This function returns the interfaces in the type `t'. Works with
/// both types and TypeBuilders.
/// </summary>
- public static Type [] GetInterfaces (Type t)
+ public static TypeExpr [] GetInterfaces (Type t)
{
+
+ TypeExpr [] cached = iface_cache [t] as TypeExpr [];
+ if (cached != null)
+ return cached;
+
//
// The reason for catching the Array case is that Reflection.Emit
// will not return a TypeBuilder for Array types of TypeBuilder types,
t = TypeManager.array_type;
if (t is TypeBuilder){
- Type [] parent_ifaces;
+ TypeExpr [] parent_ifaces;
if (t.BaseType == null)
- parent_ifaces = NoTypes;
+ parent_ifaces = NoTypeExprs;
else
parent_ifaces = GetInterfaces (t.BaseType);
- Type [] type_ifaces = (Type []) builder_to_ifaces [t];
+ TypeExpr [] type_ifaces = (TypeExpr []) builder_to_ifaces [t];
if (type_ifaces == null)
- type_ifaces = NoTypes;
+ type_ifaces = NoTypeExprs;
int parent_count = parent_ifaces.Length;
- Type [] result = new Type [parent_count + type_ifaces.Length];
+ TypeExpr [] result = new TypeExpr [parent_count + type_ifaces.Length];
parent_ifaces.CopyTo (result, 0);
type_ifaces.CopyTo (result, parent_count);
+ iface_cache [t] = result;
return result;
- } else
- return t.GetInterfaces ();
+ } else {
+ Type [] ifaces = t.GetInterfaces ();
+ if (ifaces.Length == 0)
+ return NoTypeExprs;
+
+ TypeExpr [] result = new TypeExpr [ifaces.Length];
+ for (int i = 0; i < ifaces.Length; i++)
+ result [i] = new TypeExpression (ifaces [i], Location.Null);
+
+ iface_cache [t] = result;
+ return result;
+ }
+ }
+
+ //
+ // gets the interfaces that are declared explicitly on t
+ //
+ public static TypeExpr [] GetExplicitInterfaces (TypeBuilder t)
+ {
+ return (TypeExpr []) builder_to_ifaces [t];
}
/// <remarks>
/// </remarks>
public static bool ImplementsInterface (Type t, Type iface)
{
- Type [] interfaces;
+ TypeExpr [] interfaces;
//
// FIXME OPTIMIZATION:
interfaces = GetInterfaces (t);
if (interfaces != null){
- foreach (Type i in interfaces){
- if (i == iface)
+ foreach (TypeExpr i in interfaces){
+ if (i.Type == iface)
return true;
}
}
return false;
}
+ static NumberFormatInfo nf_provider = CultureInfo.CurrentCulture.NumberFormat;
+
// This is a custom version of Convert.ChangeType() which works
// with the TypeBuilder defined types when compiling corlib.
public static object ChangeType (object value, Type conversionType, out bool error)
{
- if (!(value is IConvertible)){
+ IConvertible convert_value = value as IConvertible;
+
+ if (convert_value == null){
error = true;
return null;
}
- IConvertible convertValue = (IConvertible) value;
- CultureInfo ci = CultureInfo.CurrentCulture;
- NumberFormatInfo provider = ci.NumberFormat;
-
//
// We must use Type.Equals() here since `conversionType' is
// the TypeBuilder created version of a system type and not
error = false;
try {
if (conversionType.Equals (typeof (Boolean)))
- return (object)(convertValue.ToBoolean (provider));
+ return (object)(convert_value.ToBoolean (nf_provider));
else if (conversionType.Equals (typeof (Byte)))
- return (object)(convertValue.ToByte (provider));
+ return (object)(convert_value.ToByte (nf_provider));
else if (conversionType.Equals (typeof (Char)))
- return (object)(convertValue.ToChar (provider));
+ return (object)(convert_value.ToChar (nf_provider));
else if (conversionType.Equals (typeof (DateTime)))
- return (object)(convertValue.ToDateTime (provider));
+ return (object)(convert_value.ToDateTime (nf_provider));
else if (conversionType.Equals (typeof (Decimal)))
- return (object)(convertValue.ToDecimal (provider));
+ return (object)(convert_value.ToDecimal (nf_provider));
else if (conversionType.Equals (typeof (Double)))
- return (object)(convertValue.ToDouble (provider));
+ return (object)(convert_value.ToDouble (nf_provider));
else if (conversionType.Equals (typeof (Int16)))
- return (object)(convertValue.ToInt16 (provider));
+ return (object)(convert_value.ToInt16 (nf_provider));
else if (conversionType.Equals (typeof (Int32)))
- return (object)(convertValue.ToInt32 (provider));
+ return (object)(convert_value.ToInt32 (nf_provider));
else if (conversionType.Equals (typeof (Int64)))
- return (object)(convertValue.ToInt64 (provider));
+ return (object)(convert_value.ToInt64 (nf_provider));
else if (conversionType.Equals (typeof (SByte)))
- return (object)(convertValue.ToSByte (provider));
+ return (object)(convert_value.ToSByte (nf_provider));
else if (conversionType.Equals (typeof (Single)))
- return (object)(convertValue.ToSingle (provider));
+ return (object)(convert_value.ToSingle (nf_provider));
else if (conversionType.Equals (typeof (String)))
- return (object)(convertValue.ToString (provider));
+ return (object)(convert_value.ToString (nf_provider));
else if (conversionType.Equals (typeof (UInt16)))
- return (object)(convertValue.ToUInt16 (provider));
+ return (object)(convert_value.ToUInt16 (nf_provider));
else if (conversionType.Equals (typeof (UInt32)))
- return (object)(convertValue.ToUInt32 (provider));
+ return (object)(convert_value.ToUInt32 (nf_provider));
else if (conversionType.Equals (typeof (UInt64)))
- return (object)(convertValue.ToUInt64 (provider));
+ return (object)(convert_value.ToUInt64 (nf_provider));
else if (conversionType.Equals (typeof (Object)))
return (object)(value);
else
if (t is TypeBuilder) {
// slow path needed to compile corlib
if (t == TypeManager.bool_type ||
- t == TypeManager.byte_type ||
- t == TypeManager.sbyte_type ||
- t == TypeManager.char_type ||
- t == TypeManager.short_type ||
- t == TypeManager.ushort_type ||
- t == TypeManager.int32_type ||
- t == TypeManager.uint32_type ||
- t == TypeManager.int64_type ||
- t == TypeManager.uint64_type)
+ t == TypeManager.byte_type ||
+ t == TypeManager.sbyte_type ||
+ t == TypeManager.char_type ||
+ t == TypeManager.short_type ||
+ t == TypeManager.ushort_type ||
+ t == TypeManager.int32_type ||
+ t == TypeManager.uint32_type ||
+ t == TypeManager.int64_type ||
+ t == TypeManager.uint64_type)
return t;
throw new Exception ("Unhandled typecode in enum " + " from " + t.AssemblyQualifiedName);
}
return TypeManager.int64_type;
case TypeCode.UInt64:
return TypeManager.uint64_type;
+ case TypeCode.Single:
+ return TypeManager.float_type;
+ case TypeCode.Double:
+ return TypeManager.double_type;
case TypeCode.String:
return TypeManager.string_type;
default:
return TypeManager.object_type;
if (t == typeof (System.Type))
return TypeManager.type_type;
+ if (t == typeof (System.IntPtr))
+ return TypeManager.intptr_type;
return t;
}
}
return "Item";
}
+ static MethodInfo pinned_method = null;
public static void MakePinned (LocalBuilder builder)
{
- //
- // FIXME: Flag the "LocalBuilder" type as being
- // pinned. Figure out API.
- //
+ if (pinned_method == null) {
+ pinned_method = typeof (LocalBuilder).GetMethod ("MakePinned", BindingFlags.Instance | BindingFlags.NonPublic);
+ if (pinned_method == null) {
+ Report.Warning (-24, new Location (-1), "Microsoft.NET does not support making pinned variables." +
+ "This code may cause errors on a runtime with a moving GC");
+
+ return;
+ }
+ }
+
+ pinned_method.Invoke (builder, null);
}
//
// Returns whether the array of memberinfos contains the given method
//
- static bool ArrayContainsMethod (MemberInfo [] array, MethodBase new_method)
+ public static bool ArrayContainsMethod (MemberInfo [] array, MethodBase new_method)
{
Type [] new_args = TypeManager.GetArgumentTypes (new_method);
- foreach (MethodBase method in array){
+ foreach (MethodBase method in array) {
if (method.Name != new_method.Name)
continue;
-
+
+ if (method is MethodInfo && new_method is MethodInfo)
+ if (((MethodInfo) method).ReturnType != ((MethodInfo) new_method).ReturnType)
+ continue;
+
+
Type [] old_args = TypeManager.GetArgumentTypes (method);
int old_count = old_args.Length;
int i;
return true;
}
+
return false;
}
//
// The name is assumed to be the same.
//
- public static ArrayList CopyNewMethods (ArrayList target_list, MemberList new_members)
+ public static ArrayList CopyNewMethods (ArrayList target_list, IList new_members)
{
if (target_list == null){
target_list = new ArrayList ();
return target_list;
}
- [Flags]
- public enum MethodFlags {
- IsObsolete = 1,
- IsObsoleteError = 2,
- ShouldIgnore = 3
- }
-
- //
- // Returns the TypeManager.MethodFlags for this method.
- // This emits an error 619 / warning 618 if the method is obsolete.
- // In the former case, TypeManager.MethodFlags.IsObsoleteError is returned.
- //
- static public MethodFlags GetMethodFlags (MethodBase mb, Location loc)
- {
- MethodFlags flags = 0;
-
- if (mb.DeclaringType is TypeBuilder){
- MethodData method = (MethodData) builder_to_method [mb];
- if (method == null) {
- // FIXME: implement Obsolete attribute on Property,
- // Indexer and Event.
- return 0;
- }
-
- return method.GetMethodFlags (loc);
- }
- object [] attrs = mb.GetCustomAttributes (true);
- foreach (object ta in attrs){
- if (!(ta is System.Attribute)){
- Console.WriteLine ("Unknown type in GetMethodFlags: " + ta);
- continue;
- }
- System.Attribute a = (System.Attribute) ta;
- if (a.TypeId == TypeManager.obsolete_attribute_type){
- ObsoleteAttribute oa = (ObsoleteAttribute) a;
-
- string method_desc = TypeManager.CSharpSignature (mb);
-
- if (oa.IsError) {
- Report.Error (619, loc, "Method `" + method_desc +
- "' is obsolete: `" + oa.Message + "'");
- return MethodFlags.IsObsoleteError;
- } else
- Report.Warning (618, loc, "Method `" + method_desc +
- "' is obsolete: `" + oa.Message + "'");
-
- flags |= MethodFlags.IsObsolete;
-
- continue;
- }
-
- //
- // Skip over conditional code.
- //
- if (a.TypeId == TypeManager.conditional_attribute_type){
- ConditionalAttribute ca = (ConditionalAttribute) a;
-
- if (RootContext.AllDefines [ca.ConditionString] == null)
- flags |= MethodFlags.ShouldIgnore;
- }
- }
-
- return flags;
- }
-
#region MemberLookup implementation
- //
- // Name of the member
- //
- static string closure_name;
-
//
// Whether we allow private members in the result (since FindMembers
// uses NonPublic for both protected and private), we need to distinguish.
//
- static bool closure_private_ok;
-
- //
- // Who is invoking us and which type is being queried currently.
- //
- static Type closure_invocation_type;
- static Type closure_queried_type;
- static Type closure_qualifier_type;
-
- //
- // The assembly that defines the type is that is calling us
- //
- static Assembly closure_invocation_assembly;
static internal bool FilterNone (MemberInfo m, object filter_criteria)
{
return true;
}
-
- //
- // This filter filters by name + whether it is ok to include private
- // members in the search
- //
- static internal bool FilterWithClosure (MemberInfo m, object filter_criteria)
- {
- //
- // Hack: we know that the filter criteria will always be in the `closure'
- // fields.
- //
-
- if ((filter_criteria != null) && (m.Name != (string) filter_criteria))
- return false;
-
- if (((closure_qualifier_type == null) || (closure_qualifier_type == closure_invocation_type)) &&
- (m.DeclaringType == closure_invocation_type))
- return true;
-
- //
- // Ugly: we need to find out the type of `m', and depending
- // on this, tell whether we accept or not
- //
- if (m is MethodBase){
- MethodBase mb = (MethodBase) m;
- MethodAttributes ma = mb.Attributes & MethodAttributes.MemberAccessMask;
- if (ma == MethodAttributes.Private)
- return closure_private_ok || (closure_invocation_type == m.DeclaringType) ||
- IsNestedChildOf (closure_invocation_type, m.DeclaringType);
+ internal class Closure {
+ internal bool private_ok;
- //
- // FamAndAssem requires that we not only derivate, but we are on the
- // same assembly.
- //
- if (ma == MethodAttributes.FamANDAssem){
- if (closure_invocation_assembly != mb.DeclaringType.Assembly)
- return false;
- }
+ // Who is invoking us and which type is being queried currently.
+ internal Type invocation_type;
+ internal Type qualifier_type;
- // Assembly and FamORAssem succeed if we're in the same assembly.
- if ((ma == MethodAttributes.Assembly) || (ma == MethodAttributes.FamORAssem)){
- if (closure_invocation_assembly == mb.DeclaringType.Assembly)
- return true;
- }
+ // The assembly that defines the type is that is calling us
+ internal Assembly invocation_assembly;
+ internal IList almost_match;
- // We already know that we aren't in the same assembly.
- if (ma == MethodAttributes.Assembly)
+ private bool CheckValidFamilyAccess (bool is_static, MemberInfo m)
+ {
+ if (invocation_type == null)
return false;
- // Family and FamANDAssem require that we derive.
- if ((ma == MethodAttributes.Family) || (ma == MethodAttributes.FamANDAssem)){
- if (closure_invocation_type == null)
- return false;
+ Debug.Assert (IsSubclassOrNestedChildOf (invocation_type, m.DeclaringType));
- if (!IsSubclassOrNestedChildOf (closure_invocation_type, mb.DeclaringType))
- return false;
+ if (is_static)
+ return true;
+
+ // A nested class has access to all the protected members visible to its parent.
+ if (qualifier_type != null
+ && TypeManager.IsNestedChildOf (invocation_type, qualifier_type))
+ return true;
+ if (invocation_type == m.DeclaringType
+ || invocation_type.IsSubclassOf (m.DeclaringType)) {
// Although a derived class can access protected members of its base class
// it cannot do so through an instance of the base class (CS1540).
- if (!mb.IsStatic && (closure_invocation_type != closure_qualifier_type) &&
- (closure_qualifier_type != null) &&
- closure_invocation_type.IsSubclassOf (closure_qualifier_type))
- return false;
-
- return true;
+ // => Ancestry should be: declaring_type ->* invocation_type ->* qualified_type
+ if (qualifier_type == null
+ || qualifier_type == invocation_type
+ || qualifier_type.IsSubclassOf (invocation_type))
+ return true;
}
- // Public.
- return true;
+ if (almost_match != null)
+ almost_match.Add (m);
+ return false;
}
-
- if (m is FieldInfo){
- FieldInfo fi = (FieldInfo) m;
- FieldAttributes fa = fi.Attributes & FieldAttributes.FieldAccessMask;
-
- if (fa == FieldAttributes.Private)
- return closure_private_ok || (closure_invocation_type == m.DeclaringType) ||
- IsNestedChildOf (closure_invocation_type, m.DeclaringType);
-
+
+ //
+ // This filter filters by name + whether it is ok to include private
+ // members in the search
+ //
+ internal bool Filter (MemberInfo m, object filter_criteria)
+ {
//
- // FamAndAssem requires that we not only derivate, but we are on the
- // same assembly.
+ // Hack: we know that the filter criteria will always be in the `closure'
+ // fields.
//
- if (fa == FieldAttributes.FamANDAssem){
- if (closure_invocation_assembly != fi.DeclaringType.Assembly)
- return false;
- }
-
- // Assembly and FamORAssem succeed if we're in the same assembly.
- if ((fa == FieldAttributes.Assembly) || (fa == FieldAttributes.FamORAssem)){
- if (closure_invocation_assembly == fi.DeclaringType.Assembly)
- return true;
- }
- // We already know that we aren't in the same assembly.
- if (fa == FieldAttributes.Assembly)
+ if ((filter_criteria != null) && (m.Name != (string) filter_criteria))
return false;
+
+ if (((qualifier_type == null) || (qualifier_type == invocation_type)) &&
+ (m.DeclaringType == invocation_type))
+ return true;
+
+ //
+ // Ugly: we need to find out the type of `m', and depending
+ // on this, tell whether we accept or not
+ //
+ if (m is MethodBase){
+ MethodBase mb = (MethodBase) m;
+ MethodAttributes ma = mb.Attributes & MethodAttributes.MemberAccessMask;
- // Family and FamANDAssem require that we derive.
- if ((fa == FieldAttributes.Family) || (fa == FieldAttributes.FamANDAssem)){
- if (closure_invocation_type == null)
- return false;
-
- if (!IsSubclassOrNestedChildOf (closure_invocation_type, fi.DeclaringType))
- return false;
-
- // Although a derived class can access protected members of its base class
- // it cannot do so through an instance of the base class (CS1540).
- if (!fi.IsStatic && (closure_invocation_type != closure_qualifier_type) &&
- (closure_qualifier_type != null) &&
- closure_invocation_type.IsSubclassOf (closure_qualifier_type))
- return false;
-
+ if (ma == MethodAttributes.Private)
+ return private_ok || (invocation_type == m.DeclaringType) ||
+ IsNestedChildOf (invocation_type, m.DeclaringType);
+
+ // Assembly succeeds if we're in the same assembly.
+ if (ma == MethodAttributes.Assembly)
+ return (invocation_assembly == mb.DeclaringType.Assembly);
+
+ // FamAndAssem requires that we not only derive, but we are on the same assembly.
+ if (ma == MethodAttributes.FamANDAssem){
+ if (invocation_assembly != mb.DeclaringType.Assembly)
+ return false;
+ }
+
+ // Family and FamANDAssem require that we derive.
+ if ((ma == MethodAttributes.Family) || (ma == MethodAttributes.FamANDAssem))
+ return CheckValidFamilyAccess (mb.IsStatic, m);
+
+ // Public.
return true;
}
-
- // Public.
+
+ if (m is FieldInfo){
+ FieldInfo fi = (FieldInfo) m;
+ FieldAttributes fa = fi.Attributes & FieldAttributes.FieldAccessMask;
+
+ if (fa == FieldAttributes.Private)
+ return private_ok || (invocation_type == m.DeclaringType) ||
+ IsNestedChildOf (invocation_type, m.DeclaringType);
+
+ // Assembly succeeds if we're in the same assembly.
+ if (fa == FieldAttributes.Assembly)
+ return (invocation_assembly == fi.DeclaringType.Assembly);
+
+ // FamAndAssem requires that we not only derive, but we are on the same assembly.
+ if (fa == FieldAttributes.FamANDAssem){
+ if (invocation_assembly != fi.DeclaringType.Assembly)
+ return false;
+ }
+
+ // Family and FamANDAssem require that we derive.
+ if ((fa == FieldAttributes.Family) || (fa == FieldAttributes.FamANDAssem))
+ return CheckValidFamilyAccess (fi.IsStatic, m);
+
+ // Public.
+ return true;
+ }
+
+ //
+ // EventInfos and PropertyInfos, return true because they lack permission
+ // information, so we need to check later on the methods.
+ //
return true;
}
-
- //
- // EventInfos and PropertyInfos, return true because they lack permission
- // informaiton, so we need to check later on the methods.
- //
- return true;
}
- static MemberFilter FilterWithClosure_delegate = new MemberFilter (FilterWithClosure);
+ static Closure closure = new Closure ();
+ static MemberFilter FilterWithClosure_delegate = new MemberFilter (closure.Filter);
static MemberFilter FilterNone_delegate = new MemberFilter (FilterNone);
//
// is allowed to access (using the specified `qualifier_type' if given); only use
// BindingFlags.NonPublic to bypass the permission check.
//
+ // The 'almost_match' argument is used for reporting error CS1540.
+ //
// Returns an array of a single element for everything but Methods/Constructors
// that might return multiple matches.
//
public static MemberInfo [] MemberLookup (Type invocation_type, Type qualifier_type,
Type queried_type, MemberTypes mt,
- BindingFlags original_bf, string name)
+ BindingFlags original_bf, string name, IList almost_match)
{
Timer.StartTimer (TimerType.MemberLookup);
MemberInfo[] retval = RealMemberLookup (invocation_type, qualifier_type,
- queried_type, mt, original_bf, name);
+ queried_type, mt, original_bf, name, almost_match);
Timer.StopTimer (TimerType.MemberLookup);
static MemberInfo [] RealMemberLookup (Type invocation_type, Type qualifier_type,
Type queried_type, MemberTypes mt,
- BindingFlags original_bf, string name)
+ BindingFlags original_bf, string name, IList almost_match)
{
BindingFlags bf = original_bf;
bool skip_iface_check = true, used_cache = false;
bool always_ok_flag = false;
- closure_name = name;
- closure_invocation_type = invocation_type;
- closure_invocation_assembly = invocation_type != null ? invocation_type.Assembly : null;
- closure_qualifier_type = qualifier_type;
+ closure.invocation_type = invocation_type;
+ closure.invocation_assembly = invocation_type != null ? invocation_type.Assembly : null;
+ closure.qualifier_type = qualifier_type;
+ closure.almost_match = almost_match;
//
// If we are a nested class, we always have access to our container
}
}
+ // This is from the first time we find a method
+ // in most cases, we do not actually find a method in the base class
+ // so we can just ignore it, and save the arraylist allocation
+ MemberInfo [] first_members_list = null;
+ bool use_first_members_list = false;
+
do {
- MemberList list;
+ MemberInfo [] list;
//
// `NonPublic' is lame, because it includes both protected and
else
bf = original_bf;
- closure_private_ok = (original_bf & BindingFlags.NonPublic) != 0;
- closure_queried_type = current_type;
+ closure.private_ok = (original_bf & BindingFlags.NonPublic) != 0;
Timer.StopTimer (TimerType.MemberLookup);
current_type = TypeManager.object_type;
}
- if (list.Count == 0)
+ if (list.Length == 0)
continue;
//
// searches, which means that our above FindMembers will
// return two copies of the same.
//
- if (list.Count == 1 && !(list [0] is MethodBase)){
- return (MemberInfo []) list;
+ if (list.Length == 1 && !(list [0] is MethodBase)){
+ return list;
}
//
// name
//
if (list [0] is PropertyInfo)
- return (MemberInfo []) list;
+ return list;
//
// We found an event: the cache lookup returns both the event and
// its private field.
//
if (list [0] is EventInfo) {
- if ((list.Count == 2) && (list [1] is FieldInfo))
+ if ((list.Length == 2) && (list [1] is FieldInfo))
return new MemberInfo [] { list [0] };
// Oooops
// mode.
//
- method_list = CopyNewMethods (method_list, list);
- mt &= (MemberTypes.Method | MemberTypes.Constructor);
+ if (first_members_list != null) {
+ if (use_first_members_list) {
+ method_list = CopyNewMethods (method_list, first_members_list);
+ use_first_members_list = false;
+ }
+
+ method_list = CopyNewMethods (method_list, list);
+ } else {
+ first_members_list = list;
+ use_first_members_list = true;
+ mt &= (MemberTypes.Method | MemberTypes.Constructor);
+ }
} while (searching);
+
+ if (use_first_members_list) {
+ foreach (MemberInfo mi in first_members_list) {
+ if (! (mi is MethodBase)) {
+ method_list = CopyNewMethods (method_list, first_members_list);
+ return (MemberInfo []) method_list.ToArray (typeof (MemberInfo));
+ }
+ }
+ return (MemberInfo []) first_members_list;
+ }
if (method_list != null && method_list.Count > 0)
- return (MemberInfo []) method_list.ToArray (typeof (MemberInfo));
-
+ return (MemberInfo []) method_list.ToArray (typeof (MemberInfo));
+
//
// This happens if we already used the cache in the first iteration, in this case
// the cache already looked in all interfaces.
if (queried_type.IsArray)
queried_type = TypeManager.array_type;
- Type [] ifaces = GetInterfaces (queried_type);
+ TypeExpr [] ifaces = GetInterfaces (queried_type);
if (ifaces == null)
return null;
- foreach (Type itype in ifaces){
+ foreach (TypeExpr itype in ifaces){
MemberInfo [] x;
- x = MemberLookup (null, null, itype, mt, bf, name);
+ x = MemberLookup (null, null, itype.Type, mt, bf, name, null);
if (x != null)
return x;
}
type_hash.Add (t, handle);
return handle;
}
+
+ public static void CleanUp ()
+ {
+ type_hash = null;
+ }
/// <summary>
/// Returns the TypeHandle for TypeManager.object_type.
this.type = type;
if (type.BaseType != null)
BaseType = GetTypeHandle (type.BaseType);
- else if ((type != TypeManager.object_type) && (type != typeof (object)))
- is_interface = true;
+ this.is_interface = type.IsInterface;
this.member_cache = new MemberCache (this);
}
public MemberList GetMembers (MemberTypes mt, BindingFlags bf)
{
+ MemberInfo [] members;
if (mt == MemberTypes.Event)
- return new MemberList (type.GetEvents (bf | BindingFlags.DeclaredOnly));
- else
- return new MemberList (type.FindMembers (mt, bf | BindingFlags.DeclaredOnly,
- null, null));
+ members = type.GetEvents (bf | BindingFlags.DeclaredOnly);
+ else
+ members = type.FindMembers (mt, bf | BindingFlags.DeclaredOnly,
+ null, null);
+ Array.Reverse (members);
+
+ return new MemberList (members);
}
// IMemberFinder methods
public MemberList FindMembers (MemberTypes mt, BindingFlags bf, string name,
MemberFilter filter, object criteria)
{
- return member_cache.FindMembers (mt, bf, name, filter, criteria);
+ return new MemberList (member_cache.FindMembers (mt, bf, name, filter, criteria));
}
public MemberCache MemberCache {
projects / mono.git / blobdiff