Skip to content

fix null guard #88

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

Open
koenbeuk wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix null guard #88

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 0 additions & 2 deletions src/ExpressiveSharp/Transformers/RemoveNullConditionalPatterns.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,8 +119,6 @@ private static bool AccessesReceiver(Expression expr, Expression receiver)
private static bool ExpressionsEqual(Expression a, Expression b)
{
if (a == b) return true;
if (a is ParameterExpression pa && b is ParameterExpression pb)
return pa.Name == pb.Name && pa.Type == pb.Type;
if (a is MemberExpression ma && b is MemberExpression mb)
return ma.Member == mb.Member
&& ma.Expression is not null && mb.Expression is not null
Expand Down
19 changes: 19 additions & 0 deletions tests/ExpressiveSharp.Tests/Transformers/RemoveNullConditionalPatternsTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,4 +243,23 @@ public void ImplementsIExpressionTreeTransformer()

Assert.AreSame(expr, result);
}

[TestMethod]
public void DistinctParametersWithSameName_GuardIsKept()
{
var x1 = Expression.Parameter(typeof(NullTestInner), "x");
var x2 = Expression.Parameter(typeof(NullTestInner), "x");

var conditional = Expression.Condition(
Expression.NotEqual(x1, Expression.Constant(null, typeof(NullTestInner))),
Expression.Property(x2, nameof(NullTestInner.Value)),
Expression.Constant(null, typeof(string)));

var lambda = Expression.Lambda<Func<NullTestInner?, NullTestInner?, string?>>(conditional, x1, x2);

var transformed = (Expression<Func<NullTestInner?, NullTestInner?, string?>>)_sut.Transform(lambda);
var compiled = transformed.Compile();

Assert.IsNull(compiled(null, new NullTestInner { Value = "bob" }));
}
}
Loading