Add DelegateConstruction tests

ICSharpCode.Decompiler.Tests/ICSharpCode.Decompiler.Tests.csproj

@@ -51,6 +51,7 @@
 
   <ItemGroup>
     <Compile Include="DataFlowTest.cs" />
+    <Compile Include="TestCases\Pretty\DelegateConstruction.cs" />
     <Compile Include="Helpers\CodeAssert.cs" />
     <Compile Include="Helpers\SdkUtility.cs" />
     <Compile Include="Helpers\RemoveCompilerAttribute.cs" />

ICSharpCode.Decompiler.Tests/PrettyTestRunner.cs

@@ -97,6 +97,12 @@ namespace ICSharpCode.Decompiler.Tests
 			Run(cscOptions: cscOptions);
 		}
 
+		[Test, Ignore]
+		public void DelegateConstruction([ValueSource("defaultOptions")] CompilerOptions cscOptions)
+		{
+			Run(cscOptions: cscOptions);
+		}
+
 		[Test]
 		public void AnonymousTypes([Values(CompilerOptions.None, CompilerOptions.Optimize)] CompilerOptions cscOptions)
 		{

ICSharpCode.Decompiler.Tests/TestCases/Pretty/DelegateConstruction.cs

@@ -22,19 +22,19 @@ using System.Linq;
 
 public static class DelegateConstruction
 {
-	class InstanceTests
+	private class InstanceTests
 	{
 		public Action CaptureOfThis()
 		{
-			return delegate {
+			return (Action)delegate {
-				CaptureOfThis();
+				this.CaptureOfThis();
 			};
 		}
 		
 		public Action CaptureOfThisAndParameter(int a)
 		{
-			return delegate {
+			return (Action)delegate {
-				CaptureOfThisAndParameter(a);
+				this.CaptureOfThisAndParameter(a);
 			};
 		}
 		
@@ -42,8 +42,8 @@ public static class DelegateConstruction
 		{
 			foreach (int item in Enumerable.Empty<int>()) {
 				if (item > 0) {
-					return delegate {
+					return (Action)delegate {
-						CaptureOfThisAndParameter(item + a);
+						this.CaptureOfThisAndParameter(item + a);
 					};
 				}
 			}
@@ -55,8 +55,8 @@ public static class DelegateConstruction
 			foreach (int item in Enumerable.Empty<int>()) {
 				int copyOfItem = item;
 				if (item > 0) {
-					return delegate {
+					return (Action)delegate {
-						CaptureOfThisAndParameter(item + a + copyOfItem);
+						this.CaptureOfThisAndParameter(item + a + copyOfItem);
 					};
 				}
 			}
@@ -66,7 +66,7 @@ public static class DelegateConstruction
 		public void LambdaInForLoop()
 		{
 			for (int i = 0; i < 100000; i++) {
-			    Bar(() => Foo());
+			    this.Bar((Func<int>)(() => this.Foo()));
 			}
 		}
 		
@@ -117,14 +117,11 @@ public static class DelegateConstruction
 	public static List<Action<int>> AnonymousMethodStoreWithinLoop()
 	{
 		List<Action<int>> list = new List<Action<int>>();
-		for (int i = 0; i < 10; i++)
+		for (int i = 0; i < 10; i++) {
-		{
 			int counter;
-			list.Add(delegate(int x)
+			list.Add((Action<int>)delegate(int x) {
-			         {
 			         	counter = x;
-			         }
+			         });
-			        );
 		}
 		return list;
 	}
@@ -133,21 +130,17 @@ public static class DelegateConstruction
 	{
 		List<Action<int>> list = new List<Action<int>>();
 		int counter;
-		for (int i = 0; i < 10; i++)
+		for (int i = 0; i < 10; i++) {
-		{
+			list.Add((Action<int>)delegate(int x) {
-			list.Add(delegate(int x)
-			         {
 			         	counter = x;
-			         }
+			         });
-			        );
 		}
 		return list;
 	}
 
 	public static Action StaticAnonymousMethodNoClosure()
 	{
-		return delegate
+		return (Action)delegate {
-		{
 			Console.WriteLine();
 		};
 	}
@@ -156,16 +149,15 @@ public static class DelegateConstruction
 	{
 		// i is captured variable,
 		// j is parameter in anonymous method
-		// k is local in anonymous method,
+		// l is local in anonymous method,
-		// l is local in main method
+		// k is local in main method
 		// Ensure that the decompiler doesn't introduce name conflicts
 		List<Action<int>> list = new List<Action<int>>();
-		for (int l = 0; l < 10; l++) {
+		for (int k = 0; k < 10; k++) {
 			int i;
 			for (i = 0; i < 10; i++) {
-				list.Add(
+				list.Add((Action<int>)delegate(int j) {
-					delegate (int j) {
+						for (int l = 0; l < i; l += j) {
-						for (int k = 0; k < i; k += j) {
 							Console.WriteLine();
 						}
 					});
@@ -177,8 +169,7 @@ public static class DelegateConstruction
 	{
 		List<Action<int>> list = new List<Action<int>>();
 		for (int k = 0; k < 10; k++) {
-			list.Add(
+			list.Add((Action<int>)delegate(int i) {
-				delegate(int i) {
 					Console.WriteLine(i);
 				});
 		}
@@ -186,7 +177,7 @@ public static class DelegateConstruction
 
 	public static Action<int> NameConflict3(int i)
 	{
-		return delegate(int j) {
+		return (Action<int>)delegate(int j) {
 			for (int k = 0; k < j; k++) {
 				Console.WriteLine(k);
 			}
@@ -195,11 +186,11 @@ public static class DelegateConstruction
 	
 	public static Func<int, Func<int, int>> CurriedAddition(int a)
 	{
-		return b => c => a + b + c;
+		return (Func<int, Func<int, int>>)((int b) => (Func<int, int>)((int c) => a + b + c));
 	}
 	
 	public static Func<int, Func<int, Func<int, int>>> CurriedAddition2(int a)
 	{
-		return b => c => d => a + b + c + d;
+		return (Func<int, Func<int, Func<int, int>>>)((int b) => (Func<int, Func<int, int>>)((int c) => (Func<int, int>)((int d) => a + b + c + d)));
 	}
 }