Skip to content

Ensure that one-way implicit conversions also work for value types #287

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

Merged
StefH merged 5 commits into from
Aug 18, 2019
Merged

Ensure that one-way implicit conversions also work for value types #287

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6106cf5
Merge pull request #1 from StefH/master
alexweav Aug 16, 2019
19098fa
Try and convert both ways regardless of which side is a constant
alexweav Aug 16, 2019
088bc99
Add test for value type implicit conversion
alexweav Aug 16, 2019
f492c86
Fix incorrectness in test and add explicit assert for all four config…
alexweav Aug 16, 2019
966c810
Test every existing case but where the comparison operands are revers…
alexweav Aug 16, 2019
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
22 changes: 18 additions & 4 deletions 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 @@ -504,13 +504,27 @@ Expression ParseComparisonOperator()

if (!typesAreSameAndImplementCorrectInterface)
{
if (left.Type.GetTypeInfo().IsClass && right is ConstantExpression && HasImplicitConversion(left.Type, right.Type))
if (left.Type.GetTypeInfo().IsClass && right is ConstantExpression)
{
left = Expression.Convert(left, right.Type);
if (HasImplicitConversion(left.Type, right.Type))
{
left = Expression.Convert(left, right.Type);
}
else if (HasImplicitConversion(right.Type, left.Type))
{
right = Expression.Convert(right, left.Type);
}
}
else if (right.Type.GetTypeInfo().IsClass && left is ConstantExpression && HasImplicitConversion(right.Type, left.Type))
else if (right.Type.GetTypeInfo().IsClass && left is ConstantExpression)
{
right = Expression.Convert(right, left.Type);
if (HasImplicitConversion(right.Type, left.Type))
{
right = Expression.Convert(right, left.Type);
}
else if (HasImplicitConversion(left.Type, right.Type))
{
left = Expression.Convert(left, right.Type);
}
}
else
{
Expand Down
139 changes: 132 additions & 7 deletions test/System.Linq.Dynamic.Core.Tests/DynamicExpressionParserTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,14 +84,87 @@ public override string ToString()
}
}

public class CustomClassWithReversedImplicitConversion
{
public CustomClassWithReversedImplicitConversion(string origin)
{
Origin = origin;
}

public string Origin { get; }

public static implicit operator string(CustomClassWithReversedImplicitConversion origin)
{
return origin.ToString();
}

public override string ToString()
{
return Origin;
}
}

public class CustomClassWithValueTypeImplicitConversion
{
public CustomClassWithValueTypeImplicitConversion(int origin)
{
Origin = origin;
}

public int Origin { get; }

public static implicit operator CustomClassWithValueTypeImplicitConversion(int origin)
{
return new CustomClassWithValueTypeImplicitConversion(origin);
}

public override string ToString()
{
return Origin.ToString();
}
}

public class CustomClassWithReversedValueTypeImplicitConversion
{
public CustomClassWithReversedValueTypeImplicitConversion(int origin)
{
Origin = origin;
}

public int Origin { get; }

public static implicit operator int(CustomClassWithReversedValueTypeImplicitConversion origin)
{
return origin.Origin;
}

public override string ToString()
{
return Origin.ToString();
}
}

public class TestImplicitConversionContainer
{
public TestImplicitConversionContainer(CustomClassWithOneWayImplicitConversion oneWay)
public TestImplicitConversionContainer(
CustomClassWithOneWayImplicitConversion oneWay,
CustomClassWithReversedImplicitConversion reversed,
CustomClassWithValueTypeImplicitConversion valueType,
CustomClassWithReversedValueTypeImplicitConversion reversedValueType)
{
OneWay = oneWay;
Reversed = Reversed;
ValueType = valueType;
ReversedValueType = reversedValueType;
}

public CustomClassWithOneWayImplicitConversion OneWay { get; }

public CustomClassWithReversedImplicitConversion Reversed { get; }

public CustomClassWithValueTypeImplicitConversion ValueType { get; }

public CustomClassWithReversedValueTypeImplicitConversion ReversedValueType { get; }
}

public class TextHolder
Expand Down Expand Up @@ -791,14 +864,66 @@ public void DynamicExpressionParser_ParseLambda_With_Concat_CustomType_String()
public void DynamicExpressionParser_ParseLambda_With_One_Way_Implicit_Conversions()
{
// Arrange
var testValue = "test";
var container = new TestImplicitConversionContainer(testValue);
var expressionText = $"OneWay == \"{testValue}\"";
var testString = "test";
var testInt = 6;
var container = new TestImplicitConversionContainer(testString, new CustomClassWithReversedImplicitConversion(testString), testInt, new CustomClassWithReversedValueTypeImplicitConversion(testInt));

// Act
var lambda = DynamicExpressionParser.ParseLambda<TestImplicitConversionContainer, bool>(ParsingConfig.Default, false, expressionText);
var expressionTextString = $"OneWay == \"{testString}\"";
var expressionTextReversed = $"Reversed == \"{testString}\"";
var expressionTextValueType = $"ValueType == {testInt}";
var expressionTextReversedValueType = $"ReversedValueType == {testInt}";

// Assert
var invertedExpressionTextString = $"\"{testString}\" == OneWay";
var invertedExpressionTextReversed = $"\"{testString}\" == Reversed";
var invertedExpressionTextValueType = $"{testInt} == ValueType";
var invertedExpressionTextReversedValueType = $"{testInt} == ReversedValueType";

// Act 1
var lambda = DynamicExpressionParser.ParseLambda<TestImplicitConversionContainer, bool>(ParsingConfig.Default, false, expressionTextString);

// Assert 1
Assert.NotNull(lambda);

// Act 2
lambda = DynamicExpressionParser.ParseLambda<TestImplicitConversionContainer, bool>(ParsingConfig.Default, false, expressionTextReversed);

// Assert 2
Assert.NotNull(lambda);

// Act 3
lambda = DynamicExpressionParser.ParseLambda<TestImplicitConversionContainer, bool>(ParsingConfig.Default, false, expressionTextValueType);

// Assert 3
Assert.NotNull(lambda);

// Act 4
lambda = DynamicExpressionParser.ParseLambda<TestImplicitConversionContainer, bool>(ParsingConfig.Default, false, expressionTextReversedValueType);

// Assert 4
Assert.NotNull(lambda);

// Act 5
lambda = DynamicExpressionParser.ParseLambda<TestImplicitConversionContainer, bool>(ParsingConfig.Default, false, invertedExpressionTextString);

// Assert 5
Assert.NotNull(lambda);

// Act 6
lambda = DynamicExpressionParser.ParseLambda<TestImplicitConversionContainer, bool>(ParsingConfig.Default, false, invertedExpressionTextReversed);

// Assert 6
Assert.NotNull(lambda);

// Act 7
lambda = DynamicExpressionParser.ParseLambda<TestImplicitConversionContainer, bool>(ParsingConfig.Default, false, invertedExpressionTextValueType);

// Assert 7
Assert.NotNull(lambda);

// Act 8
lambda = DynamicExpressionParser.ParseLambda<TestImplicitConversionContainer, bool>(ParsingConfig.Default, false, invertedExpressionTextReversedValueType);

// Assert 8
Assert.NotNull(lambda);
}

Expand Down