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

Better handling of interop

This commit is contained in:
Deukhoofd 2019-02-25 13:26:27 +01:00
parent 834d65f38e
commit 6bc3469860
No known key found for this signature in database
GPG Key ID: B4C087AC81641654
2 changed files with 36 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -49,7 +49,7 @@ namespace Upsilon.BaseTypes.ScriptFunction
public override ScriptType Run(Diagnostics diagnostics, ScriptType[] variables, EvaluationScope scope, TextSpan span, EvaluationState state) public override ScriptType Run(Diagnostics diagnostics, ScriptType[] variables, EvaluationScope scope, TextSpan span, EvaluationState state)
{ {
state.Stacktrace.Push(this); state.Stacktrace.Push(this);
var result = Execute(variables, state.Script, scope, span); var result = Execute(variables, state, scope, span);
state.Stacktrace.Pop(); state.Stacktrace.Pop();
if (_directTypeManipulation) if (_directTypeManipulation)
return (ScriptType)result; return (ScriptType)result;
@ -61,7 +61,7 @@ namespace Upsilon.BaseTypes.ScriptFunction
TextSpan span , EvaluationState state) TextSpan span , EvaluationState state)
{ {
state.Stacktrace.Push(this); state.Stacktrace.Push(this);
var result = Execute(variables, state.Script, scope, span); var result = Execute(variables, state, scope, span);
if (result is IEnumerator enumerator) if (result is IEnumerator enumerator)
{ {
while (enumerator.MoveNext()) while (enumerator.MoveNext())
@ -75,11 +75,11 @@ namespace Upsilon.BaseTypes.ScriptFunction
state.Stacktrace.Pop(); state.Stacktrace.Pop();
} }
private object Execute(IEnumerable<ScriptType> variables, Script script, EvaluationScope scope, TextSpan span) private object Execute(IEnumerable<ScriptType> variables, EvaluationState state, EvaluationScope scope, TextSpan span)
{ {
var objects = new List<object>(); var objects = new List<object>();
if (_passScriptReference) if (_passScriptReference)
objects.Add(script); objects.Add(state.Script);
if (_passScopeReference) if (_passScopeReference)
objects.Add(scope); objects.Add(scope);
objects.AddRange(variables.Select(x => (object) x).ToList() ); objects.AddRange(variables.Select(x => (object) x).ToList() );
@ -92,7 +92,8 @@ namespace Upsilon.BaseTypes.ScriptFunction
// grab the parameters, and just invoke it // grab the parameters, and just invoke it
var array = objects.ToArray(); var array = objects.ToArray();
var methodInfo = Method.GetMethod(ref array); var methodInfo = Method.GetMethod(ref array);
result = methodInfo.Invoke(null, array); result = methodInfo.Invoke(null, BindingFlags.InvokeMethod, UpsilonBinder.Default, array,
CultureInfo.InvariantCulture);
} }
else else
{ {
@ -137,7 +138,7 @@ namespace Upsilon.BaseTypes.ScriptFunction
// if we haven't found a method, we throw an exception // if we haven't found a method, we throw an exception
if (method == null) if (method == null)
{ {
throw new EvaluationException(script.FileName, throw new EvaluationException(state.Script.FileName,
$"Can't find method {Method.Name} with parameter types {string.Join(", ", convertedTypes.Select(x => x.Name))} on type {_object.GetType().Name}", $"Can't find method {Method.Name} with parameter types {string.Join(", ", convertedTypes.Select(x => x.Name))} on type {_object.GetType().Name}",
span); span);
} }
@ -156,8 +157,10 @@ namespace Upsilon.BaseTypes.ScriptFunction
// Catch any exception inside the invocation // Catch any exception inside the invocation
catch (TargetInvocationException e) catch (TargetInvocationException e)
{ {
if (e.InnerException != null) throw e.InnerException; Exception exception = e;
throw; if (e.InnerException != null) exception = e.InnerException;
throw new EvaluationException(state.Script.FileName,
"An Exception occured while executing a C# function:\n" + exception, span, state.Stacktrace);
} }
return result; return result;
} }

40
Upsilon/BaseTypes/UserData/UpsilonBinder.cs
View File

@ -100,9 +100,9 @@ namespace Upsilon.BaseTypes.UserData
return true; return true;
} }
public override object ChangeType(object value, System.Type type, CultureInfo culture) public override object ChangeType(object value, System.Type requiredType, CultureInfo culture)
{ {
if (type.IsInstanceOfType(value)) if (requiredType.IsInstanceOfType(value))
{ {
return value; return value;
} }
@ -114,7 +114,7 @@ namespace Upsilon.BaseTypes.UserData
return null; return null;
} }
var typeCode = System.Type.GetTypeCode(type); var typeCode = System.Type.GetTypeCode(requiredType);
switch (typeCode) switch (typeCode)
{ {
case TypeCode.Boolean: case TypeCode.Boolean:
@ -166,7 +166,7 @@ namespace Upsilon.BaseTypes.UserData
} }
var valueType = value.GetType(); var valueType = value.GetType();
if (type == typeof(IIterable)) if (requiredType == typeof(IIterable))
{ {
if (typeof(IDictionary).IsAssignableFrom(valueType)) if (typeof(IDictionary).IsAssignableFrom(valueType))
{ {
@ -178,13 +178,13 @@ namespace Upsilon.BaseTypes.UserData
} }
} }
if (typeof(IDictionary).IsAssignableFrom(type)) if (typeof(IDictionary).IsAssignableFrom(requiredType))
{ {
if (value is DictionaryUserData d) if (value is DictionaryUserData d)
return d.Dictionary; return d.Dictionary;
if (value is ScriptTable.ScriptTable table) if (value is ScriptTable.ScriptTable table)
{ {
var generics = type.GetGenericArguments(); var generics = requiredType.GetGenericArguments();
var d1 = typeof(Dictionary<,>); var d1 = typeof(Dictionary<,>);
var requiredDictionaryType = d1.MakeGenericType(typeof(string), generics[1]); var requiredDictionaryType = d1.MakeGenericType(typeof(string), generics[1]);
var dictionary = (IDictionary)Activator.CreateInstance(requiredDictionaryType); var dictionary = (IDictionary)Activator.CreateInstance(requiredDictionaryType);
@ -195,14 +195,14 @@ namespace Upsilon.BaseTypes.UserData
return dictionary; return dictionary;
} }
} }
if (typeof(IList).IsAssignableFrom(type)) if (typeof(IList).IsAssignableFrom(requiredType))
{ {
if (value is ListUserData d) if (value is ListUserData d)
{ {
if (d.List.GetType() == type) if (d.List.GetType() == requiredType)
return d.List; return d.List;
var generics = type.GetGenericArguments(); var generics = requiredType.GetGenericArguments();
var l1 = typeof(List<>); var l1 = typeof(List<>);
var requiredListType = l1.MakeGenericType(generics[0]); var requiredListType = l1.MakeGenericType(generics[0]);
var list = (IList)Activator.CreateInstance(requiredListType); var list = (IList)Activator.CreateInstance(requiredListType);
@ -214,7 +214,7 @@ namespace Upsilon.BaseTypes.UserData
} }
if (value is ScriptTable.ScriptTable table) if (value is ScriptTable.ScriptTable table)
{ {
var generics = type.GetGenericArguments(); var generics = requiredType.GetGenericArguments();
if (generics.Length > 0) if (generics.Length > 0)
{ {
var l1 = typeof(List<>); var l1 = typeof(List<>);
@ -228,7 +228,7 @@ namespace Upsilon.BaseTypes.UserData
} }
else else
{ {
var elementType = type.GetElementType(); var elementType = requiredType.GetElementType();
var input = table.EvaluationScope.Variables.Select(x => ChangeType(x.Value, elementType, culture)).ToArray(); var input = table.EvaluationScope.Variables.Select(x => ChangeType(x.Value, elementType, culture)).ToArray();
var array = Array.CreateInstance(elementType, input.Length); var array = Array.CreateInstance(elementType, input.Length);
input.CopyTo(array, 0); input.CopyTo(array, 0);
@ -237,13 +237,23 @@ namespace Upsilon.BaseTypes.UserData
} }
} }
if (typeof(IEnumerable).IsAssignableFrom(type)) if (typeof(IEnumerable).IsAssignableFrom(requiredType))
{ {
if (value is ListUserData d) if (value is ListUserData d)
return d.List; {
var generics = requiredType.GetGenericArguments();
var l1 = typeof(List<>);
var requiredListType = l1.MakeGenericType(generics[0]);
var list = (IList)Activator.CreateInstance(requiredListType);
foreach (var variable in d.List)
{
list.Add(variable);
}
return list;
}
if (value is ScriptTable.ScriptTable table) if (value is ScriptTable.ScriptTable table)
{ {
var generics = type.GetGenericArguments(); var generics = requiredType.GetGenericArguments();
var l1 = typeof(List<>); var l1 = typeof(List<>);
var requiredListType = l1.MakeGenericType(generics[0]); var requiredListType = l1.MakeGenericType(generics[0]);
var list = (IList)Activator.CreateInstance(requiredListType); var list = (IList)Activator.CreateInstance(requiredListType);
@ -255,7 +265,7 @@ namespace Upsilon.BaseTypes.UserData
} }
} }
var isScriptTypeRequired = typeof(ScriptType).IsAssignableFrom(type); var isScriptTypeRequired = typeof(ScriptType).IsAssignableFrom(requiredType);
var isScriptType = value is ScriptType; var isScriptType = value is ScriptType;
if (!isScriptTypeRequired && isScriptType) if (!isScriptTypeRequired && isScriptType)
{ {