Decompile TupleElementNamesAttribute into tuple type syntax.

ICSharpCode.Decompiler.Tests/Helpers/RemoveCompilerAttribute.cs

@@ -6,9 +6,9 @@
 
 namespace ICSharpCode.Decompiler.Tests.Helpers
 {
- class RemoveCompilerAttribute : DepthFirstAstVisitor<object, object>, IAstTransform
+ class RemoveCompilerAttribute : DepthFirstAstVisitor, IAstTransform
  {
- public override object VisitAttribute(CSharp.Syntax.Attribute attribute, object data)
+ public override void VisitAttribute(CSharp.Syntax.Attribute attribute)
  {
  var section = (AttributeSection)attribute.Parent;
  SimpleType type = attribute.Type as SimpleType;
@@ -25,38 +25,36 @@ public override object VisitAttribute(CSharp.Syntax.Attribute attribute, object
  if (section.Attributes.Count == 0)
  section.Remove();
  }
- return null;
  }
 
  public void Run(AstNode rootNode, TransformContext context)
  {
- rootNode.AcceptVisitor(this, null);
+ rootNode.AcceptVisitor(this);
  }
  }
 
- public class RemoveEmbeddedAtttributes : DepthFirstAstVisitor<object, object>, IAstTransform
+ public class RemoveEmbeddedAtttributes : DepthFirstAstVisitor, IAstTransform
  {
  HashSet<string> attributeNames = new HashSet<string>() {
  "System.Runtime.CompilerServices.IsReadOnlyAttribute",
  "System.Runtime.CompilerServices.IsByRefLikeAttribute",
  "Microsoft.CodeAnalysis.EmbeddedAttribute",
  };
 
- public override object VisitTypeDeclaration(TypeDeclaration typeDeclaration, object data)
+ public override void VisitTypeDeclaration(TypeDeclaration typeDeclaration)
  {
  var typeDefinition = typeDeclaration.GetSymbol() as ITypeDefinition;
  if (typeDefinition == null || !attributeNames.Contains(typeDefinition.FullName))
- return null;
+ return;
  if (typeDeclaration.Parent is NamespaceDeclaration ns && ns.Members.Count == 1)
  ns.Remove();
  else
  typeDeclaration.Remove();
- return null;
  }
 
  public void Run(AstNode rootNode, TransformContext context)
  {
- rootNode.AcceptVisitor(this, null);
+ rootNode.AcceptVisitor(this);
  }
  }
 }

ICSharpCode.Decompiler.Tests/Helpers/Tester.cs

@@ -178,7 +178,8 @@ private static string ReplacePrivImplDetails(string il)
  MetadataReference.CreateFromFile(Path.Combine(refAsmPath, "mscorlib.dll")),
  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, "System.Xml.dll")),
+ MetadataReference.CreateFromFile(typeof(ValueTuple).Assembly.Location)
  };
  });
 

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

@@ -70,6 +70,7 @@
  <Compile Include="TestCases\Pretty\Issue1080.cs" />
  <Compile Include="TestCases\Pretty\QualifierTests.cs" />
  <Compile Include="TestCases\Pretty\RefLocalsAndReturns.cs" />
+ <Compile Include="TestCases\Pretty\TupleTypes.cs" />
  <Compile Include="TestCases\Pretty\WellKnownConstants.cs" />
  <Compile Include="TypeSystem\TypeSystemHelper.cs" />
  <Compile Include="TypeSystem\TypeSystemLoaderTests.cs" />

ICSharpCode.Decompiler.Tests/PrettyTestRunner.cs

@@ -279,6 +279,12 @@ public void QualifierTests([ValueSource("defaultOptions")] CSharpCompilerOptions
  RunForLibrary(cscOptions: cscOptions);
  }
 
+ [Test]
+ public void TupleTypes([ValueSource("roslynOnlyOptions")] CSharpCompilerOptions cscOptions)
+ {
+ RunForLibrary(cscOptions: cscOptions);
+ }
+
  [Test]
  public void Issue1080([ValueSource(nameof(roslynOnlyOptions))] CSharpCompilerOptions cscOptions)
  {

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

@@ -0,0 +1,48 @@
+// Copyright (c) 2018 Daniel Grunwald
+// 
+// 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;
+
+namespace ICSharpCode.Decompiler.Tests.TestCases.Pretty
+{
+ public class TupleTypes
+ {
+ public ValueTuple VT0;
+ public ValueTuple<int> VT1;
+ public ValueTuple<int, int, int, int, int, int, int, ValueTuple> VT7EmptyRest;
+
+ public (int, uint) Unnamed2;
+ public (int, int, int) Unnamed3;
+ public (int, int, int, int) Unnamed4;
+ public (int, int, int, int, int) Unnamed5;
+ public (int, int, int, int, int, int) Unnamed6;
+ public (int, int, int, int, int, int, int) Unnamed7;
+ public (int, int, int, int, int, int, int, int) Unnamed8;
+
+ public (int a, uint b) Named2;
+ public (int a, uint b)[] Named2Array;
+ public (int a, int b, int c, int d, int e, int f, int g, int h) Named8;
+
+ public (int, int a, int, int b, int) PartiallyNamed;
+
+ public ((int a, int b) x, (int, int) y, (int c, int d) z) Nested1;
+ public ((object a, dynamic b), dynamic, (dynamic c, object d)) Nested2;
+ public (ValueTuple a, (int x1, int x2), ValueTuple<int> b, (int y1, int y2), (int, int) c) Nested3;
+ public (int a, int b, int c, int d, int e, int f, int g, int h, (int i, int j)) Nested4;
+ }
+}

ICSharpCode.Decompiler.Tests/TestCases/Pretty/TupleTypes.opt.roslyn.il

@@ -0,0 +1,91 @@
+
+
+
+
+// Metadata version: v4.0.30319
+.assembly extern mscorlib
+{
+ .publickeytoken = (B7 7A 5C 56 19 34 E0 89 ) // .z\V.4..
+ .ver 4:0:0:0
+}
+.assembly extern System.Core
+{
+ .publickeytoken = (B7 7A 5C 56 19 34 E0 89 ) // .z\V.4..
+ .ver 4:0:0:0
+}
+.assembly TupleTypes
+{
+ .custom instance void [mscorlib]System.Runtime.CompilerServices.CompilationRelaxationsAttribute::.ctor(int32) = ( 01 00 08 00 00 00 00 00 ) 
+ .custom instance void [mscorlib]System.Runtime.CompilerServices.RuntimeCompatibilityAttribute::.ctor() = ( 01 00 01 00 54 02 16 57 72 61 70 4E 6F 6E 45 78 // ....T..WrapNonEx
+ 63 65 70 74 69 6F 6E 54 68 72 6F 77 73 01 ) // ceptionThrows.
+
+ // --- The following custom attribute is added automatically, do not uncomment -------
+ // .custom instance void [mscorlib]System.Diagnostics.DebuggableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggableAttribute/DebuggingModes) = ( 01 00 02 00 00 00 00 00 ) 
+
+ .permissionset reqmin
+ = {[mscorlib]System.Security.Permissions.SecurityPermissionAttribute = {property bool 'SkipVerification' = bool(true)}}
+ .hash algorithm 0x00008004
+ .ver 0:0:0:0
+}
+.module TupleTypes.dll
+.custom instance void [mscorlib]System.Security.UnverifiableCodeAttribute::.ctor() = ( 01 00 00 00 ) 
+.imagebase 0x10000000
+.file alignment 0x00000200
+.stackreserve 0x00100000
+.subsystem 0x0003 // WINDOWS_CUI
+.corflags 0x00000001 // ILONLY
+
+
+// =============== CLASS MEMBERS DECLARATION ===================
+
+.class public auto ansi beforefieldinit ICSharpCode.Decompiler.Tests.TestCases.Pretty.TupleTypes
+ extends [mscorlib]System.Object
+{
+ .field public valuetype [mscorlib]System.ValueTuple VT0
+ .field public valuetype [mscorlib]System.ValueTuple`1<int32> VT1
+ .field public valuetype [mscorlib]System.ValueTuple`8<int32,int32,int32,int32,int32,int32,int32,valuetype [mscorlib]System.ValueTuple> VT7EmptyRest
+ .field public valuetype [mscorlib]System.ValueTuple`2<int32,uint32> Unnamed2
+ .field public valuetype [mscorlib]System.ValueTuple`3<int32,int32,int32> Unnamed3
+ .field public valuetype [mscorlib]System.ValueTuple`4<int32,int32,int32,int32> Unnamed4
+ .field public valuetype [mscorlib]System.ValueTuple`5<int32,int32,int32,int32,int32> Unnamed5
+ .field public valuetype [mscorlib]System.ValueTuple`6<int32,int32,int32,int32,int32,int32> Unnamed6
+ .field public valuetype [mscorlib]System.ValueTuple`7<int32,int32,int32,int32,int32,int32,int32> Unnamed7
+ .field public valuetype [mscorlib]System.ValueTuple`8<int32,int32,int32,int32,int32,int32,int32,valuetype [mscorlib]System.ValueTuple`1<int32>> Unnamed8
+ .field public valuetype [mscorlib]System.ValueTuple`2<int32,uint32> Named2
+ .custom instance void [mscorlib]System.Runtime.CompilerServices.TupleElementNamesAttribute::.ctor(string[]) = ( 01 00 02 00 00 00 01 61 01 62 00 00 ) // .......a.b..
+ .field public valuetype [mscorlib]System.ValueTuple`2<int32,uint32>[] Named2Array
+ .custom instance void [mscorlib]System.Runtime.CompilerServices.TupleElementNamesAttribute::.ctor(string[]) = ( 01 00 02 00 00 00 01 61 01 62 00 00 ) // .......a.b..
+ .field public valuetype [mscorlib]System.ValueTuple`8<int32,int32,int32,int32,int32,int32,int32,valuetype [mscorlib]System.ValueTuple`1<int32>> Named8
+ .custom instance void [mscorlib]System.Runtime.CompilerServices.TupleElementNamesAttribute::.ctor(string[]) = ( 01 00 09 00 00 00 01 61 01 62 01 63 01 64 01 65 // .......a.b.c.d.e
+ 01 66 01 67 01 68 FF 00 00 ) // .f.g.h...
+ .field public valuetype [mscorlib]System.ValueTuple`5<int32,int32,int32,int32,int32> PartiallyNamed
+ .custom instance void [mscorlib]System.Runtime.CompilerServices.TupleElementNamesAttribute::.ctor(string[]) = ( 01 00 05 00 00 00 FF 01 61 FF 01 62 FF 00 00 ) // ........a..b...
+ .field public valuetype [mscorlib]System.ValueTuple`3<valuetype [mscorlib]System.ValueTuple`2<int32,int32>,valuetype [mscorlib]System.ValueTuple`2<int32,int32>,valuetype [mscorlib]System.ValueTuple`2<int32,int32>> Nested1
+ .custom instance void [mscorlib]System.Runtime.CompilerServices.TupleElementNamesAttribute::.ctor(string[]) = ( 01 00 09 00 00 00 01 78 01 79 01 7A 01 61 01 62 // .......x.y.z.a.b
+ FF FF 01 63 01 64 00 00 ) // ...c.d..
+ .field public valuetype [mscorlib]System.ValueTuple`3<valuetype [mscorlib]System.ValueTuple`2<object,object>,object,valuetype [mscorlib]System.ValueTuple`2<object,object>> Nested2
+ .custom instance void [System.Core]System.Runtime.CompilerServices.DynamicAttribute::.ctor(bool[]) = ( 01 00 08 00 00 00 00 00 00 01 01 00 01 00 00 00 ) 
+ .custom instance void [mscorlib]System.Runtime.CompilerServices.TupleElementNamesAttribute::.ctor(string[]) = ( 01 00 07 00 00 00 FF FF FF 01 61 01 62 01 63 01 // ..........a.b.c.
+ 64 00 00 ) // d..
+ .field public valuetype [mscorlib]System.ValueTuple`5<valuetype [mscorlib]System.ValueTuple,valuetype [mscorlib]System.ValueTuple`2<int32,int32>,valuetype [mscorlib]System.ValueTuple`1<int32>,valuetype [mscorlib]System.ValueTuple`2<int32,int32>,valuetype [mscorlib]System.ValueTuple`2<int32,int32>> Nested3
+ .custom instance void [mscorlib]System.Runtime.CompilerServices.TupleElementNamesAttribute::.ctor(string[]) = ( 01 00 0C 00 00 00 01 61 FF 01 62 FF 01 63 02 78 // .......a..b..c.x
+ 31 02 78 32 FF 02 79 31 02 79 32 FF FF 00 00 ) // 1.x2..y1.y2....
+ .field public valuetype [mscorlib]System.ValueTuple`8<int32,int32,int32,int32,int32,int32,int32,valuetype [mscorlib]System.ValueTuple`2<int32,valuetype [mscorlib]System.ValueTuple`2<int32,int32>>> Nested4
+ .custom instance void [mscorlib]System.Runtime.CompilerServices.TupleElementNamesAttribute::.ctor(string[]) = ( 01 00 0D 00 00 00 01 61 01 62 01 63 01 64 01 65 // .......a.b.c.d.e
+ 01 66 01 67 01 68 FF FF FF 01 69 01 6A 00 00 ) // .f.g.h....i.j..
+ .method public hidebysig specialname rtspecialname 
+ instance void .ctor() cil managed
+ {
+ // Code size 7 (0x7)
+ .maxstack 8
+ IL_0000: ldarg.0
+ IL_0001: call instance void [mscorlib]System.Object::.ctor()
+ IL_0006: ret
+ } // end of method TupleTypes::.ctor
+
+} // end of class ICSharpCode.Decompiler.Tests.TestCases.Pretty.TupleTypes
+
+
+// =============================================================
+
+// *********** DISASSEMBLY COMPLETE ***********************

ICSharpCode.Decompiler.Tests/TestCases/Pretty/TupleTypes.roslyn.il

@@ -0,0 +1,92 @@
+
+
+
+
+// Metadata version: v4.0.30319
+.assembly extern mscorlib
+{
+ .publickeytoken = (B7 7A 5C 56 19 34 E0 89 ) // .z\V.4..
+ .ver 4:0:0:0
+}
+.assembly extern System.Core
+{
+ .publickeytoken = (B7 7A 5C 56 19 34 E0 89 ) // .z\V.4..
+ .ver 4:0:0:0
+}
+.assembly TupleTypes
+{
+ .custom instance void [mscorlib]System.Runtime.CompilerServices.CompilationRelaxationsAttribute::.ctor(int32) = ( 01 00 08 00 00 00 00 00 ) 
+ .custom instance void [mscorlib]System.Runtime.CompilerServices.RuntimeCompatibilityAttribute::.ctor() = ( 01 00 01 00 54 02 16 57 72 61 70 4E 6F 6E 45 78 // ....T..WrapNonEx
+ 63 65 70 74 69 6F 6E 54 68 72 6F 77 73 01 ) // ceptionThrows.
+
+ // --- The following custom attribute is added automatically, do not uncomment -------
+ // .custom instance void [mscorlib]System.Diagnostics.DebuggableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggableAttribute/DebuggingModes) = ( 01 00 07 01 00 00 00 00 ) 
+
+ .permissionset reqmin
+ = {[mscorlib]System.Security.Permissions.SecurityPermissionAttribute = {property bool 'SkipVerification' = bool(true)}}
+ .hash algorithm 0x00008004
+ .ver 0:0:0:0
+}
+.module TupleTypes.dll
+.custom instance void [mscorlib]System.Security.UnverifiableCodeAttribute::.ctor() = ( 01 00 00 00 ) 
+.imagebase 0x10000000
+.file alignment 0x00000200
+.stackreserve 0x00100000
+.subsystem 0x0003 // WINDOWS_CUI
+.corflags 0x00000001 // ILONLY
+
+
+// =============== CLASS MEMBERS DECLARATION ===================
+
+.class public auto ansi beforefieldinit ICSharpCode.Decompiler.Tests.TestCases.Pretty.TupleTypes
+ extends [mscorlib]System.Object
+{
+ .field public valuetype [mscorlib]System.ValueTuple VT0
+ .field public valuetype [mscorlib]System.ValueTuple`1<int32> VT1
+ .field public valuetype [mscorlib]System.ValueTuple`8<int32,int32,int32,int32,int32,int32,int32,valuetype [mscorlib]System.ValueTuple> VT7EmptyRest
+ .field public valuetype [mscorlib]System.ValueTuple`2<int32,uint32> Unnamed2
+ .field public valuetype [mscorlib]System.ValueTuple`3<int32,int32,int32> Unnamed3
+ .field public valuetype [mscorlib]System.ValueTuple`4<int32,int32,int32,int32> Unnamed4
+ .field public valuetype [mscorlib]System.ValueTuple`5<int32,int32,int32,int32,int32> Unnamed5
+ .field public valuetype [mscorlib]System.ValueTuple`6<int32,int32,int32,int32,int32,int32> Unnamed6
+ .field public valuetype [mscorlib]System.ValueTuple`7<int32,int32,int32,int32,int32,int32,int32> Unnamed7
+ .field public valuetype [mscorlib]System.ValueTuple`8<int32,int32,int32,int32,int32,int32,int32,valuetype [mscorlib]System.ValueTuple`1<int32>> Unnamed8
+ .field public valuetype [mscorlib]System.ValueTuple`2<int32,uint32> Named2
+ .custom instance void [mscorlib]System.Runtime.CompilerServices.TupleElementNamesAttribute::.ctor(string[]) = ( 01 00 02 00 00 00 01 61 01 62 00 00 ) // .......a.b..
+ .field public valuetype [mscorlib]System.ValueTuple`2<int32,uint32>[] Named2Array
+ .custom instance void [mscorlib]System.Runtime.CompilerServices.TupleElementNamesAttribute::.ctor(string[]) = ( 01 00 02 00 00 00 01 61 01 62 00 00 ) // .......a.b..
+ .field public valuetype [mscorlib]System.ValueTuple`8<int32,int32,int32,int32,int32,int32,int32,valuetype [mscorlib]System.ValueTuple`1<int32>> Named8
+ .custom instance void [mscorlib]System.Runtime.CompilerServices.TupleElementNamesAttribute::.ctor(string[]) = ( 01 00 09 00 00 00 01 61 01 62 01 63 01 64 01 65 // .......a.b.c.d.e
+ 01 66 01 67 01 68 FF 00 00 ) // .f.g.h...
+ .field public valuetype [mscorlib]System.ValueTuple`5<int32,int32,int32,int32,int32> PartiallyNamed
+ .custom instance void [mscorlib]System.Runtime.CompilerServices.TupleElementNamesAttribute::.ctor(string[]) = ( 01 00 05 00 00 00 FF 01 61 FF 01 62 FF 00 00 ) // ........a..b...
+ .field public valuetype [mscorlib]System.ValueTuple`3<valuetype [mscorlib]System.ValueTuple`2<int32,int32>,valuetype [mscorlib]System.ValueTuple`2<int32,int32>,valuetype [mscorlib]System.ValueTuple`2<int32,int32>> Nested1
+ .custom instance void [mscorlib]System.Runtime.CompilerServices.TupleElementNamesAttribute::.ctor(string[]) = ( 01 00 09 00 00 00 01 78 01 79 01 7A 01 61 01 62 // .......x.y.z.a.b
+ FF FF 01 63 01 64 00 00 ) // ...c.d..
+ .field public valuetype [mscorlib]System.ValueTuple`3<valuetype [mscorlib]System.ValueTuple`2<object,object>,object,valuetype [mscorlib]System.ValueTuple`2<object,object>> Nested2
+ .custom instance void [System.Core]System.Runtime.CompilerServices.DynamicAttribute::.ctor(bool[]) = ( 01 00 08 00 00 00 00 00 00 01 01 00 01 00 00 00 ) 
+ .custom instance void [mscorlib]System.Runtime.CompilerServices.TupleElementNamesAttribute::.ctor(string[]) = ( 01 00 07 00 00 00 FF FF FF 01 61 01 62 01 63 01 // ..........a.b.c.
+ 64 00 00 ) // d..
+ .field public valuetype [mscorlib]System.ValueTuple`5<valuetype [mscorlib]System.ValueTuple,valuetype [mscorlib]System.ValueTuple`2<int32,int32>,valuetype [mscorlib]System.ValueTuple`1<int32>,valuetype [mscorlib]System.ValueTuple`2<int32,int32>,valuetype [mscorlib]System.ValueTuple`2<int32,int32>> Nested3
+ .custom instance void [mscorlib]System.Runtime.CompilerServices.TupleElementNamesAttribute::.ctor(string[]) = ( 01 00 0C 00 00 00 01 61 FF 01 62 FF 01 63 02 78 // .......a..b..c.x
+ 31 02 78 32 FF 02 79 31 02 79 32 FF FF 00 00 ) // 1.x2..y1.y2....
+ .field public valuetype [mscorlib]System.ValueTuple`8<int32,int32,int32,int32,int32,int32,int32,valuetype [mscorlib]System.ValueTuple`2<int32,valuetype [mscorlib]System.ValueTuple`2<int32,int32>>> Nested4
+ .custom instance void [mscorlib]System.Runtime.CompilerServices.TupleElementNamesAttribute::.ctor(string[]) = ( 01 00 0D 00 00 00 01 61 01 62 01 63 01 64 01 65 // .......a.b.c.d.e
+ 01 66 01 67 01 68 FF FF FF 01 69 01 6A 00 00 ) // .f.g.h....i.j..
+ .method public hidebysig specialname rtspecialname 
+ instance void .ctor() cil managed
+ {
+ // Code size 8 (0x8)
+ .maxstack 8
+ IL_0000: ldarg.0
+ IL_0001: call instance void [mscorlib]System.Object::.ctor()
+ IL_0006: nop
+ IL_0007: ret
+ } // end of method TupleTypes::.ctor
+
+} // end of class ICSharpCode.Decompiler.Tests.TestCases.Pretty.TupleTypes
+
+
+// =============================================================
+
+// *********** DISASSEMBLY COMPLETE ***********************

ICSharpCode.Decompiler/CSharp/CSharpDecompiler.cs

@@ -187,7 +187,7 @@ public CSharpDecompiler(string fileName, DecompilerSettings settings)
  }
 
  public CSharpDecompiler(ModuleDefinition module, DecompilerSettings settings)
- : this(new DecompilerTypeSystem(module), settings)
+ : this(new DecompilerTypeSystem(module, settings), settings)
  {
  }