Skip to content

Decompile nested method calls #216

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 3 commits into from
Oct 26, 2022
Merged

Decompile nested method calls #216

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5bb5212
Extended unit tests
magicmoux Oct 25, 2022
be5bff4
Decompile nested calls
hazzik Oct 26, 2022
35dec2c
Remove EF tests
hazzik Oct 26, 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
117 changes: 117 additions & 0 deletions src/DelegateDecompiler.Tests/NestedExpressionsTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,21 @@ public class NestedExpressionsTests : DecompilerTestsBase
int M1() => 0;
static int M2() => 0;

readonly IQueryable<int> fQref1 = Enumerable.Empty<int>().AsQueryable();
static IQueryable<int> fQref2 = Enumerable.Empty<int>().AsQueryable();
[Decompile]
IQueryable<int> pQref1 => Enumerable.Empty<int>().AsQueryable();
[Decompile]
static IQueryable<int> pQref2 => Enumerable.Empty<int>().AsQueryable();
[Decompile]
IQueryable<int> MQref1() => Enumerable.Empty<int>().AsQueryable();
[Decompile]
static IQueryable<int> MQref2() => Enumerable.Empty<int>().AsQueryable();
[Decompile]
IQueryable<int> ParamedMQref1(int floor) => Enumerable.Empty<int>().AsQueryable().Where(x => x >= floor);
[Decompile]
static IQueryable<int> ParamedMQref2(int floor) => Enumerable.Empty<int>().AsQueryable().Where(x => x >= floor);

[Test]
public void TestNestedExpression()
{
Expand Down Expand Up @@ -178,5 +193,107 @@ public void TestFuncWithStaticMethodClosure()
ints => ints.SingleOrDefault(i => i == M2())
);
}

[Test]
public void TestQueryableBoundAsVariable()
{
IQueryable<int> query = Enumerable.Empty<int>().AsQueryable().Where(i => i >= 0);
Test<Func<IQueryable<int>, IQueryable<int>>>(
ints => query,
ints => query
);
}

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

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

[Test]
public void TestQueryableRefFromProperty()
{
Test<Func<IQueryable<int>, IQueryable<int>>>(
ints => Enumerable.Empty<int>().AsQueryable().Where(i => i >= 0),
ints => pQref1.Where(i => i >= 0)
);
}

[Test]
public void TestQueryableRefFromStaticProperty()
{
Test<Func<IQueryable<int>, IQueryable<int>>>(
ints => Enumerable.Empty<int>().AsQueryable().Where(i => i >= 0),
ints => pQref2.Where(i => i >= 0)
);
}

[Test]
public void TestQueryableRefFromMethod()
{
Test<Func<IQueryable<int>, IQueryable<int>>>(
ints => Enumerable.Empty<int>().AsQueryable().Where(i => i >= 0),
ints => MQref1().Where(i => i >= 0)
);
}

[Test]
public void TestQueryableRefFromStaticMethod()
{
Test<Func<IQueryable<int>, IQueryable<int>>>(
ints => Enumerable.Empty<int>().AsQueryable().Where(i => i >= 0),
ints => MQref2().Where(i => i >= 0)
);
}

[Test]
public void TestQueryableRefFromMethodWithBoundParameters()
{
var floor = 10;
Test<Func<IQueryable<int>, IQueryable<int>>>(
ints => Enumerable.Empty<int>().AsQueryable().Where(x => x >= floor).Where(i => i >= 0),
ints => ParamedMQref1(floor).Where(i => i >= 0)
);
}

[Test]
public void TestQueryableRefFromStaticMethoWithBoundParameters()
{
var floor = 10;
Test<Func<IQueryable<int>, IQueryable<int>>>(
ints => Enumerable.Empty<int>().AsQueryable().Where(x => x >= floor).Where(i => i >= 0),
ints => ParamedMQref1(floor).Where(i => i >= 0)
);
}

[Test]
public void TestQueryableRefFromMethodWithUnboundParameters()
{
Test<Func<IQueryable<int>, int, IQueryable<int>>>(
(ints, floor) => Enumerable.Empty<int>().AsQueryable().Where(x => x >= floor).Where(i => i >= 0),
(ints, floor) => ParamedMQref1(floor).Where(i => i >= 0)
);
}

[Test]
public void TestQueryableRefFromStaticMethoWithUnboundParameters()
{
Test<Func<IQueryable<int>, int, IQueryable<int>>>(
(ints, floor) => Enumerable.Empty<int>().AsQueryable().Where(x => x >= floor).Where(i => i >= 0),
(ints, floor) => ParamedMQref1(floor).Where(i => i >= 0)
);
}
}
}
4 changes: 3 additions & 1 deletion src/DelegateDecompiler/DecompileExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,9 @@ public static LambdaExpression Decompile(this MethodInfo method)

public static LambdaExpression Decompile(this MethodInfo method, Type declaringType)
{
return Cache.GetOrAdd(Tuple.Create(declaringType, method), DecompileDelegate).Value;
return (LambdaExpression)Cache
.GetOrAdd(Tuple.Create(declaringType, method), DecompileDelegate)
.Value.Decompile();
}

public static IQueryable<T> Decompile<T>(this IQueryable<T> self)
Expand Down