Fix disassembling TypeSpec when it appears in array type

Issue: #147
MSDN-WhiteKnight · Mar 10, 2024 · ad90b7c · ad90b7c
1 parent 4b59136
commit ad90b7c
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 1 deletion.
diff --git a/CilTools.BytecodeAnalysis/Syntax/Generation/TypeSyntaxGenerator.cs b/CilTools.BytecodeAnalysis/Syntax/Generation/TypeSyntaxGenerator.cs
@@ -109,7 +109,11 @@ public IEnumerable<SyntaxNode> GetTypeSyntax(Type t)
 
                 if (et != null)
                 {
-                    IEnumerable<SyntaxNode> nodes = this.GetTypeSyntax(et);
+                    IEnumerable<SyntaxNode> nodes;
+
+                    if (et is TypeSpec) nodes = this.GetTypeNameSyntax(et);
+                    else nodes = this.GetTypeSyntax(et);
+
                     foreach (SyntaxNode x in nodes) yield return x;
                 }
 

diff --git a/tests/CilTools.BytecodeAnalysis.Tests/CilTools.BytecodeAnalysis.Tests.csproj b/tests/CilTools.BytecodeAnalysis.Tests/CilTools.BytecodeAnalysis.Tests.csproj
@@ -37,6 +37,7 @@
     <Compile Include="Syntax\DisassemblerTests.cs" />    
     <Compile Include="Syntax\IdentifierSyntaxTest.cs" />    
     <Compile Include="Syntax\SyntaxFactoryTests.cs" />    
+    <Compile Include="Syntax\SyntaxGenerationTests.cs" />    
     <Compile Include="Syntax\SyntaxNodeTests.cs" />    
     <Compile Include="Syntax\SyntaxReaderTests.cs" />    
     <Compile Include="Syntax\TokenReaderTests.cs" />

diff --git a/tests/CilTools.BytecodeAnalysis.Tests/Syntax/SyntaxGenerationTests.cs b/tests/CilTools.BytecodeAnalysis.Tests/Syntax/SyntaxGenerationTests.cs
@@ -0,0 +1,31 @@
+/* CIL Tools
+ * Copyright (c) 2024,  MSDN.WhiteKnight (https://github.com/MSDN-WhiteKnight) 
+ * License: BSD 2.0 */
+using System;
+using System.Collections.Generic;
+using System.Reflection;
+using System.Text;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using CilTools.Tests.Common;
+using CilTools.Tests.Common.TextUtils;
+
+namespace CilTools.BytecodeAnalysis.Tests.Syntax
+{
+    [TestClass]
+    public class SyntaxGenerationTests
+    {
+        // Tests that verify disassembler output in different cases
+
+        [TestMethod]
+        [MethodTestData(typeof(SampleMethods), "TestArrayOfArrays", BytecodeProviders.Metadata)]
+        public void Test_Operand_ArrayOfArrays(MethodBase mi)
+        {
+            CilGraph graph = CilGraph.Create(mi);
+            string str = graph.ToText();
+
+            AssertThat.IsMatch(str, new Text[] {
+                Text.Any, "newarr", Text.Any, "uint8[]", Text.Any
+            });
+        }
+    }
+}
diff --git a/tests/CilTools.Tests.Common/TestData/SampleMethods.cs b/tests/CilTools.Tests.Common/TestData/SampleMethods.cs
@@ -233,6 +233,11 @@ public static void TestNestedTypes(Environment.SpecialFolder sf) { }
 
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public static void TestAggressiveInlining() { }
+
+        public static byte[][] TestArrayOfArrays()
+        {
+            return new byte[0][];
+        }
     }
 
     public class MyPoint