Author: marek
Date: 2006-12-17 06:06:43 -0500 (Sun, 17 Dec 2006)
New Revision: 69594
Modified:
trunk/mcs/mcs/ChangeLog
trunk/mcs/mcs/anonymous.cs
trunk/mcs/mcs/class.cs
Log:
2006-12-17 Marek Safar <[EMAIL PROTECTED]>
A fix for bug #79934
* anonymous.cs (CompilerGeneratedClass): Register class in a shared
partial container.
* class.cs (ResolveMembers): Register an iterator in current container
and
not in shared one.
Modified: trunk/mcs/mcs/ChangeLog
===================================================================
--- trunk/mcs/mcs/ChangeLog 2006-12-17 10:25:19 UTC (rev 69593)
+++ trunk/mcs/mcs/ChangeLog 2006-12-17 11:06:43 UTC (rev 69594)
@@ -1,3 +1,12 @@
+2006-12-17 Marek Safar <[EMAIL PROTECTED]>
+
+ A fix for bug #79934
+ * anonymous.cs (CompilerGeneratedClass): Register class in a shared
+ partial container.
+
+ * class.cs (ResolveMembers): Register an iterator in current container
and
+ not in shared one.
+
2006-12-16 Raja R Harinath <[EMAIL PROTECTED]>
Fix test-543.cs
Modified: trunk/mcs/mcs/anonymous.cs
===================================================================
--- trunk/mcs/mcs/anonymous.cs 2006-12-17 10:25:19 UTC (rev 69593)
+++ trunk/mcs/mcs/anonymous.cs 2006-12-17 11:06:43 UTC (rev 69594)
@@ -58,7 +58,10 @@
SetParameterInfo (list);
}
- parent.AddCompilerGeneratedClass (this);
+ if (parent.PartialContainer != null)
+
parent.PartialContainer.AddCompilerGeneratedClass (this);
+ else
+ parent.AddCompilerGeneratedClass (this);
}
protected override bool DefineNestedTypes ()
Modified: trunk/mcs/mcs/class.cs
===================================================================
--- trunk/mcs/mcs/class.cs 2006-12-17 10:25:19 UTC (rev 69593)
+++ trunk/mcs/mcs/class.cs 2006-12-17 11:06:43 UTC (rev 69594)
@@ -3870,7 +3870,7 @@
if ((ModFlags & Modifiers.METHOD_YIELDS) != 0) {
iterator = Iterator.CreateIterator (
- this, Parent.PartialContainer,
GenericMethod, ModFlags);
+ this, (TypeContainer)Parent,
GenericMethod, ModFlags);
if (iterator == null)
return false;
@@ -6484,11 +6484,9 @@
public bool ResolveMembers ()
{
- TypeContainer container = ((TypeContainer)
Parent).PartialContainer;
-
if (yields) {
iterator = Iterator.CreateIterator (
- this, container, null,
ModFlags);
+ this, (TypeContainer)Parent,
null, ModFlags);
if (iterator == null)
return false;
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches