Deukhoofd/Upsilon
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Rework of function calling to handle generics better

Browse Source
This commit is contained in:
Deukhoofd
2018-12-09 11:28:27 +01:00
parent 43d9360145
commit 422de5d4eb
5 changed files with 224 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Upsilon/BaseTypes/ScriptFunction/ScriptMethodInfoFunction.cs
View File

@@ -49,13 +49,11 @@ namespace Upsilon.BaseTypes.ScriptFunction
objects.Add(script);
if (_passScopeReference)
objects.Add(scope);
objects.AddRange(_directTypeManipulation
? variables.Select(x => (object) x).ToList()
: variables.Select(x => x.ToCSharpObject()).ToList());
objects.AddRange(variables.Select(x => (object) x).ToList() );
object result;
try
{
result = _object.GetType().InvokeMember(_method.Name, BindingFlags.InvokeMethod, System.Type.DefaultBinder,
result = _object.GetType().InvokeMember(_method.Name, BindingFlags.InvokeMethod, UpsilonBinder.Default,
_object, objects.ToArray());
}
catch (TargetInvocationException e)