Add support to process methods with generics <T> in parameters and as return type (#121)

Author: sake402

MetadataProcessor.Core/Extensions/MethodDefinitionExtensions.cs

@@ -0,0 +1,40 @@
+//
+// Copyright (c) .NET Foundation and Contributors
+// See LICENSE file in the project root for full license information.
+//
+
+using Mono.Cecil;
+using System.Linq;
+using System.Text;
+
+namespace nanoFramework.Tools.MetadataProcessor.Core.Extensions
+{
+    internal static class MethodDefinitionExtensions
+    {
+        public static string FullName(this MethodDefinition value)
+        {
+            if(value.GenericParameters.Count == 0)
+            {
+                return value.Name;
+            }
+            else
+            {
+                StringBuilder name = new StringBuilder(value.Name);
+                name.Append("<");
+
+                foreach(var p in value.GenericParameters)
+                {
+                    name.Append(p.Name);
+                    if (!p.Equals(value.GenericParameters.Last()))
+                    {
+                        name.Append(",");
+                    }
+                }
+
+                name.Append(">");
+
+                return name.ToString();
+            }
+        }
+    }
+}

MetadataProcessor.Core/Extensions/TypeReferenceExtensions.cs

@@ -97,6 +97,11 @@ public static string TypeSignatureAsString(this TypeReference type)
                 return byrefSig.ToString();
             }
 
+            if (type.IsGenericParameter)
+            {
+                return $"!!{type.Name}";
+            }
+
             return "";
         }
 
@@ -165,6 +170,10 @@ public static string ToNativeTypeAsString(this TypeReference type)
                 return arraySig.ToString();
             }
 
+            if (type.IsGenericParameter)
+            {
+                return "UNSUPPORTED";
+            }
             return "";
         }
 
@@ -234,6 +243,11 @@ public static string ToCLRTypeAsString(this TypeReference type)
                 return arraySig.ToString();
             }
 
+            if (type.IsGenericParameter)
+            {
+                return "UNSUPPORTED";
+            }
+
             return "";
         }
 

MetadataProcessor.Core/MetadataProcessor.Core.csproj

@@ -70,6 +70,7 @@
     <Compile Include="Endianness\nanoBinaryWriter.cs" />
     <Compile Include="Extensions\ParameterDefintionExtensions.cs" />
     <Compile Include="Extensions\ByteArrayExtensions.cs" />
+    <Compile Include="Extensions\MethodDefinitionExtensions.cs" />
     <Compile Include="Extensions\TypeReferenceExtensions.cs" />
     <Compile Include="Extensions\TypeDefinitionExtensions.cs" />
     <Compile Include="InanoTable.cs" />

MetadataProcessor.Core/Tables/nanoSignaturesTable.cs

@@ -342,6 +342,12 @@ public void WriteDataType(
                 return;
             }
 
+            if (typeDefinition.IsGenericParameter || typeDefinition.IsGenericInstance)
+            {
+                writer.WriteByte((byte)nanoCLR_DataType.DATATYPE_GENERIC);
+                return;
+            }
+
             writer.WriteByte(0x00);
         }
 

MetadataProcessor.Core/Utility/NativeMethodsCrc.cs

@@ -183,8 +183,18 @@ internal static string GetnanoClrTypeName(TypeReference parameterType)
             }
             else
             {
-                // type is not primitive, get full qualified type name
-                return parameterType.FullName.Replace(".", String.Empty);
+                // type is not primitive
+                
+                if (parameterType.IsGenericParameter)
+                {
+                    // check if it's generic
+                    return "DATATYPE_GENERICTYPE";
+                }
+                else
+                { 
+                    // this is not a generic, get full qualified type name
+                    return parameterType.FullName.Replace(".", String.Empty);
+                }
             }
         }
 

MetadataProcessor.Core/Utility/nanoCLR_DataType.cs

@@ -47,6 +47,7 @@ public enum nanoCLR_DataType : byte
         DATATYPE_LAST_PRIMITIVE = DATATYPE_STRING,
 
         DATATYPE_OBJECT, // Shortcut for System.Object
+        DATATYPE_GENERIC = DATATYPE_OBJECT,
         DATATYPE_CLASS, // CLASS <class Token>
         DATATYPE_VALUETYPE, // VALUETYPE <class Token>
         DATATYPE_SZARRAY, // Shortcut for single dimension zero lower bound array SZARRAY <type>

MetadataProcessor.Core/nanoDumperGenerator.cs

@@ -247,7 +247,7 @@ private void DumpTypeDefinitions(DumpAllTable dumpTable)
                     var methodDef = new MethodDef()
                     {
                         ReferenceId = m.MetadataToken.ToInt32().ToString("x8"),
-                        Name = m.Name,
+                        Name = m.FullName(),
                         RVA = m.RVA.ToString("x8"),
                         Implementation = "00000000",
                         Signature = PrintSignatureForMethod(m)