2002-10-19 Miguel de Icaza <miguel@ximian.com>

	* expression.cs (ArrayAccess.EmitAssign): Patch from
	hwang_rob@yahoo.ca that fixes bug 31834.3

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

diff --git a/mcs/mcs/ChangeLog b/mcs/mcs/ChangeLog
index f7e76ca70e99a191d1dfb96853f34af5fdbad4d2..04665c0b1ad1c8cda49b3caf10508086ef56aed3 100755 (executable)
--- a/mcs/mcs/ChangeLog
+++ b/mcs/mcs/ChangeLog
@@ -1,3 +1,12 @@
+2002-10-19  Miguel de Icaza  <miguel@ximian.com>
+
+       * expression.cs (ArrayAccess.EmitAssign): Patch from
+       hwang_rob@yahoo.ca that fixes bug 31834.3
+
+2002-10-18  Miguel de Icaza  <miguel@ximian.com>
+
+       * driver.cs: Make the module extension .netmodule.
+
 2002-10-16  Miguel de Icaza  <miguel@ximian.com>
 
        * driver.cs: Report an error if the resource file is not found

diff --git a/mcs/mcs/expression.cs b/mcs/mcs/expression.cs
index e02470ad66a5981d83bac43abd54d4cd30c81912..e5ceb35277927883ac17b02550e26e2ba176e78c 100755 (executable)
--- a/mcs/mcs/expression.cs
+++ b/mcs/mcs/expression.cs
@@ -6262,7 +6262,8 @@ namespace Mono.CSharp {
                        // pair
                        //
                        if (rank == 1){
-                               if (t.IsSubclassOf (TypeManager.value_type) && (!TypeManager.IsBuiltinType (t) || t == TypeManager.decimal_type))
+                               if (t == TypeManager.enum_type || t == TypeManager.decimal_type ||
+                                   (t.IsSubclassOf (TypeManager.value_type) && !TypeManager.IsEnumType (t) && !TypeManager.IsBuiltinType (t)))
                                        ig.Emit (OpCodes.Ldelema, t);
                        }