Author: miguel
Date: 2008-01-22 00:20:21 -0500 (Tue, 22 Jan 2008)
New Revision: 93477
Modified:
trunk/mcs/mcs/ChangeLog
trunk/mcs/mcs/expression.cs
Log:
2008-01-22 Miguel de Icaza <[EMAIL PROTECTED]>
* expression.cs (CreateExpressionTree): Add support for or and
logical or, and indent following the coding conventions.
Modified: trunk/mcs/mcs/ChangeLog
===================================================================
--- trunk/mcs/mcs/ChangeLog 2008-01-22 05:12:04 UTC (rev 93476)
+++ trunk/mcs/mcs/ChangeLog 2008-01-22 05:20:21 UTC (rev 93477)
@@ -1,5 +1,8 @@
2008-01-22 Miguel de Icaza <[EMAIL PROTECTED]>
+ * expression.cs (CreateExpressionTree): Add support for or and
+ logical or, and indent following the coding conventions.
+
* typemanager.cs (LinqExpression): renamed from
ExpressionTreeManager, for a shorter name.
Modified: trunk/mcs/mcs/expression.cs
===================================================================
--- trunk/mcs/mcs/expression.cs 2008-01-22 05:12:04 UTC (rev 93476)
+++ trunk/mcs/mcs/expression.cs 2008-01-22 05:20:21 UTC (rev 93477)
@@ -2901,16 +2901,16 @@
opcode = OpCodes.Mul;
} else
opcode = OpCodes.Mul;
-
+
break;
-
+
case Operator.Division:
if (is_unsigned)
opcode = OpCodes.Div_Un;
else
opcode = OpCodes.Div;
break;
-
+
case Operator.Modulus:
if (is_unsigned)
opcode = OpCodes.Rem_Un;
@@ -3035,20 +3035,28 @@
{
string method_name;
switch (oper) {
- case Operator.Addition:
- if (ec.CheckState)
- method_name = "AddChecked";
- else
- method_name = "Add";
- break;
- case Operator.BitwiseAnd:
- method_name = "And";
- break;
- case Operator.LogicalAnd:
- method_name = "AndAlso";
- break;
- default:
- throw new InternalErrorException
("Unknown expression tree binary operator " + oper);
+ case Operator.Addition:
+ if (ec.CheckState)
+ method_name = "AddChecked";
+ else
+ method_name = "Add";
+ break;
+ case Operator.BitwiseAnd:
+ method_name = "And";
+ break;
+ case Operator.LogicalAnd:
+ method_name = "AndAlso";
+ break;
+
+ case Operator.BitwiseOr:
+ method_name = "Or";
+ break;
+
+ case Operator.LogicalOr:
+ method_name = "OrElse";
+ break;
+ default:
+ throw new InternalErrorException ("Unknown
expression tree binary operator " + oper);
}
ArrayList args = new ArrayList (2);
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
