Add field accessor and tests for set/get of sub and super fields/properties

Author: mythz

src/ServiceStack.Text/Reflection/StaticAccessors.cs

@@ -51,10 +51,12 @@ public static Func<T, object> GetValueGetter<T>(this PropertyInfo propertyInfo)
 			if (getMethodInfo == null) return null;
 			return x => getMethodInfo.Invoke(x, new object[0]);
 #else
-            var instance = Expression.Parameter(propertyInfo.DeclaringType, "i");
-            var property = Expression.Property(instance, propertyInfo);
-            var convert = Expression.TypeAs(property, typeof(object));
-            return Expression.Lambda<Func<T, object>>(convert, instance).Compile();
+            var instance = Expression.Parameter(typeof(T), "i");
+            var property = typeof(T) != propertyInfo.DeclaringType
+                ? Expression.Property(Expression.TypeAs(instance, propertyInfo.DeclaringType), propertyInfo)
+                : Expression.Property(instance, propertyInfo);
+            var convertProperty = Expression.TypeAs(property, typeof(object));
+            return Expression.Lambda<Func<T, object>>(convertProperty, instance).Compile();
 #endif
         }
 
@@ -63,25 +65,28 @@ public static Func<T, object> GetValueGetter<T>(this FieldInfo fieldInfo)
 #if (SL5 && !WP) || __IOS__ || XBOX
             return x => fieldInfo.GetValue(x);
 #else
-            var instance = Expression.Parameter(fieldInfo.DeclaringType, "i");
-            var property = Expression.Field(instance, fieldInfo);
-            var convert = Expression.TypeAs(property, typeof(object));
-            return Expression.Lambda<Func<T, object>>(convert, instance).Compile();
+
+            var instance = Expression.Parameter(typeof(T), "i");
+            var field = typeof(T) != fieldInfo.DeclaringType
+                ? Expression.Field(Expression.TypeAs(instance, fieldInfo.DeclaringType), fieldInfo)
+                : Expression.Field(instance, fieldInfo);
+            var convertField = Expression.TypeAs(field, typeof(object));
+            return Expression.Lambda<Func<T, object>>(convertField, instance).Compile();
 #endif
         }
 
 #if !XBOX
         public static Action<T, object> GetValueSetter<T>(this PropertyInfo propertyInfo)
         {
-            if (typeof(T) != propertyInfo.DeclaringType)
-            {
-                throw new ArgumentException();
-            }
-
-            var instance = Expression.Parameter(propertyInfo.DeclaringType, "i");
+            var instance = Expression.Parameter(typeof(T), "i");
             var argument = Expression.Parameter(typeof(object), "a");
+
+            var instanceType = typeof(T) != propertyInfo.DeclaringType
+                ? (Expression)Expression.TypeAs(instance, propertyInfo.DeclaringType)
+                : instance;
+
             var setterCall = Expression.Call(
-                instance,
+                instanceType,
                 propertyInfo.SetMethod(),
                 Expression.Convert(argument, propertyInfo.PropertyType));
 
@@ -90,6 +95,25 @@ public static Action<T, object> GetValueSetter<T>(this PropertyInfo propertyInfo
                 setterCall, instance, argument
             ).Compile();
         }
+
+        public static Action<T, object> GetValueSetter<T>(this FieldInfo fieldInfo)
+        {
+            var instance = Expression.Parameter(typeof(T), "i");
+            var argument = Expression.Parameter(typeof(object), "a");
+
+            var field = typeof(T) != fieldInfo.DeclaringType
+                ? Expression.Field(Expression.TypeAs(instance, fieldInfo.DeclaringType), fieldInfo)
+                : Expression.Field(instance, fieldInfo);
+
+            var setterCall = Expression.Assign(
+                field,
+                Expression.Convert(argument, fieldInfo.FieldType));
+
+            return Expression.Lambda<Action<T, object>>
+            (
+                setterCall, instance, argument
+            ).Compile();
+        }
 #endif
 
     }

tests/ServiceStack.Text.Tests/StaticAccessorTests.cs

@@ -6,13 +6,21 @@ namespace ServiceStack.Text.Tests
     public class AccessorBase
     {
         public string Base { get; set; }
+        public string BaseField;
     }
 
     public class Accessor
     {
         public string Declared { get; set; }
     }
 
+    public class SubAccessor : AccessorBase
+    {
+        public string Sub { get; set; }
+        public string SubField;
+    }
+
+
     [TestFixture]
     public class StaticAccessorTests
     {
@@ -28,5 +36,47 @@ public void Can_get_accessor_in_declared_and_base_class()
             var declaredSetter = declaredProperty.GetValueSetter<Accessor>();
             Assert.That(declaredSetter, Is.Not.Null);
         }
+
+        [Test]
+        public void Can_get_property_accessor_from_sub_and_super_types()
+        {
+            var sub = new SubAccessor();
+            var subGet = StaticAccessors.GetValueGetter<SubAccessor>(typeof(SubAccessor).GetProperty("Sub"));
+            var subSet = StaticAccessors.GetValueSetter<SubAccessor>(typeof(SubAccessor).GetProperty("Sub"));
+
+            subSet(sub, "sub");
+            Assert.That(subGet(sub), Is.EqualTo("sub"));
+
+            var sup = new AccessorBase();
+            var supGet = StaticAccessors.GetValueGetter<AccessorBase>(typeof(AccessorBase).GetProperty("Base"));
+            var supSet = StaticAccessors.GetValueSetter<AccessorBase>(typeof(AccessorBase).GetProperty("Base"));
+
+            supSet(sup, "base");
+            Assert.That(supGet(sup), Is.EqualTo("base"));
+            supSet(sub, "base");
+            Assert.That(supGet(sub), Is.EqualTo("base"));
+        }
+
+        [Test]
+        public void Can_get_field_accessor_from_sub_and_super_types()
+        {
+            var sub = new SubAccessor();
+            var subGet = StaticAccessors.GetValueGetter<SubAccessor>(typeof(SubAccessor).GetField("SubField"));
+            var subSet = StaticAccessors.GetValueSetter<SubAccessor>(typeof(SubAccessor).GetField("SubField"));
+
+            subSet(sub, "sub");
+            Assert.That(subGet(sub), Is.EqualTo("sub"));
+
+            var sup = new AccessorBase();
+            var supGet = StaticAccessors.GetValueGetter<AccessorBase>(typeof(AccessorBase).GetField("BaseField"));
+            var supSet = StaticAccessors.GetValueSetter<AccessorBase>(typeof(AccessorBase).GetField("BaseField"));
+
+            supSet(sup, "base");
+            Assert.That(supGet(sup), Is.EqualTo("base"));
+            supSet(sub, "base");
+            Assert.That(supGet(sub), Is.EqualTo("base"));
+        }
     }
+
+
 }