Merge PublicSetterRef into TypeFieldInfo

Author: mythz

src/ServiceStack.Text/AutoMappingUtils.cs

@@ -766,6 +766,9 @@ public void Populate(object to, object from,
     public delegate void PropertySetterDelegate(object instance, object value);
     public delegate object PropertyGetterDelegate(object instance);
 
+    public delegate void PropertySetterRefDelegate(ref object instance, object propertyValue);
+    public delegate void PropertySetterRefGenericDelegate<T>(ref T instance, object value);
+
     internal static class PropertyInvoker
     {
         public static PropertySetterDelegate GetPropertySetterFn(this PropertyInfo propertyInfo)

src/ServiceStack.Text/Common/JsDelegates.cs

@@ -28,10 +28,6 @@ namespace ServiceStack.Text.Common
 
     public delegate void SetPropertyDelegate(object instance, object propertyValue);
 
-    public delegate void SetPropertyDelegateRef(ref object instance, object propertyValue);
-
-    public delegate void SetPropertyDelegateRefGeneric<T>(ref T instance, object value);
-
     public delegate object ParseStringDelegate(string stringValue);
 
     public delegate object ConvertObjectDelegate(object fromObject);

src/ServiceStack.Text/Reflection/StaticAccessors.cs

@@ -220,7 +220,7 @@ public static Action<T, object> GetValueSetter<T>(this FieldInfo fieldInfo)
             ).Compile();
         }
 
-        public static SetPropertyDelegateRefGeneric<T> GetValueSetterGenericRef<T>(this FieldInfo fieldInfo)
+        public static PropertySetterRefGenericDelegate<T> GetValueSetterGenericRef<T>(this FieldInfo fieldInfo)
         {
             var instance = Expression.Parameter(typeof(T).MakeByRefType(), "i");
             var argument = Expression.Parameter(typeof(object), "a");
@@ -233,7 +233,7 @@ public static SetPropertyDelegateRefGeneric<T> GetValueSetterGenericRef<T>(this
                 field,
                 Expression.Convert(argument, fieldInfo.FieldType));
 
-            return Expression.Lambda<SetPropertyDelegateRefGeneric<T>>
+            return Expression.Lambda<PropertySetterRefGenericDelegate<T>>
             (
                 setterCall, instance, argument
             ).Compile();

src/ServiceStack.Text/TypeFields.cs

@@ -4,7 +4,6 @@
 using System.Threading;
 using ServiceStack.Reflection;
 using ServiceStack.Text;
-using ServiceStack.Text.Common;
 
 namespace ServiceStack
 {
@@ -13,27 +12,28 @@ public class TypeFieldInfo
         public TypeFieldInfo(
             FieldInfo fieldInfo,
             PropertyGetterDelegate publicGetter,
-            PropertySetterDelegate publicSetter)
+            PropertySetterDelegate publicSetter,
+            PropertySetterRefDelegate publicSetterRef)
         {
             FieldInfo = fieldInfo;
             PublicGetter = publicGetter;
             PublicSetter = publicSetter;
+            PublicSetterRef = publicSetterRef;
         }
 
         public FieldInfo FieldInfo { get; }
 
         public PropertyGetterDelegate PublicGetter { get; }
 
         public PropertySetterDelegate PublicSetter { get; }
+
+        public PropertySetterRefDelegate PublicSetterRef { get; }
     }
 
     public class TypeFields<T> : TypeFields
     {
         public static readonly TypeFields<T> Instance = new TypeFields<T>();
 
-        public readonly Dictionary<string, SetPropertyDelegateRefGeneric<T>> GenericPublicSetters =
-            new Dictionary<string, SetPropertyDelegateRefGeneric<T>>(PclExport.Instance.InvariantComparerIgnoreCase);
-
         static TypeFields()
         {
             Instance.Type = typeof(T);
@@ -42,34 +42,24 @@ static TypeFields()
             {
                 try
                 {
+                    var fnRef = fi.GetValueSetterGenericRef<T>();
                     Instance.FieldsMap[fi.Name] = new TypeFieldInfo(
                         fi,
                         PclExport.Instance.GetFieldGetterFn(fi),
-                        PclExport.Instance.GetFieldSetterFn(fi));
-
-                    Instance.GenericPublicSetters[fi.Name] = fi.GetValueSetterGenericRef<T>();
+                        PclExport.Instance.GetFieldSetterFn(fi),
+                        delegate (ref object instance, object arg)
+                        {
+                            var valueInstance = (T)instance;
+                            fnRef(ref valueInstance, arg);
+                            instance = valueInstance;
+                        });
                 }
                 catch (Exception ex)
                 {
                     Tracer.Instance.WriteError(ex);
                 }
             }
         }
-
-        public override SetPropertyDelegateRef GetPublicSetterRef(string name)
-        {
-            if (name == null)
-                return null;
-
-            return GenericPublicSetters.TryGetValue(name, out SetPropertyDelegateRefGeneric<T> fn)
-                ? delegate (ref object instance, object arg)
-                  {
-                      var valueInstance = (T)instance;
-                      fn(ref valueInstance, arg);
-                      instance = valueInstance;
-                  }
-            : (SetPropertyDelegateRef)null;
-        }
     }
 
     public abstract class TypeFields
@@ -142,9 +132,14 @@ public virtual PropertySetterDelegate GetPublicSetter(string name)
                 : null;
         }
 
-        public virtual SetPropertyDelegateRef GetPublicSetterRef(string name)
+        public virtual PropertySetterRefDelegate GetPublicSetterRef(string name)
         {
-            throw new NotImplementedException();
+            if (name == null)
+                return null;
+
+            return FieldsMap.TryGetValue(name, out TypeFieldInfo info)
+                ? info.PublicSetterRef
+                : null;
         }
     }
 }