Skip to content

Add support for simple nested expressions #188

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
merged 2 commits into from
Oct 11, 2022
Merged

Add support for simple nested expressions #188

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8c8c899
Add support for simple nested expressions
hazzik Oct 11, 2022
4574356
fixup! Add support for simple nested expressions
hazzik Oct 11, 2022
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
163 changes: 163 additions & 0 deletions src/DelegateDecompiler.Tests/NestedExpressionsTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,163 @@
using System;
using System.Collections.Generic;
using System.Linq;
using NUnit.Framework;

namespace DelegateDecompiler.Tests
{
public class NestedExpressionsTests : DecompilerTestsBase
{
readonly int f1 = 0;
static readonly int f2 = 0;
int p1 => 0;
static int p2 => 0;
int M1() => 0;
static int M2() => 0;

[Test]
public void TestNestedExpression()
{
Test<Func<IQueryable<int>, int>>(
ints => ints.SingleOrDefault(i => i == 0),
ints => ints.SingleOrDefault(i => i == 0)
);
}

[Test, Ignore("Not supported yet")]
public void TestExpressionWithClosure()
{
var v = 0;
Test<Func<IQueryable<int>, int>>(
ints => ints.SingleOrDefault(i => i == v),
ints => ints.SingleOrDefault(i => i == v)
);
}

[Test, Ignore("Not supported yet")]
public void TestExpressionWithFieldClosure()
{
Test<Func<IQueryable<int>, int>>(
ints => ints.SingleOrDefault(i => i == f1),
ints => ints.SingleOrDefault(i => i == f1)
);
}

[Test]
public void TestExpressionWithStaticFieldClosure()
{
Test<Func<IQueryable<int>, int>>(
ints => ints.SingleOrDefault(i => i == f2),
ints => ints.SingleOrDefault(i => i == f2)
);
}

[Test, Ignore("Not supported yet")]
public void TestExpressionWithPropertyClosure()
{
Test<Func<IQueryable<int>, int>>(
ints => ints.SingleOrDefault(i => i == p1),
ints => ints.SingleOrDefault(i => i == p1)
);
}

[Test]
public void TestExpressionWithStaticPropertyClosure()
{
Test<Func<IQueryable<int>, int>>(
ints => ints.SingleOrDefault(i => i == p2),
ints => ints.SingleOrDefault(i => i == p2)
);
}

[Test, Ignore("Not supported yet")]
public void TestExpressionWithMethodClosure()
{
Test<Func<IQueryable<int>, int>>(
ints => ints.SingleOrDefault(i => i == M1()),
ints => ints.SingleOrDefault(i => i == M1())
);
}

[Test]
public void TestExpressionWithStaticMethodClosure()
{
Test<Func<IQueryable<int>, int>>(
ints => ints.SingleOrDefault(i => i == M2()),
ints => ints.SingleOrDefault(i => i == M2())
);
}

[Test]
public void TestNestedFunc()
{
Test<Func<IEnumerable<int>, int>>(
ints => ints.SingleOrDefault(i => i == 0),
ints => ints.SingleOrDefault(i => i == 0)
);
}

[Test]
public void TestFuncWithClosure()
{
var v = 0;
Test<Func<IEnumerable<int>, int>>(
ints => ints.SingleOrDefault(i => i == v),
ints => ints.SingleOrDefault(i => i == v)
);
}

[Test]
public void TestFuncWithFieldClosure()
{
Test<Func<IEnumerable<int>, int>>(
ints => ints.SingleOrDefault(i => i == f1),
ints => ints.SingleOrDefault(i => i == f1)
);
}

[Test]
public void TestFuncWithStaticFieldClosure()
{
Test<Func<IEnumerable<int>, int>>(
ints => ints.SingleOrDefault(i => i == f2),
ints => ints.SingleOrDefault(i => i == f2)
);
}

[Test]
public void TestFuncWithPropertyClosure()
{
Test<Func<IEnumerable<int>, int>>(
ints => ints.SingleOrDefault(i => i == p1),
ints => ints.SingleOrDefault(i => i == p1)
);
}

[Test]
public void TestFuncWithStaticPropertyClosure()
{
Test<Func<IEnumerable<int>, int>>(
ints => ints.SingleOrDefault(i => i == p2),
ints => ints.SingleOrDefault(i => i == p2)
);
}

[Test]
public void TestFuncWithMethodClosure()
{
Test<Func<IEnumerable<int>, int>>(
ints => ints.SingleOrDefault(i => i == M1()),
ints => ints.SingleOrDefault(i => i == M1())
);
}

[Test]
public void TestFuncWithStaticMethodClosure()
{
Test<Func<IEnumerable<int>, int>>(
ints => ints.SingleOrDefault(i => i == M2()),
ints => ints.SingleOrDefault(i => i == M2())
);
}
}
}
17 changes: 17 additions & 0 deletions src/DelegateDecompiler/OptimizeExpressionVisitor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -334,6 +334,23 @@ node.Operand is BinaryExpression binary &&
return base.VisitUnary(node);
}

protected override Expression VisitMethodCall(MethodCallExpression node)
{
if (node.Method.DeclaringType == typeof(Expression))
{
// Execute nested lambda expression methods
var fun = Expression.Lambda<Func<object>>(node).Compile();
var value = fun();
if (value is LambdaExpression expression)
{
return Expression.Quote(expression);
}

return Expression.Constant(value);
}

return base.VisitMethodCall(node);
}

static bool Invert(ref BinaryExpression expression)
{
Expand Down