Leahnaya/UniVRM
1
0
Fork 0
mirror of https://github.com/vrm-c/UniVRM.git synced 2026-09-10 12:59:17 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

GenericInvokeCallFactory.Create to CreateAction

Browse Source
This commit is contained in:
ousttrue
2019-02-02 16:39:03 +09:00
parent 1e7c340efa
commit 49b57e7ef3
5 changed files with 30 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Assets/VRM/UniJSON/Editor/Tests/GenericCallUtilityTests.cs
View File

@@ -31,11 +31,11 @@ namespace UniJSON
var mi = s.GetType().GetMethod("Set");
var invoke = (Action<Sample, int>)GenericInvokeCallFactory.Create<Sample, int>(mi);
var invoke = GenericInvokeCallFactory.CreateAction<Sample, int>(mi);
invoke(s, 1);
Assert.AreEqual(1, s.Value);
var exp = (Action<Sample, int>)GenericExpressionCallFactory.Create<Sample, int>(mi);
var exp = GenericExpressionCallFactory.Create<Sample, int>(mi);
exp(s, 2);
Assert.AreEqual(2, s.Value);
}

10
Assets/VRM/UniJSON/Scripts/FormatterExtensionsSerializer.cs
View File

@@ -84,7 +84,7 @@ namespace UniJSON
if (typeof(T) == typeof(object) && t.GetType() != typeof(object))
{
var mi = FormatterExtensionsSerializer.GetMethod("SerializeObject");
return GenericInvokeCallFactory.Create<IFormatter, T>(mi);
return GenericInvokeCallFactory.CreateAction<IFormatter, T>(mi);
}
try
@@ -93,7 +93,7 @@ namespace UniJSON
var mi = typeof(IFormatter).GetMethod("Value", new Type[] { t });
if (mi != null)
{
return GenericInvokeCallFactory.Create<IFormatter, T>(mi);
return GenericInvokeCallFactory.CreateAction<IFormatter, T>(mi);
}
}
catch (AmbiguousMatchException)
@@ -111,7 +111,7 @@ namespace UniJSON
if (idictionary != null)
{
var mi = FormatterExtensionsSerializer.GetMethod("SerializeDictionary");
return GenericInvokeCallFactory.Create<IFormatter, T>(mi);
return GenericInvokeCallFactory.CreateAction<IFormatter, T>(mi);
}
}
@@ -120,7 +120,7 @@ namespace UniJSON
if (t == typeof(object[]))
{
var mi = FormatterExtensionsSerializer.GetMethod("SerializeObjectArray");
return GenericInvokeCallFactory.Create<IFormatter, T>(mi);
return GenericInvokeCallFactory.CreateAction<IFormatter, T>(mi);
}
}
@@ -134,7 +134,7 @@ namespace UniJSON
{
var g = FormatterExtensionsSerializer.GetMethod("SerializeArray");
var mi = g.MakeGenericMethod(ienumerable.GetGenericArguments());
return GenericInvokeCallFactory.Create<IFormatter, T>(mi);
return GenericInvokeCallFactory.CreateAction<IFormatter, T>(mi);
}
}

20
Assets/VRM/UniJSON/Scripts/GenericCallUtility/GenericInvokeCallFactory.cs
View File

@@ -43,7 +43,7 @@ namespace UniJSON
");
// CreateWithThis
w.WriteLine("//////////// Create");
w.WriteLine("//////////// CreateAction");
// Create
for (int i = 1; i <= ARGS && i< NET35MAX; ++i)
@@ -54,7 +54,7 @@ namespace UniJSON
var source = @"
public static Action<S, $0> Create<S, $0>(MethodInfo m)
public static Action<S, $0> CreateAction<S, $0>(MethodInfo m)
{
Action<S, $0> callback = null;
if (m.IsStatic)
@@ -88,7 +88,7 @@ namespace UniJSON
var a = String.Join(", ", GetArgs("a", i).ToArray());
var source = @"
public static Action<$0> CreateWithThis<S, $0>(MethodInfo m, S instance)
public static Action<$0> CreateActionBindThis<S, $0>(MethodInfo m, S instance)
{
if (m.IsStatic)
{
@@ -130,8 +130,8 @@ namespace UniJSON
}
#endif
#region no arguments
public static Action<S> Create<S>(MethodInfo m)
#region zero arguments
public static Action<S> CreateAction<S>(MethodInfo m)
{
return (s) =>
{
@@ -139,7 +139,15 @@ namespace UniJSON
};
}
public static Action CreateWithThis<S>(MethodInfo m, S instance)
public static Func<S, T> CreateFunc<S, T>(MethodInfo m)
{
return (s) =>
{
return (T)m.Invoke(s, new object[] { });
};
}
public static Action CreateActionBindThis<S>(MethodInfo m, S instance)
{
return () =>
{

16
Assets/VRM/UniJSON/Scripts/GenericCallUtility/GenericInvokeCallFactory.g.cs
View File

@@ -8,9 +8,9 @@ namespace UniJSON
public static partial class GenericInvokeCallFactory
{
//////////// Create
//////////// CreateAction
public static Action<S, A0> Create<S, A0>(MethodInfo m)
public static Action<S, A0> CreateAction<S, A0>(MethodInfo m)
{
Action<S, A0> callback = null;
if (m.IsStatic)
@@ -31,7 +31,7 @@ namespace UniJSON
}
public static Action<S, A0, A1> Create<S, A0, A1>(MethodInfo m)
public static Action<S, A0, A1> CreateAction<S, A0, A1>(MethodInfo m)
{
Action<S, A0, A1> callback = null;
if (m.IsStatic)
@@ -52,7 +52,7 @@ namespace UniJSON
}
public static Action<S, A0, A1, A2> Create<S, A0, A1, A2>(MethodInfo m)
public static Action<S, A0, A1, A2> CreateAction<S, A0, A1, A2>(MethodInfo m)
{
Action<S, A0, A1, A2> callback = null;
if (m.IsStatic)
@@ -74,7 +74,7 @@ namespace UniJSON
//////////// CreateWithThis
public static Action<A0> CreateWithThis<S, A0>(MethodInfo m, S instance)
public static Action<A0> CreateActionBindThis<S, A0>(MethodInfo m, S instance)
{
if (m.IsStatic)
{
@@ -100,7 +100,7 @@ namespace UniJSON
}
public static Action<A0, A1> CreateWithThis<S, A0, A1>(MethodInfo m, S instance)
public static Action<A0, A1> CreateActionBindThis<S, A0, A1>(MethodInfo m, S instance)
{
if (m.IsStatic)
{
@@ -126,7 +126,7 @@ namespace UniJSON
}
public static Action<A0, A1, A2> CreateWithThis<S, A0, A1, A2>(MethodInfo m, S instance)
public static Action<A0, A1, A2> CreateActionBindThis<S, A0, A1, A2>(MethodInfo m, S instance)
{
if (m.IsStatic)
{
@@ -152,7 +152,7 @@ namespace UniJSON
}
public static Action<A0, A1, A2, A3> CreateWithThis<S, A0, A1, A2, A3>(MethodInfo m, S instance)
public static Action<A0, A1, A2, A3> CreateActionBindThis<S, A0, A1, A2, A3>(MethodInfo m, S instance)
{
if (m.IsStatic)
{

2
Assets/VRM/UniJSON/Scripts/JsonSchemaValidator/JsonArrayValidator.cs
View File

@@ -264,7 +264,7 @@ namespace UniJSON
IFormatter,
JsonSchemaValidationContext,
T>)
GenericInvokeCallFactory.Create<
GenericInvokeCallFactory.CreateAction<
IJsonSchemaValidator,
IFormatter,
JsonSchemaValidationContext,