Author: jbevain
Date: 2008-01-24 12:55:41 -0500 (Thu, 24 Jan 2008)
New Revision: 93821
Modified:
trunk/mcs/class/System.Core/System.Linq.Expressions/ChangeLog
trunk/mcs/class/System.Core/System.Linq.Expressions/Expression.cs
trunk/mcs/class/System.Core/System.Linq.Expressions/ExpressionPrinter.cs
trunk/mcs/class/System.Core/System.Linq.Expressions/MemberExpression.cs
Log:
2008-01-24 Jb Evain <[EMAIL PROTECTED]>
* Expression.cs, MemberExpression.cs, ExpressionPrinter.cs:
implement Field and Property.
Modified: trunk/mcs/class/System.Core/System.Linq.Expressions/ChangeLog
===================================================================
--- trunk/mcs/class/System.Core/System.Linq.Expressions/ChangeLog
2008-01-24 17:53:48 UTC (rev 93820)
+++ trunk/mcs/class/System.Core/System.Linq.Expressions/ChangeLog
2008-01-24 17:55:41 UTC (rev 93821)
@@ -1,3 +1,8 @@
+2008-01-24 Jb Evain <[EMAIL PROTECTED]>
+
+ * Expression.cs, MemberExpression.cs, ExpressionPrinter.cs:
+ implement Field and Property.
+
2008-01-22 Miguel de Icaza <[EMAIL PROTECTED]>
* BinaryExpression.cs: Unleash the power of cut and paste.
Modified: trunk/mcs/class/System.Core/System.Linq.Expressions/Expression.cs
===================================================================
--- trunk/mcs/class/System.Core/System.Linq.Expressions/Expression.cs
2008-01-24 17:53:48 UTC (rev 93820)
+++ trunk/mcs/class/System.Core/System.Linq.Expressions/Expression.cs
2008-01-24 17:55:41 UTC (rev 93821)
@@ -42,6 +42,9 @@
static BindingFlags PublicInstance = BindingFlags.Public |
BindingFlags.Instance;
static BindingFlags PublicStatic = BindingFlags.Public |
BindingFlags.Static;
+ static BindingFlags AllInstance = BindingFlags.Public |
BindingFlags.NonPublic | BindingFlags.Instance;
+ static BindingFlags AllStatic = BindingFlags.Public |
BindingFlags.NonPublic | BindingFlags.Static;
+ static BindingFlags All = BindingFlags.Public |
BindingFlags.NonPublic | BindingFlags.Static | BindingFlags.Instance;
public ExpressionType NodeType {
get { return node_type; }
@@ -994,16 +997,30 @@
throw new NotImplementedException ();
}
- [MonoTODO]
public static MemberExpression Field (Expression expression,
FieldInfo field)
{
- throw new NotImplementedException ();
+ if (field == null)
+ throw new ArgumentNullException ("field");
+ if (!field.IsStatic) {
+ if (expression == null)
+ throw new ArgumentNullException
("expression");
+ if (!field.DeclaringType.IsAssignableFrom
(expression.Type))
+ throw new ArgumentException ("field");
+ }
+
+ return new MemberExpression (expression, field,
field.FieldType);
}
- [MonoTODO]
public static MemberExpression Field (Expression expression,
string fieldName)
{
- throw new NotImplementedException ();
+ if (expression == null)
+ throw new ArgumentNullException ("expression");
+
+ var field = expression.Type.GetField (fieldName,
AllInstance);
+ if (field == null)
+ throw new ArgumentException (string.Format ("No
field named {0} on {1}", fieldName, expression.Type));
+
+ return new MemberExpression (expression, field,
field.FieldType);
}
public static Type GetActionType (params Type [] typeArgs)
@@ -1385,22 +1402,64 @@
return new ParameterExpression (type, name);
}
- [MonoTODO]
public static MemberExpression Property (Expression expression,
MethodInfo propertyAccessor)
{
- throw new NotImplementedException ();
+ if (propertyAccessor == null)
+ throw new ArgumentNullException
("propertyAccessor");
+
+ if (!propertyAccessor.IsStatic) {
+ if (expression == null)
+ throw new ArgumentNullException
("expression");
+ if
(!propertyAccessor.DeclaringType.IsAssignableFrom (expression.Type))
+ throw new ArgumentException
("expression");
+ }
+
+ var prop = GetAssociatedProperty (propertyAccessor);
+ if (prop == null)
+ throw new ArgumentException (string.Format
("Method {0} has no associated property", propertyAccessor));
+
+ return new MemberExpression (expression, prop,
prop.PropertyType);
}
- [MonoTODO]
+ static PropertyInfo GetAssociatedProperty (MethodInfo method)
+ {
+ foreach (var prop in method.DeclaringType.GetProperties
(All)) {
+ if (prop.GetGetMethod (true) == method)
+ return prop;
+ }
+
+ return null;
+ }
+
public static MemberExpression Property (Expression expression,
PropertyInfo property)
{
- throw new NotImplementedException ();
+ if (property == null)
+ throw new ArgumentNullException ("property");
+
+ var getter = property.GetGetMethod (true);
+ if (getter == null)
+ throw new ArgumentException ("getter");
+
+ if (!getter.IsStatic) {
+ if (expression == null)
+ throw new ArgumentNullException
("expression");
+ if (!property.DeclaringType.IsAssignableFrom
(expression.Type))
+ throw new ArgumentException
("expression");
+ }
+
+ return new MemberExpression (expression, property,
property.PropertyType);
}
- [MonoTODO]
public static MemberExpression Property (Expression expression,
string propertyName)
{
- throw new NotImplementedException ();
+ if (expression == null)
+ throw new ArgumentNullException ("expression");
+
+ var prop = expression.Type.GetProperty (propertyName,
AllInstance);
+ if (prop == null)
+ throw new ArgumentException (string.Format ("No
property named {0} on {1}", propertyName, expression.Type));
+
+ return new MemberExpression (expression, prop,
prop.PropertyType);
}
[MonoTODO]
Modified:
trunk/mcs/class/System.Core/System.Linq.Expressions/ExpressionPrinter.cs
===================================================================
--- trunk/mcs/class/System.Core/System.Linq.Expressions/ExpressionPrinter.cs
2008-01-24 17:53:48 UTC (rev 93820)
+++ trunk/mcs/class/System.Core/System.Linq.Expressions/ExpressionPrinter.cs
2008-01-24 17:55:41 UTC (rev 93821)
@@ -246,9 +246,14 @@
Print (parameter.Name ?? "<param>");
}
- protected override void VisitMemberAccess (MemberExpression
member)
+ protected override void VisitMemberAccess (MemberExpression
access)
{
- throw new NotImplementedException ();
+ if (access.Expression == null)
+ Print (access.Member.DeclaringType.Name);
+ else
+ Visit (access.Expression);
+
+ Print (".{0}", access.Member.Name);
}
protected override void VisitMethodCall (MethodCallExpression
call)
Modified:
trunk/mcs/class/System.Core/System.Linq.Expressions/MemberExpression.cs
===================================================================
--- trunk/mcs/class/System.Core/System.Linq.Expressions/MemberExpression.cs
2008-01-24 17:53:48 UTC (rev 93820)
+++ trunk/mcs/class/System.Core/System.Linq.Expressions/MemberExpression.cs
2008-01-24 17:55:41 UTC (rev 93821)
@@ -45,6 +45,13 @@
get { return member; }
}
+ internal MemberExpression (Expression expression, MemberInfo
member, Type type)
+ : base (ExpressionType.MemberAccess, type)
+ {
+ this.expression = expression;
+ this.member = member;
+ }
+
internal override void Emit (EmitContext ec)
{
throw new NotImplementedException ();
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
