2009-10-07 Marek Safar <marek.safar@gmail.com>

	* typemanager.cs: Reset object_type.

	* assign: Made SimpleAssign public.

svn path=/trunk/mcs/; revision=143680

diff --git a/mcs/mcs/ChangeLog b/mcs/mcs/ChangeLog
index 8d659225e933ea62edfc4867ea4cb79d18e4aa68..049bc73aeab00b35733ac0de7903834c8919d2e8 100644 (file)
--- a/mcs/mcs/ChangeLog
+++ b/mcs/mcs/ChangeLog
@@ -1,3 +1,9 @@
+2009-10-07  Marek Safar  <marek.safar@gmail.com>
+
+       * typemanager.cs: Reset object_type.
+       
+       * assign: Made SimpleAssign public.
+
 2009-10-06  Marek Safar  <marek.safar@gmail.com>
 
        * typemanager.cs, decl.cs, namespace.cs, ecore.cs, class.cs: Pass

diff --git a/mcs/mcs/assign.cs b/mcs/mcs/assign.cs
index 7381b1cc10ae5a8cfa6f195f8b99b6a23afb7b2e..c9a31c52f5fa1498bc93dc0fd3c8dcd1fdf004b5 100644 (file)
--- a/mcs/mcs/assign.cs
+++ b/mcs/mcs/assign.cs
@@ -374,6 +374,15 @@ namespace Mono.CSharp {
                        return this;
                }
 
+#if NET_4_0
+               public override System.Linq.Expressions.Expression MakeExpression (BuilderContext ctx)
+               {
+                       var target_object = target.MakeExpression (ctx);
+                       var source_object = System.Linq.Expressions.Expression.Convert (source.MakeExpression (ctx), target_object.Type);
+                       return System.Linq.Expressions.Expression.Assign (target_object, source_object);
+               }
+#endif
+
                public override void MutateHoistedGenericType (AnonymousMethodStorey storey)
                {
                        source.MutateHoistedGenericType (storey);
@@ -415,7 +424,7 @@ namespace Mono.CSharp {
                }
        }
 
-       class SimpleAssign : Assign {
+       public class SimpleAssign : Assign {
                public SimpleAssign (Expression target, Expression source)
                        : this (target, source, target.Location)
                {
@@ -687,15 +696,6 @@ namespace Mono.CSharp {
                        return base.DoResolve (ec);
                }
 
-#if NET_4_0
-               public override System.Linq.Expressions.Expression MakeExpression (BuilderContext ctx)
-               {
-                       var target_object = target.MakeExpression (ctx);
-                       var source_object = System.Linq.Expressions.Expression.Convert (source.MakeExpression (ctx), target_object.Type);
-                       return System.Linq.Expressions.Expression.Assign (target_object, source_object);
-               }
-#endif
-
                protected override Expression ResolveConversions (ResolveContext ec)
                {
                        Type target_type = target.Type;

diff --git a/mcs/mcs/typemanager.cs b/mcs/mcs/typemanager.cs
index e9a26c1e69b95943192669701ebfbbb396939457..422294adb095ddaf6f60fb233ee0a0b1d0077867 100644 (file)
--- a/mcs/mcs/typemanager.cs
+++ b/mcs/mcs/typemanager.cs
@@ -234,6 +234,8 @@ namespace Mono.CSharp {
 
        static public void Reset ()
        {
+               object_type = null;
+
                InitExpressionTypes ();
                
                builder_to_declspace = new PtrHashtable ();