Add LoopingTransform

ICSharpCode.Decompiler/CSharp/CSharpDecompiler.cs

@@ -56,9 +56,11 @@ namespace ICSharpCode.Decompiler.CSharp
 			new CopyPropagation(),
 			new InlineCompilerGeneratedVariables(),
 			new TransformingVisitor(),
-			new ExpressionTransforms(),
+			new LoopingTransform(
-			new TransformArrayInitializers(),
+				new ExpressionTransforms(),
-			new ILInlining()
+				new TransformArrayInitializers(),
+				new ILInlining()
+			)
 		};
 
 		List<IAstTransform> astTransforms = new List<IAstTransform> {

ICSharpCode.Decompiler/ICSharpCode.Decompiler.csproj

@@ -122,6 +122,7 @@
     <Compile Include="IL\Transforms\ILInlining.cs" />
     <Compile Include="IL\Transforms\ExpressionTransforms.cs" />
     <Compile Include="IL\Transforms\InlineCompilerGeneratedVariables.cs" />
+    <Compile Include="IL\Transforms\LoopingTransform.cs" />
     <Compile Include="IL\Transforms\SplitVariables.cs" />
     <Compile Include="IL\Transforms\TransformArrayInitializers.cs" />
     <Compile Include="IL\Transforms\TransformingVisitor.cs" />

ICSharpCode.Decompiler/IL/Transforms/LoopingTransform.cs

@@ -0,0 +1,52 @@
+// Copyright (c) 2016 Siegfried Pammer
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy of this
+// software and associated documentation files (the "Software"), to deal in the Software
+// without restriction, including without limitation the rights to use, copy, modify, merge,
+// publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in all copies or
+// substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+// INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
+// PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE
+// FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+
+using System;
+using System.Linq;
+using System.Collections.Generic;
+
+namespace ICSharpCode.Decompiler.IL
+{
+	public class LoopingTransform : IILTransform
+	{
+		readonly IReadOnlyCollection<IILTransform> children;
+		
+		public LoopingTransform(params IILTransform[] children)
+		{
+			this.children = children.ToList();
+		}
+		
+		public void Run(ILFunction function, ILTransformContext context)
+		{
+			do {
+				function.ResetDirty();
+				foreach (var transform in children) {
+					context.CancellationToken.ThrowIfCancellationRequested();
+					transform.Run(function, context);
+					function.CheckInvariant(ILPhase.Normal);
+				}
+			} while (function.IsDirty);
+		}
+
+		public IReadOnlyCollection<IILTransform> Transforms {
+			get { return children; }
+		}
+	}
+}
+
+

ILSpy/Languages/ILAstLanguage.cs

@@ -91,6 +91,12 @@ namespace ICSharpCode.ILSpy
 			yield return new TypedIL();
 			CSharpDecompiler decompiler = new CSharpDecompiler(ModuleDefinition.CreateModule("Dummy", ModuleKind.Dll), new DecompilerSettings());
 			for (int i = 0; i <= decompiler.ILTransforms.Count; i++) {
+				var loop = decompiler.ILTransforms.ElementAtOrDefault(i) as LoopingTransform;
+				if (loop != null) {
+					for (int j = 0; j <= loop.Transforms.Count; j++) {
+						yield return new BlockIL(decompiler.ILTransforms.Take(i - 1).Concat(loop.Transforms.Take(j)).ToList());
+					}
+				}
 				yield return new BlockIL(decompiler.ILTransforms.Take(i).ToList());
 			}
 		}