Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature: Added support for implicit type conversions #166

Merged
merged 5 commits into from
May 26, 2018
Merged

Feature: Added support for implicit type conversions #166

Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d6d190a
Update ExpressionParser.cs
arjenvrh May 15, 2018
cdfaa4a
Update ExpressionParser.cs
arjenvrh May 15, 2018
5147d58
Update ExpressionParser.cs
arjenvrh May 15, 2018
f7b4e89
Unit test for implicit casting
May 15, 2018
d2c635b
Unit test for implicit casting
May 16, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 20 additions & 1 deletion src/System.Linq.Dynamic.Core/Parser/ExpressionParser.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -499,9 +499,21 @@ Expression ParseComparisonOperator()
}
}


if (!typesAreSameAndImplementCorrectInterface)
{
CheckAndPromoteOperands(isEquality ? typeof(IEqualitySignatures) : typeof(IRelationalSignatures), op.Text, ref left, ref right, op.Pos);
if (left.Type.GetTypeInfo().IsClass && right is ConstantExpression && HasImplicitConversion(left.Type, right.Type))
{
left = Expression.Convert(left, right.Type);
}
else if (right.Type.GetTypeInfo().IsClass && left is ConstantExpression && HasImplicitConversion(right.Type, left.Type))
{
right = Expression.Convert(right, left.Type);
}
else
{
CheckAndPromoteOperands(isEquality ? typeof(IEqualitySignatures) : typeof(IRelationalSignatures), op.Text, ref left, ref right, op.Pos);
}
}
}

Expand Down Expand Up @@ -533,6 +545,13 @@ Expression ParseComparisonOperator()
return left;
}

private bool HasImplicitConversion(Type baseType, Type targetType)
{
return baseType.GetMethods(BindingFlags.Public | BindingFlags.Static)
.Where(mi => mi.Name == "op_Implicit" && mi.ReturnType == targetType)
.Any(mi => mi.GetParameters().FirstOrDefault()?.ParameterType == baseType);
}

private ConstantExpression ParseEnumToConstantExpression(int pos, Type leftType, ConstantExpression constantExpr)
{
return Expression.Constant(ParseConstantExpressionToEnum(pos, leftType, constantExpr), leftType);
Expand Down