yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cleanup

Browse Source
This commit is contained in:
Stephan
2018-02-09 18:22:59 +01:00
parent aa614f1e20
commit af7df0c6b5
15 changed files with 129 additions and 388 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/Umbraco.Core/ReflectionUtilities.cs
View File

@@ -254,7 +254,7 @@ namespace Umbraco.Core
if (lambdaParameters.Length != ctorParameters.Length)
ThrowInvalidLambda<TLambda>("ctor", ctorDeclaring, ctorParameters);
for (var i = 0; i < lambdaParameters.Length; i++)
if (lambdaParameters[i] != ctorParameters[i]) // fixme cast? relax?
if (lambdaParameters[i] != ctorParameters[i]) // note: relax the constraint with IsAssignableFrom?
ThrowInvalidLambda<TLambda>("ctor", ctorDeclaring, ctorParameters);
if (!returned.IsAssignableFrom(ctorDeclaring))
ThrowInvalidLambda<TLambda>("ctor", ctorDeclaring, ctorParameters);
@@ -596,42 +596,6 @@ namespace Umbraco.Core
ilgen.Emit(ldargOpCodes[i]);
else
ilgen.Emit(OpCodes.Ldarg, i);
//EmitInputAdapter(ilgen, lambdaArgTypes[i], methodArgTypes[i]);
}
}
// emits adapter opcodes after each OpCode.Ldarg
private static void EmitInputAdapter(ILGenerator ilgen, Type inputType, Type methodParamType)
{
if (inputType == methodParamType) return;
if (methodParamType.IsValueType)
{
if (inputType.IsValueType)
{
// both input and parameter are value types
// not supported, use proper input
// (otherwise, would require converting)
throw new NotSupportedException("ValueTypes conversion.");
}
// parameter is value type, but input is reference type
// unbox the input to the parameter value type
// fixme - conversions?
ilgen.Emit(OpCodes.Unbox_Any, inputType);
}
else
{
// parameter is reference type, but input is value type
// not supported, input should always be less constrained
// (otherwise, would require boxing and converting)
if (inputType.IsValueType)
throw new NotSupportedException("ValueType boxing.");
// both input and parameter are reference types
// cast the input to the parameter type
ilgen.Emit(OpCodes.Castclass, methodParamType);
}
}
@@ -652,7 +616,6 @@ namespace Umbraco.Core
// returned is value type, but output is reference type
// box the returned value
// fixme - conversions?
ilgen.Emit(OpCodes.Box, methodReturnedType);
}
else