Author: marek
Date: 2007-06-05 09:43:34 -0400 (Tue, 05 Jun 2007)
New Revision: 78628
Modified:
trunk/mcs/mcs/ChangeLog
trunk/mcs/mcs/typemanager.cs
Log:
2007-06-05 Marek Safar <[EMAIL PROTECTED]>
* typemanager.cs (CSharpSignature): One more missing build-in types
replacement.
More tricks for non-mono runtime.
Modified: trunk/mcs/mcs/ChangeLog
===================================================================
--- trunk/mcs/mcs/ChangeLog 2007-06-05 13:39:02 UTC (rev 78627)
+++ trunk/mcs/mcs/ChangeLog 2007-06-05 13:43:34 UTC (rev 78628)
@@ -1,3 +1,9 @@
+2007-06-05 Marek Safar <[EMAIL PROTECTED]>
+
+ * typemanager.cs (CSharpSignature): One more missing build-in types
+ replacement.
+ More tricks for non-mono runtime.
+
2007-06-05 Raja R Harinath <[EMAIL PROTECTED]>
* statement.cs (Block.CheckError136_InParents): Remove.
Modified: trunk/mcs/mcs/typemanager.cs
===================================================================
--- trunk/mcs/mcs/typemanager.cs 2007-06-05 13:39:02 UTC (rev 78627)
+++ trunk/mcs/mcs/typemanager.cs 2007-06-05 13:43:34 UTC (rev 78628)
@@ -825,7 +825,7 @@
for (int i = 0; i < args.Length; i++) {
if (i > 0)
sig.Append (',');
- sig.Append (args [i].Name);
+ sig.Append (CSharpName (args
[i]));
}
sig.Append ('>');
}
@@ -1476,16 +1476,15 @@
{
MemberCache cache;
-#if GMCS_SOURCE && MS_COMPATIBLE
- if (t.IsGenericType && !t.IsGenericTypeDefinition)
- t = t.GetGenericTypeDefinition();
-#endif
-
//
// If this is a dynamic type, it's always in the
`builder_to_declspace' hash table
// and we can ask the DeclSpace for the MemberCache.
//
if (t is TypeBuilder) {
+#if GMCS_SOURCE && MS_COMPATIBLE
+ if (t.IsGenericType && !t.IsGenericTypeDefinition)
+ t = t.GetGenericTypeDefinition ();
+#endif
DeclSpace decl = (DeclSpace) builder_to_declspace [t];
cache = decl.MemberCache;
@@ -3541,7 +3540,7 @@
{
this.type = type;
#if MS_COMPATIBLE && GMCS_SOURCE
- if (type.IsGenericType)
+ if (type.IsGenericType && type is TypeBuilder)
this.type = this.type.GetGenericTypeDefinition ();
#endif
full_name = type.FullName != null ? type.FullName : type.Name;
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
