Merge pull request #165 from dwango/work_aot_2

Removed Expression.Compile
vrm-c · Feb 4, 2019 · 0e5ea32 · 0e5ea32
2 parents 1e7c340 + cc9de91
commit 0e5ea32
Show file tree

Hide file tree

Showing 10 changed files with 430 additions and 226 deletions.
diff --git a/Assets/VRM/UniJSON/Editor/Tests/GenericCallUtilityTests.cs b/Assets/VRM/UniJSON/Editor/Tests/GenericCallUtilityTests.cs
@@ -20,6 +20,11 @@ public void Set(int value)
             {
                 Value = value;
             }
+
+            public int Get(int _)
+            {
+                return Value;
+            }
         }
 
 
@@ -29,15 +34,27 @@ public void GenericCallUtilityTestsSimplePasses()
         {
             var s = new Sample();
 
-            var mi = s.GetType().GetMethod("Set");
 
-            var invoke = (Action<Sample, int>)GenericInvokeCallFactory.Create<Sample, int>(mi);
-            invoke(s, 1);
-            Assert.AreEqual(1, s.Value);
+            {
+                var mi = s.GetType().GetMethod("Set");
+                var action = GenericInvokeCallFactory.OpenAction<Sample, int>(mi);
+                action(s, 1);
+                Assert.AreEqual(1, s.Value);
+            }
+
+            {
+                var mi = s.GetType().GetMethod("Get");
+                var func = GenericInvokeCallFactory.OpenFunc<Sample, int, int>(mi);
+                var value = func(s, 1);
+                Assert.AreEqual(1, s.Value);
+            }
 
-            var exp = (Action<Sample, int>)GenericExpressionCallFactory.Create<Sample, int>(mi);
-            exp(s, 2);
-            Assert.AreEqual(2, s.Value);
+            {
+                var mi = s.GetType().GetMethod("Set");
+                var action = GenericExpressionCallFactory.Create<Sample, int>(mi);
+                action(s, 2);
+                Assert.AreEqual(2, s.Value);
+            }
         }
     }
 }
diff --git a/Assets/VRM/UniJSON/Scripts/FormatterExtensions.cs b/Assets/VRM/UniJSON/Scripts/FormatterExtensions.cs
@@ -45,23 +45,20 @@ static MethodInfo GetMethod<T>(Expression<Func<T>> expression)
             return method.MakeGenericMethod(typeof(T));
         }
 
-        [Obsolete("error when AOT. use Key, Value")]
+        //
+        // https://stackoverflow.com/questions/238765/given-a-type-expressiontype-memberaccess-how-do-i-get-the-field-value
+        //
         public static void KeyValue<T>(this IFormatter f, Expression<Func<T>> expression)
         {
-            var func = expression.Compile();
-            var value = func();
-            if (value != null)
-            {
-                var body = expression.Body as MemberExpression;
-                if (body == null)
-                {
-                    body = ((UnaryExpression)expression.Body).Operand as MemberExpression;
-                }
-                f.Key(body.Member.Name);
-                f.Serialize(expression.Compile()());
-                //var method = GetMethod(expression);
-                //method.Invoke(this, new object[] { value });
-            }
+            MemberExpression outerMember = (MemberExpression)expression.Body;
+            var outerProp = (FieldInfo)outerMember.Member;
+            MemberExpression innerMember = (MemberExpression)outerMember.Expression;
+            var innerField = (FieldInfo)innerMember.Member;
+            ConstantExpression ce = (ConstantExpression)innerMember.Expression;
+            object innerObj = ce.Value;
+            object outerObj = innerField.GetValue(innerObj);
+            f.Key(outerProp.Name);
+            f.Serialize(outerProp.GetValue(outerObj));
         }
     }
 }
diff --git a/Assets/VRM/UniJSON/Scripts/FormatterExtensionsSerializer.cs b/Assets/VRM/UniJSON/Scripts/FormatterExtensionsSerializer.cs
@@ -84,7 +84,7 @@ static Action<IFormatter, T> GetSerializer(Type t)
             if (typeof(T) == typeof(object) && t.GetType() != typeof(object))
             {
                 var mi = FormatterExtensionsSerializer.GetMethod("SerializeObject");
-                return GenericInvokeCallFactory.Create<IFormatter, T>(mi);
+                return GenericInvokeCallFactory.StaticAction<IFormatter, T>(mi);
             }
 
             try
@@ -93,7 +93,7 @@ static Action<IFormatter, T> GetSerializer(Type t)
                 var mi = typeof(IFormatter).GetMethod("Value", new Type[] { t });
                 if (mi != null)
                 {
-                    return GenericInvokeCallFactory.Create<IFormatter, T>(mi);
+                    return GenericInvokeCallFactory.OpenAction<IFormatter, T>(mi);
                 }
             }
             catch (AmbiguousMatchException)
@@ -111,7 +111,7 @@ static Action<IFormatter, T> GetSerializer(Type t)
                 if (idictionary != null)
                 {
                     var mi = FormatterExtensionsSerializer.GetMethod("SerializeDictionary");
-                    return GenericInvokeCallFactory.Create<IFormatter, T>(mi);
+                    return GenericInvokeCallFactory.StaticAction<IFormatter, T>(mi);
                 }
             }
 
@@ -120,7 +120,7 @@ static Action<IFormatter, T> GetSerializer(Type t)
                 if (t == typeof(object[]))
                 {
                     var mi = FormatterExtensionsSerializer.GetMethod("SerializeObjectArray");
-                    return GenericInvokeCallFactory.Create<IFormatter, T>(mi);
+                    return GenericInvokeCallFactory.StaticAction<IFormatter, T>(mi);
                 }
             }
 
@@ -134,7 +134,7 @@ static Action<IFormatter, T> GetSerializer(Type t)
                 {
                     var g = FormatterExtensionsSerializer.GetMethod("SerializeArray");
                     var mi = g.MakeGenericMethod(ienumerable.GetGenericArguments());
-                    return GenericInvokeCallFactory.Create<IFormatter, T>(mi);
+                    return GenericInvokeCallFactory.StaticAction<IFormatter, T>(mi);
                 }
             }