Added DynamicTests.

ICSharpCode.Decompiler.Tests/Helpers/Tester.cs

@@ -179,6 +179,7 @@ namespace ICSharpCode.Decompiler.Tests.Helpers
 					MetadataReference.CreateFromFile(Path.Combine(refAsmPath, "System.dll")),
 					MetadataReference.CreateFromFile(Path.Combine(refAsmPath, "System.Core.dll")),
 					MetadataReference.CreateFromFile(Path.Combine(refAsmPath, "System.Xml.dll")),
+					MetadataReference.CreateFromFile(Path.Combine(refAsmPath, "Microsoft.CSharp.dll")),
 					MetadataReference.CreateFromFile(typeof(ValueTuple).Assembly.Location)
 			};
 		});
@@ -306,6 +307,7 @@ namespace ICSharpCode.Decompiler.Tests.Helpers
 				options.ReferencedAssemblies.Add("System.dll");
 				options.ReferencedAssemblies.Add("System.Core.dll");
 				options.ReferencedAssemblies.Add("System.Xml.dll");
+				options.ReferencedAssemblies.Add("Microsoft.CSharp.dll");
 				CompilerResults results = provider.CompileAssemblyFromFile(options, sourceFileNames.ToArray());
 				if (results.Errors.Cast<CompilerError>().Any(e => !e.IsWarning)) {
 					StringBuilder b = new StringBuilder("Compiler error:");

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

@@ -67,6 +67,7 @@
     <Compile Include="Semantics\OverloadResolutionTests.cs" />
     <Compile Include="DataFlowTest.cs" />
     <Compile Include="TestCases\Correctness\RefLocalsAndReturns.cs" />
+    <Compile Include="TestCases\Pretty\DynamicTests.cs" />
     <Compile Include="TestCases\Pretty\Issue1080.cs" />
     <Compile Include="TestCases\Pretty\QualifierTests.cs" />
     <Compile Include="TestCases\Pretty\RefLocalsAndReturns.cs" />
@@ -183,6 +184,10 @@
     <None Include="TestCases\VBPretty\Async.vb" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Reference Include="Microsoft.CSharp" />
+  </ItemGroup>
+
   <ItemGroup>
     <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
   </ItemGroup>

ICSharpCode.Decompiler.Tests/PrettyTestRunner.cs

@@ -213,6 +213,12 @@ namespace ICSharpCode.Decompiler.Tests
 			RunForLibrary(cscOptions: cscOptions);
 		}
 
+		[Test]
+		public void DynamicTests([ValueSource("defaultOptions")] CSharpCompilerOptions cscOptions)
+		{
+			RunForLibrary(cscOptions: cscOptions);
+		}
+
 		[Test]
 		public void ExpressionTrees([ValueSource("defaultOptions")] CSharpCompilerOptions cscOptions)
 		{

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

@@ -0,0 +1,161 @@
+using System;
+using System.Collections;
+
+namespace ICSharpCode.Decompiler.Tests.TestCases.Pretty
+{
+    internal class DynamicTests
+    {
+        private static dynamic field;
+        public dynamic Property {
+			get;
+			set;
+		}
+
+        private static void Main(string[] args)
+        {
+            IComparable comparable = 1;
+            DynamicTests dynamicTests = new DynamicTests();
+            dynamicTests.Property = 1;
+            dynamicTests.Property += (dynamic)1;
+        }
+
+        private static void MemberAccess(dynamic a)
+        {
+            a.Test1();
+            a.GenericTest<int, int>();
+            a.Test2(1);
+            a.Test3(a.InnerTest(1, 2, 3, 4, 5));
+            a.Test4(2, null, a.Index[0]);
+            a.Test5(a, a.Number, a.String);
+            a[0] = 3;
+            a.Index[a.Number] = 5;
+            a.Setter = new DynamicTests();
+            a.Setter2 = 5;
+        }
+
+        private static void Invocation(dynamic a, dynamic b)
+        {
+            a(null, b.Test());
+        }
+
+		private static dynamic Test1(dynamic a)
+        {
+            dynamic p = a.IndexedProperty;
+            return p[0];
+        }
+
+		private static dynamic Test2(dynamic a)
+        {
+            return a.IndexedProperty[0];
+        }
+
+		private static void ArithmeticBinaryOperators(dynamic a, dynamic b)
+        {
+            DynamicTests.MemberAccess(a + b);
+            DynamicTests.MemberAccess(a + 1);
+            DynamicTests.MemberAccess(a + null);
+            DynamicTests.MemberAccess(a - b);
+            DynamicTests.MemberAccess(a - 1);
+            DynamicTests.MemberAccess(a - null);
+            DynamicTests.MemberAccess(a * b);
+            DynamicTests.MemberAccess(a * 1);
+            DynamicTests.MemberAccess(a * null);
+            DynamicTests.MemberAccess(a / b);
+            DynamicTests.MemberAccess(a / 1);
+            DynamicTests.MemberAccess(a / null);
+            DynamicTests.MemberAccess(a % b);
+            DynamicTests.MemberAccess(a % 1);
+			DynamicTests.MemberAccess(a % null);
+        }
+
+		private static void RelationalOperators(dynamic a, dynamic b)
+        {
+            DynamicTests.MemberAccess(a == b);
+            DynamicTests.MemberAccess(a == 1);
+            DynamicTests.MemberAccess(a == null);
+            DynamicTests.MemberAccess(a != b);
+            DynamicTests.MemberAccess(a != 1);
+            DynamicTests.MemberAccess(a != null);
+            DynamicTests.MemberAccess(a < b);
+            DynamicTests.MemberAccess(a < 1);
+            DynamicTests.MemberAccess(a < null);
+            DynamicTests.MemberAccess(a > b);
+            DynamicTests.MemberAccess(a > 1);
+            DynamicTests.MemberAccess(a > null);
+            DynamicTests.MemberAccess(a >= b);
+            DynamicTests.MemberAccess(a >= 1);
+            DynamicTests.MemberAccess(a >= null);
+            DynamicTests.MemberAccess(a <= b);
+            DynamicTests.MemberAccess(a <= 1);
+			DynamicTests.MemberAccess(a <= null);
+        }
+
+		private static void Casts(dynamic a)
+        {
+            Console.WriteLine();
+            int b = 5;
+            if (b < 0)
+                return;
+			MemberAccess((int)a);
+        }
+
+		private static void CompoundAssignment(dynamic a, dynamic b)
+        {
+            a.Setter2 += 5;
+            a.Setter2 -= 1;
+            a.Setter2 *= 2;
+            a.Setter2 /= 5;
+            a.Setter2 += b;
+            a.Setter2 -= b;
+            a.Setter2 *= b;
+            a.Setter2 /= b;
+            field.Setter += 5;
+            field.Setter -= 5;
+        }
+
+		private static void InlineCompoundAssignment(dynamic a, dynamic b)
+        {
+            Console.WriteLine(a.Setter2 += 5);
+            Console.WriteLine(a.Setter2 -= 1);
+            Console.WriteLine(a.Setter2 *= 2);
+            Console.WriteLine(a.Setter2 /= 5);
+            Console.WriteLine(a.Setter2 += b);
+            Console.WriteLine(a.Setter2 -= b);
+            Console.WriteLine(a.Setter2 *= b);
+            Console.WriteLine(a.Setter2 /= b);
+        }
+
+		private static void UnaryOperators(dynamic a)
+        {
+            a--;
+            a++;
+            --a;
+            ++a;
+            Casts(-a);
+            Casts(+a);
+        }
+
+		private static void Loops(dynamic list)
+        {
+            foreach (dynamic item in list) {
+                UnaryOperators(item);
+            }
+        }
+
+		private static void If(dynamic a, dynamic b)
+        {
+            if (a == b)
+            {
+                Console.WriteLine("Equal");
+            }
+        }
+
+		private static void If2(dynamic a, dynamic b)
+        {
+            if (a == null || b == null)
+            {
+                Console.WriteLine("Equal");
+            }
+        }
+    }
+}