Author: martin
Date: 2005-04-19 13:50:51 -0400 (Tue, 19 Apr 2005)
New Revision: 43272
Modified:
trunk/mcs/gmcs/ChangeLog
trunk/mcs/gmcs/iterators.cs
trunk/mcs/gmcs/typemanager.cs
Log:
**** Merged r42885 from MCS ****
Modified: trunk/mcs/gmcs/ChangeLog
===================================================================
--- trunk/mcs/gmcs/ChangeLog 2005-04-19 16:55:43 UTC (rev 43271)
+++ trunk/mcs/gmcs/ChangeLog 2005-04-19 17:50:51 UTC (rev 43272)
@@ -1,3 +1,7 @@
+2005-04-12 Miguel de Icaza <[EMAIL PROTECTED]>
+
+ * typemanager.cs (IsUnmanagedType): Arrays are allowed.
+
2005-04-10 Miguel de Icaza <[EMAIL PROTECTED]>
* driver.cs (MainDriver): Stop processing if the CLS stage found
Modified: trunk/mcs/gmcs/iterators.cs
===================================================================
--- trunk/mcs/gmcs/iterators.cs 2005-04-19 16:55:43 UTC (rev 43271)
+++ trunk/mcs/gmcs/iterators.cs 2005-04-19 17:50:51 UTC (rev 43272)
@@ -45,7 +45,10 @@
Report.Error (1625, loc, "Cannot yield in the
body of a " +
"finally clause");
return false;
+ } else {
+ Console.WriteLine ("Not in finally");
}
+
if (ec.InUnsafe) {
Report.Error (1629, loc, "Unsafe code may not
appear in iterators");
return false;
Modified: trunk/mcs/gmcs/typemanager.cs
===================================================================
--- trunk/mcs/gmcs/typemanager.cs 2005-04-19 16:55:43 UTC (rev 43271)
+++ trunk/mcs/gmcs/typemanager.cs 2005-04-19 17:50:51 UTC (rev 43272)
@@ -1656,8 +1656,8 @@
if (t.IsPointer)
return true;
- if (!IsValueType (t))
- return false;
+ if (t.IsArray)
+ return IsUnmanagedType (t.GetElementType ());
if (t is TypeBuilder){
TypeContainer tc = LookupTypeContainer (t);
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
