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

Better handling of getting valid bound type.

This commit is contained in:
Deukhoofd 2019-02-19 12:59:07 +01:00
parent 18ca112624
commit 685cae2dc6
No known key found for this signature in database
GPG Key ID: B4C087AC81641654
4 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Upsilon/BaseTypes/TypeContainer.cs
View File

@ -1,6 +1,5 @@
using System; using System;
using System.Collections.Immutable; using System.Collections.Immutable;
using System.Diagnostics;
using Upsilon.BoundTypes; using Upsilon.BoundTypes;
namespace Upsilon.BaseTypes namespace Upsilon.BaseTypes

7
Upsilon/BoundTypes/BoundTypeHandler.cs
View File

@ -61,7 +61,12 @@ namespace Upsilon.BoundTypes
} }
var bDef = TypeDefinitions.FirstOrDefault(x => var bDef = TypeDefinitions.FirstOrDefault(x =>
x.Value.ValidInternalTypes.Any(validType => validType.IsAssignableFrom(type))); {
var first = x.Value.ValidInternalTypes.FirstOrDefault();
if (first == null)
return false;
return first.IsAssignableFrom(type);
});
if (!bDef.Equals(default(KeyValuePair<string, BoundTypeDefinition>))) if (!bDef.Equals(default(KeyValuePair<string, BoundTypeDefinition>)))
{ {
TypeLookup.TryAdd(type, bDef.Key); TypeLookup.TryAdd(type, bDef.Key);

2
Upsilon/BoundTypes/UserDataBoundTypeDefinition.cs
View File

@ -44,6 +44,8 @@ namespace Upsilon.BoundTypes
// We don't want the global object type to be returned // We don't want the global object type to be returned
if (currentBaseType == typeof(object)) if (currentBaseType == typeof(object))
break; break;
if (currentBaseType == typeof(ValueType))
break;
yield return currentBaseType; yield return currentBaseType;
currentBaseType = currentBaseType.BaseType; currentBaseType = currentBaseType.BaseType;
} }

12
UpsilonTests/GeneralTests/StringTests.cs
View File

@ -14,8 +14,8 @@ namespace UpsilonTests.GeneralTests
public void BasicStringVariable() public void BasicStringVariable()
{ {
const string input = @" const string input = @"
string = ""test"" str = ""test""
return string return str
"; ";
var evaluated = Executor.EvaluateScript<string>(input, Options); var evaluated = Executor.EvaluateScript<string>(input, Options);
Assert.Equal("test", evaluated); Assert.Equal("test", evaluated);
@ -25,8 +25,8 @@ return string
public void StringIndexable() public void StringIndexable()
{ {
const string input = @" const string input = @"
string = ""test"" str = ""test""
return string[3] return str[3]
"; ";
var evaluated = Executor.EvaluateScript<string>(input, Options); var evaluated = Executor.EvaluateScript<string>(input, Options);
Assert.Equal("s", evaluated); Assert.Equal("s", evaluated);
@ -36,8 +36,8 @@ return string[3]
public void StringAddition() public void StringAddition()
{ {
const string input = @" const string input = @"
string = ""test"" + ""123"" str = ""test"" + ""123""
return string return str
"; ";
var evaluated = Executor.EvaluateScript<string>(input, Options); var evaluated = Executor.EvaluateScript<string>(input, Options);
Assert.Equal("test123", evaluated); Assert.Equal("test123", evaluated);