Better handling of getting valid bound type.

This commit is contained in:
2019-02-19 12:59:07 +01:00
parent 18ca112624
commit 685cae2dc6
4 changed files with 14 additions and 8 deletions

View File

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

View File

@@ -61,7 +61,12 @@ namespace Upsilon.BoundTypes
}
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>)))
{
TypeLookup.TryAdd(type, bDef.Key);

View File

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