mirror of
https://github.com/ICDSystems/ICD.Common.Utils.git
synced 2026-02-16 13:15:07 +00:00
Tidying
This commit is contained in:
@@ -34,12 +34,13 @@ namespace ICD.Common.Utils
|
|||||||
throw new ArgumentNullException("parameters");
|
throw new ArgumentNullException("parameters");
|
||||||
|
|
||||||
#if SIMPLSHARP
|
#if SIMPLSHARP
|
||||||
IEnumerable<CType> methodTypes
|
IEnumerable<CType>
|
||||||
#else
|
#else
|
||||||
IEnumerable<Type> methodTypes
|
IEnumerable<Type>
|
||||||
#endif
|
#endif
|
||||||
= constructor.GetParameters().Select(p => p.ParameterType);
|
parameterTypes = constructor.GetParameters().Select(p => p.ParameterType);
|
||||||
return ParametersMatchTypes(methodTypes, parameters);
|
|
||||||
|
return ParametersMatchTypes(parameterTypes, parameters);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@@ -57,12 +58,13 @@ namespace ICD.Common.Utils
|
|||||||
throw new ArgumentNullException("parameters");
|
throw new ArgumentNullException("parameters");
|
||||||
|
|
||||||
#if SIMPLSHARP
|
#if SIMPLSHARP
|
||||||
IEnumerable<CType> methodTypes
|
IEnumerable<CType>
|
||||||
#else
|
#else
|
||||||
IEnumerable<Type> methodTypes
|
IEnumerable<Type>
|
||||||
#endif
|
#endif
|
||||||
= method.GetParameters().Select(p => p.ParameterType);
|
parameterTypes = method.GetParameters().Select(p => p.ParameterType);
|
||||||
return ParametersMatchTypes(methodTypes, parameters);
|
|
||||||
|
return ParametersMatchTypes(parameterTypes, parameters);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@@ -77,11 +79,12 @@ namespace ICD.Common.Utils
|
|||||||
throw new ArgumentNullException("property");
|
throw new ArgumentNullException("property");
|
||||||
|
|
||||||
#if SIMPLSHARP
|
#if SIMPLSHARP
|
||||||
CType propertyType
|
CType
|
||||||
#else
|
#else
|
||||||
Type propertyType
|
Type
|
||||||
#endif
|
#endif
|
||||||
= property.PropertyType;
|
propertyType = property.PropertyType;
|
||||||
|
|
||||||
return ParametersMatchTypes(new[] {propertyType}, new[] {parameter});
|
return ParametersMatchTypes(new[] {propertyType}, new[] {parameter});
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -91,31 +94,41 @@ namespace ICD.Common.Utils
|
|||||||
/// <param name="types"></param>
|
/// <param name="types"></param>
|
||||||
/// <param name="parameters"></param>
|
/// <param name="parameters"></param>
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
|
private static bool ParametersMatchTypes(
|
||||||
#if SIMPLSHARP
|
#if SIMPLSHARP
|
||||||
private static bool ParametersMatchTypes(IEnumerable<CType> types, IEnumerable<object> parameters)
|
IEnumerable<CType>
|
||||||
{
|
|
||||||
if (types == null)
|
|
||||||
throw new ArgumentNullException("types");
|
|
||||||
|
|
||||||
CType[] typesArray = types as CType[] ?? types.ToArray();
|
|
||||||
#else
|
#else
|
||||||
private static bool ParametersMatchTypes(IEnumerable<Type> types, IEnumerable<object> parameters)
|
IEnumerable<Type>
|
||||||
|
#endif
|
||||||
|
types, IEnumerable<object> parameters)
|
||||||
{
|
{
|
||||||
if (types == null)
|
if (types == null)
|
||||||
throw new ArgumentNullException("types");
|
throw new ArgumentNullException("types");
|
||||||
|
|
||||||
Type[] typesArray = types as Type[] ?? types.ToArray();
|
|
||||||
#endif
|
|
||||||
if (parameters == null)
|
if (parameters == null)
|
||||||
throw new ArgumentNullException("parameters");
|
throw new ArgumentNullException("parameters");
|
||||||
|
|
||||||
|
#if SIMPLSHARP
|
||||||
|
CType[]
|
||||||
|
#else
|
||||||
|
Type[]
|
||||||
|
#endif
|
||||||
|
typesArray = types as
|
||||||
|
#if SIMPLSHARP
|
||||||
|
CType[]
|
||||||
|
#else
|
||||||
|
Type[]
|
||||||
|
#endif
|
||||||
|
?? types.ToArray();
|
||||||
|
|
||||||
object[] parametersArray = parameters as object[] ?? parameters.ToArray();
|
object[] parametersArray = parameters as object[] ?? parameters.ToArray();
|
||||||
|
|
||||||
if (parametersArray.Length != typesArray.Length)
|
if (parametersArray.Length != typesArray.Length)
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
// Compares each pair of items in the two arrays.
|
// Compares each pair of items in the two arrays.
|
||||||
return !parametersArray.Where((t, index) => !ParameterMatchesType(typesArray[index], t)).Any();
|
return !parametersArray.Where((t, index) => !ParameterMatchesType(typesArray[index], t))
|
||||||
|
.Any();
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@@ -124,43 +137,31 @@ namespace ICD.Common.Utils
|
|||||||
/// <param name="type"></param>
|
/// <param name="type"></param>
|
||||||
/// <param name="parameter"></param>
|
/// <param name="parameter"></param>
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
#if SIMPLSHARP
|
|
||||||
private static bool ParameterMatchesType(CType type, object parameter)
|
|
||||||
{
|
|
||||||
if (type == null)
|
|
||||||
throw new ArgumentNullException("type");
|
|
||||||
|
|
||||||
// Can the parameter be assigned a null value?
|
|
||||||
if (parameter == null)
|
|
||||||
return (type.IsClass || !type.IsValueType || Nullable.GetUnderlyingType(type) != null);
|
|
||||||
|
|
||||||
return type.IsInstanceOfType(parameter);
|
|
||||||
}
|
|
||||||
#else
|
|
||||||
private static bool ParameterMatchesType(Type type, object parameter)
|
private static bool ParameterMatchesType(Type type, object parameter)
|
||||||
{
|
{
|
||||||
if (type == null)
|
if (type == null)
|
||||||
throw new ArgumentNullException("type");
|
throw new ArgumentNullException("type");
|
||||||
|
|
||||||
|
#if SIMPLSHARP
|
||||||
|
// Can the parameter be assigned a null value?
|
||||||
|
if (parameter == null)
|
||||||
|
return (type.IsClass || !type.IsValueType || Nullable.GetUnderlyingType(type) != null);
|
||||||
|
return type.IsInstanceOfType(parameter);
|
||||||
|
#else
|
||||||
TypeInfo info = type.GetTypeInfo();
|
TypeInfo info = type.GetTypeInfo();
|
||||||
// Can the parameter be assigned a null value?
|
// Can the parameter be assigned a null value?
|
||||||
if (parameter == null)
|
if (parameter == null)
|
||||||
return (info.IsClass || !info.IsValueType || Nullable.GetUnderlyingType(type) != null);
|
return (info.IsClass || !info.IsValueType || Nullable.GetUnderlyingType(type) != null);
|
||||||
|
|
||||||
return info.IsInstanceOfType(parameter);
|
return info.IsInstanceOfType(parameter);
|
||||||
}
|
|
||||||
#endif
|
#endif
|
||||||
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Same as doing default(Type).
|
/// Same as doing default(Type).
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="type"></param>
|
/// <param name="type"></param>
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
#if SIMPLSHARP
|
|
||||||
public static object GetDefaultValue(CType type)
|
|
||||||
#else
|
|
||||||
public static object GetDefaultValue(Type type)
|
public static object GetDefaultValue(Type type)
|
||||||
#endif
|
|
||||||
{
|
{
|
||||||
if (type == null)
|
if (type == null)
|
||||||
throw new ArgumentNullException("type");
|
throw new ArgumentNullException("type");
|
||||||
@@ -220,10 +221,9 @@ namespace ICD.Common.Utils
|
|||||||
throw new ArgumentNullException("parameters");
|
throw new ArgumentNullException("parameters");
|
||||||
|
|
||||||
ConstructorInfo constructor =
|
ConstructorInfo constructor =
|
||||||
#if SIMPLSHARP
|
|
||||||
type.GetCType()
|
|
||||||
#else
|
|
||||||
type
|
type
|
||||||
|
#if SIMPLSHARP
|
||||||
|
.GetCType()
|
||||||
#endif
|
#endif
|
||||||
.GetConstructors()
|
.GetConstructors()
|
||||||
.FirstOrDefault(c => MatchesConstructorParameters(c, parameters));
|
.FirstOrDefault(c => MatchesConstructorParameters(c, parameters));
|
||||||
|
|||||||
Reference in New Issue
Block a user