Improve enum export code (#100)

***UPDATE_DEPENDENTS***

Author: josesimoes

source/MetadataProcessor.Core/Extensions/TypeDefinitionExtensions.cs

@@ -46,9 +46,40 @@ public static EnumDeclaration ToEnumDeclaration(this TypeDefinition source)
                 throw new ArgumentException("Can clone only TypeDefinition that are Enums.");
             }
 
+            // build enum name
+            string enumName = "";
+
+
+            // if there is a namespace remove it (as there can't be two enums with the same name)
+            if(!string.IsNullOrEmpty(source.Namespace))
+            {
+                enumName = source.FullName.Replace(source.Namespace, "");
+                
+                // remove trailing dot
+                enumName = enumName.Replace(".", "");
+            }
+            else
+            {
+                if(!string.IsNullOrEmpty(source.DeclaringType.Namespace))
+                {
+                    enumName = source.FullName.Replace(source.DeclaringType.Namespace, "");
+                    // remove trailing dot
+                    enumName = enumName.Replace(".", "");
+
+                    // replace '/' separator
+                    enumName = enumName.Replace("/", "_");
+                }
+                else
+                {
+                    // something very wrong here...
+                    throw new ArgumentException($"Can't process enum type {source.FullName}.");
+                }
+            }
+
             EnumDeclaration myEnum = new EnumDeclaration()
             {
-                EnumName = source.Name
+                EnumName = enumName,
+                FullName = source.FullName
             };
 
             foreach (var f in source.Fields)
@@ -64,7 +95,7 @@ public static EnumDeclaration ToEnumDeclaration(this TypeDefinition source)
                     // pattern: nnnn_yyyyy
                     var emunItem = new EnumItem()
                         {
-                            Name = $"{source.Name}_{f.Name}",
+                            Name = $"{enumName}_{f.Name}",
                         };
 
                     emunItem.Value = f.Constant.ToString();

source/MetadataProcessor.Core/SkeletonGenerator/AssemblyClass.cs

@@ -16,6 +16,8 @@ public class AssemblyDeclaration
         public bool IsCoreLib = false;
 
         public List<Class> Classes = new List<Class>();
+
+        public List<EnumDeclaration> Enums = new List<EnumDeclaration>();
     }
 
     public class Class
@@ -27,8 +29,6 @@ public class Class
         public List<StaticField> StaticFields = new List<StaticField>();
         public List<InstanceField> InstanceFields = new List<InstanceField>();
         public List<MethodStub> Methods = new List<MethodStub>();
-        public List<EnumDeclaration> Enums = new List<EnumDeclaration>();
-
     }
 
     public class StaticField
@@ -75,6 +75,7 @@ public class ClassWithStubs
     public class EnumDeclaration
     {
         public string EnumName;
+        public string FullName;
 
         public List<EnumItem> Items = new List<EnumItem>();
     }

source/MetadataProcessor.Core/SkeletonGenerator/SkeletonTemplates.cs

@@ -38,25 +38,24 @@ internal partial class SkeletonTemplates
 
 #include <nanoCLR_Interop.h>{{#newline}}
 #include <nanoCLR_Runtime.h>{{#newline}}
+#include <nanoPackStruct.h>{{#newline}}
 {{#if IsCoreLib}}
 #include <corlib_native.h>{{#newline}}
 {{#else}}
 {{/if}}
 {{#newline}}
 
-{{#each Classes}}
 {{#each Enums}}
-enum {{EnumName}}{{#newline}}
+typedef enum __nfpack {{EnumName}}{{#newline}}
 {
 {{#newline}}
 {{#each Items}}
     {{Name}} = {{Value}},{{#newline}}
 {{/each}}
 
-};{{#newline}}
+} {{EnumName}};{{#newline}}
 {{#newline}}
 {{/each}}
-{{/each}}
 
 {{#each Classes}}
 struct Library_{{AssemblyName}}_{{Name}}{{#newline}}

source/MetadataProcessor.Core/nanoSkeletonGenerator.cs

@@ -519,34 +519,30 @@ private void GenerateAssemblyHeader()
                                 });
                             }
                         }
-
-                    }
-
-                    // enums
-                    foreach (var t in c.NestedTypes.Where(nt => nt.IsEnum))
-                    {
-                        if(t.IsToExclude())
-                        {
-                            continue;
-                        }
-
-                        // get enum from backup 
-                        var enumDeclaration = _tablesContext.TypeDefinitionTable.EnumDeclarations.FirstOrDefault(td => td.EnumName == t.Name);
-
-                        classData.Enums.Add(enumDeclaration);
                     }
 
                     // anything to add to the header?
-                    if ( classData.StaticFields.Count > 0 ||
+                    if (classData.StaticFields.Count > 0 ||
                         classData.InstanceFields.Count > 0 ||
-                        classData.Methods.Count > 0 ||
-                        classData.Enums.Count > 0)
+                        classData.Methods.Count > 0)
                     {
                         assemblyData.Classes.Add(classData);
                     }
                 }
             }
 
+            // enums have to be processed separatly
+            foreach (var e in _tablesContext.TypeDefinitionTable.EnumDeclarations)
+            {
+                // check if enum is to exclude
+                if(nanoTablesContext.ClassNamesToExclude.Contains(e.FullName))
+                {
+                    continue;
+                }
+
+                assemblyData.Enums.Add(e);
+            }
+
             FormatCompiler compiler = new FormatCompiler();
             Generator generator = compiler.Compile(SkeletonTemplates.AssemblyHeaderTemplate);