Author: sudha
Date: 2005-03-10 07:34:43 -0500 (Thu, 10 Mar 2005)
New Revision: 41642

Modified:
   trunk/mcs/mbas/expression.cs
Log:
A minor fix for the previous checkin



Modified: trunk/mcs/mbas/expression.cs
===================================================================
--- trunk/mcs/mbas/expression.cs        2005-03-10 09:51:08 UTC (rev 41641)
+++ trunk/mcs/mbas/expression.cs        2005-03-10 12:34:43 UTC (rev 41642)
@@ -2259,23 +2259,24 @@
                                        return e.Resolve (ec);
                                } else if (!l.IsValueType || !r.IsValueType) {
 
-                        // If one of the operands are reference types and 
other is object, support for 'Is' operator
-                                if (oper == Operator.Is) {
-                                        eclass = ExprClass.Value;
-                                        type = TypeManager.bool_type;
-                                        return this;
-                                }
-                       }
-               } else if (!l.IsValueType && !r.IsValueType) {
+                                       // If one of the operands are reference 
types and other is object, support for 'Is' operator
+                                       if (oper == Operator.Is) {
+                                               eclass = ExprClass.Value;
+                                               type = TypeManager.bool_type;
+                                               return this;
+                                       }
+                               }
 
-                        // If both the operands are reference types, support 
for 'Is' operator
-                                if (oper == Operator.Is) {
-                                        eclass = ExprClass.Value;
-                                        type = TypeManager.bool_type;
-                                        return this;
-                                }
                
                        } else if (!l.IsValueType || !r.IsValueType) {
+                               if (!l.IsValueType && !r.IsValueType) {
+                                       // If both the operands are reference 
types, support for 'Is' operator
+                                       if (oper == Operator.Is) {
+                                                       eclass = 
ExprClass.Value;
+                                               type = TypeManager.bool_type;
+                                               return this;
+                                       }
+                               }
                                // Either of the operands are reference types
                                if (l.IsSubclassOf (TypeManager.delegate_type) 
&& 
                                    r.IsSubclassOf (TypeManager.delegate_type)) 
{

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to