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

Better handling of interop

Browse Source
This commit is contained in:
Deukhoofd
2019-02-25 13:26:27 +01:00
parent 834d65f38e
commit 6bc3469860
2 changed files with 36 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -100,9 +100,9 @@ namespace Upsilon.BaseTypes.UserData
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;
}
@@ -114,7 +114,7 @@ namespace Upsilon.BaseTypes.UserData
return null;
}
var typeCode = System.Type.GetTypeCode(type);
var typeCode = System.Type.GetTypeCode(requiredType);
switch (typeCode)
{
case TypeCode.Boolean:
@@ -166,7 +166,7 @@ namespace Upsilon.BaseTypes.UserData
}
var valueType = value.GetType();
if (type == typeof(IIterable))
if (requiredType == typeof(IIterable))
{
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)
return d.Dictionary;
if (value is ScriptTable.ScriptTable table)
{
var generics = type.GetGenericArguments();
var generics = requiredType.GetGenericArguments();
var d1 = typeof(Dictionary<,>);
var requiredDictionaryType = d1.MakeGenericType(typeof(string), generics[1]);
var dictionary = (IDictionary)Activator.CreateInstance(requiredDictionaryType);
@@ -195,14 +195,14 @@ namespace Upsilon.BaseTypes.UserData
return dictionary;
}
}
if (typeof(IList).IsAssignableFrom(type))
if (typeof(IList).IsAssignableFrom(requiredType))
{
if (value is ListUserData d)
{
if (d.List.GetType() == type)
if (d.List.GetType() == requiredType)
return d.List;
var generics = type.GetGenericArguments();
var generics = requiredType.GetGenericArguments();
var l1 = typeof(List<>);
var requiredListType = l1.MakeGenericType(generics[0]);
var list = (IList)Activator.CreateInstance(requiredListType);
@@ -214,7 +214,7 @@ namespace Upsilon.BaseTypes.UserData
}
if (value is ScriptTable.ScriptTable table)
{
var generics = type.GetGenericArguments();
var generics = requiredType.GetGenericArguments();
if (generics.Length > 0)
{
var l1 = typeof(List<>);
@@ -228,7 +228,7 @@ namespace Upsilon.BaseTypes.UserData
}
else
{
var elementType = type.GetElementType();
var elementType = requiredType.GetElementType();
var input = table.EvaluationScope.Variables.Select(x => ChangeType(x.Value, elementType, culture)).ToArray();
var array = Array.CreateInstance(elementType, input.Length);
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)
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)
{
var generics = type.GetGenericArguments();
var generics = requiredType.GetGenericArguments();
var l1 = typeof(List<>);
var requiredListType = l1.MakeGenericType(generics[0]);
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;
if (!isScriptTypeRequired && isScriptType)
{