Fix field definition output (#36)

Author: josesimoes

source/MetadataProcessor.Core/Tables/nanoFieldDefinitionTable.cs

@@ -7,6 +7,7 @@
 using Mono.Cecil;
 using System;
 using System.Collections.Generic;
+using System.Linq;
 
 namespace nanoFramework.Tools.MetadataProcessor
 {
@@ -185,5 +186,13 @@ private ushort GetFlags(
 
             return flag;
         }
+
+        public override void RemoveUnusedItems(HashSet<MetadataToken> set)
+        {
+            base.RemoveUnusedItems(set);
+
+            // adjust ID
+            _maxReferenceId = _items.Count();
+        }
     }
 }

source/MetadataProcessor.Core/Tables/nanoReferenceTableBase.cs

@@ -153,7 +153,7 @@ protected abstract void WriteSingleItem(
         /// <summary>
         /// Remove unused items from table.
         /// </summary>
-        public void RemoveUnusedItems(HashSet<MetadataToken> set)
+        public virtual void RemoveUnusedItems(HashSet<MetadataToken> set)
         {
             // build a collection of the current items that are present in the used items set
             List<T> usedItems = new List<T>();

source/MetadataProcessor.Core/Tables/nanoTypeDefinitionTable.cs

@@ -42,7 +42,7 @@ public int GetHashCode(TypeDefinition item)
         private IDictionary<uint, List<Tuple<uint, uint>>> _byteCodeOffsets =
             new Dictionary<uint, List<Tuple<uint, uint>>>();
 
-        public List<TypeDefinition> TypeDefinitions { get; }
+        public List<TypeDefinition> TypeDefinitions { get; private set; }
 
         /// <summary>
         /// Creates new instance of <see cref="nanoTypeDefinitionTable"/> object.
@@ -158,7 +158,12 @@ private void WriteClassFields(
             {
                 ushort fieldReferenceId;
                 _context.FieldsTable.TryGetFieldReferenceId(field, true, out fieldReferenceId);
-                firstStaticFieldId = Math.Min(_context.FieldsTable.MaxFieldId, fieldReferenceId);
+
+                if (staticFieldsCount == 0)
+                {
+                    // this is to be checked only on the 1st pass
+                    firstStaticFieldId = Math.Min(_context.FieldsTable.MaxFieldId, fieldReferenceId);
+                }
 
                 _context.SignaturesTable.GetOrCreateSignatureId(field);
                 _context.StringTable.GetOrCreateStringId(field.Name);
@@ -172,7 +177,12 @@ private void WriteClassFields(
             {
                 ushort fieldReferenceId;
                 _context.FieldsTable.TryGetFieldReferenceId(field, true, out fieldReferenceId);
-                firstInstanceFieldId = Math.Min(_context.FieldsTable.MaxFieldId, fieldReferenceId);
+
+                if (instanceFieldsCount == 0)
+                {
+                    // this is to be checked only on the 1st pass
+                    firstInstanceFieldId = Math.Min(_context.FieldsTable.MaxFieldId, fieldReferenceId);
+                }
 
                 _context.SignaturesTable.GetOrCreateSignatureId(field);
                 _context.StringTable.GetOrCreateStringId(field.Name);
@@ -371,5 +381,23 @@ internal void ResetByteCodeOffsets()
         {
             _byteCodeOffsets = new Dictionary<uint, List<Tuple<uint, uint>>>();
         }
+
+        public override void RemoveUnusedItems(HashSet<MetadataToken> set)
+        {
+            base.RemoveUnusedItems(set);
+
+            // remove
+            // build a collection of the current items that are present in the used items set
+            List<TypeDefinition> usedItems = new List<TypeDefinition>();
+
+            foreach (var item in TypeDefinitions
+                                    .Where(item => set.Contains(item.MetadataToken)))
+            {
+                usedItems.Add(item);
+            }
+
+            // replace existing collection
+            TypeDefinitions = usedItems;
+        }
     }
 }