RUSSEK-Software/DynamORM
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Browse Source
This commit is contained in:
grzegorz.russek
2014-11-27 22:04:43 +00:00
parent efb03643d1
commit 10a22759eb
4 changed files with 67 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
DynamORM/Helpers/Dynamics/DynamicProxy.cs
View File

@@ -67,7 +67,9 @@ namespace DynamORM.Helpers.Dynamics
k => k.Value.Name,
v => v.Value);
_methods = GetAllMembers(_type)
_methods = mapper.MethodsMap;
/*GetAllMembers(_type)
.Where(x => x is MethodInfo)
.Cast<MethodInfo>()
.Where(m => !((m.Name.StartsWith("set_") && m.ReturnType == typeof(void)) || m.Name.StartsWith("get_")))
@@ -84,7 +86,7 @@ namespace DynamORM.Helpers.Dynamics
{
return null;
}
});
});*/
}
/// <summary>Provides implementation for type conversion operations.
@@ -236,7 +238,7 @@ namespace DynamORM.Helpers.Dynamics
if (d != null)
{
result = d.DynamicInvoke(CompleteArguments(mi.GetParameters().ToArray(), args));
result = d.DynamicInvoke(CompleteArguments(mi.GetParameters().ToArray(), args).ToArray());
if (d.Method.ReturnType == _type && result is T)
result = new DynamicProxy<T>((T)result);
@@ -245,7 +247,7 @@ namespace DynamORM.Helpers.Dynamics
}
else if (mi != null)
{
result = mi.Invoke(_proxy, CompleteArguments(mi.GetParameters().ToArray(), args));
result = mi.Invoke(_proxy, CompleteArguments(mi.GetParameters().ToArray(), args).Skip(1).ToArray());
if (mi.ReturnType == _type && result is T)
result = new DynamicProxy<T>((T)result);
@@ -268,9 +270,9 @@ namespace DynamORM.Helpers.Dynamics
return true;
}
private object[] CompleteArguments(ParameterInfo[] parameters, object[] arguments)
private IEnumerable<object> CompleteArguments(ParameterInfo[] parameters, object[] arguments)
{
return arguments.Concat(parameters.Skip(arguments.Length).Select(p => p.DefaultValue)).ToArray();
return new object[] { _proxy }.Union(arguments.Concat(parameters.Skip(arguments.Length).Select(p => p.DefaultValue)));
}
private IEnumerable<MemberInfo> GetAllMembers(Type type)
@@ -320,7 +322,6 @@ namespace DynamORM.Helpers.Dynamics
object res;
TryInvokeMethod("Dispose", out res, new object[] { });
_methods.Clear();
_properties.Clear();
_methods = null;