Author: roeie
Date: 2007-12-02 07:31:57 -0500 (Sun, 02 Dec 2007)
New Revision: 90520

Added:
   branches/cecil-delayed-loading/Mono.Cecil/EventDefExtendedTable.cs
Modified:
   branches/cecil-delayed-loading/Mono.Cecil.csproj
   branches/cecil-delayed-loading/Mono.Cecil/ExtendedMetadata.cs
   branches/cecil-delayed-loading/Mono.Cecil/LazyReflectionReader.cs
   branches/cecil-delayed-loading/Mono.Cecil/MetadataResolver.cs
Log:
implement EventDefinition resolving for Delayed-Loading

Added: branches/cecil-delayed-loading/Mono.Cecil/EventDefExtendedTable.cs
===================================================================
--- branches/cecil-delayed-loading/Mono.Cecil/EventDefExtendedTable.cs  
2007-12-02 12:28:57 UTC (rev 90519)
+++ branches/cecil-delayed-loading/Mono.Cecil/EventDefExtendedTable.cs  
2007-12-02 12:31:57 UTC (rev 90520)
@@ -0,0 +1,78 @@
+namespace Mono.Cecil
+{
+       using System;
+       using System.Collections;
+       using System.Text;
+       using Mono.Cecil.Metadata;
+
+       class EventDefExtendedTable : BaseMetadataTableVisitor
+       {
+               private IMetadataRowVisitor m_rowVisitor;
+               private EventExtRow [] m_rows;
+
+               public override IMetadataRowVisitor GetRowVisitor () {
+                       return m_rowVisitor;
+               }
+
+               public EventExtRow this [int i] {
+                       get {
+                               return m_rows [i];
+                       }
+               }
+
+               public override void VisitTableCollection (TableCollection 
coll) {
+                       IMetadataTable eventTable = coll.Heap [EventTable.RId];
+                       m_rows = new EventExtRow [eventTable == null ? 0 : 
eventTable.Rows.Count];
+                       m_rowVisitor = new EventExtRowVistor (m_rows, coll);
+               }
+       }
+
+       public class EventExtRowVistor : ExtendedTableRowVisitor
+       {
+               EventExtRow [] m_rows;
+               private TableCollection m_tables;
+
+               public EventExtRowVistor (EventExtRow [] rows, TableCollection 
col) {
+                       m_rows = rows;
+                       m_tables = col;
+               }
+
+               public override void VisitCustomAttributeRow 
(CustomAttributeRow row) {
+                       if (row.Parent.TokenType == TokenType.Event)
+                               Add (ref GetOrCreate ((int) row.Parent.RID - 
1).m_customAttributes, m_currentRowIndex);
+                       m_currentRowIndex++;
+               }
+
+               public override void VisitEventMapRow (EventMapRow row) {
+                       int startIndex = (int) row.EventList - 1;
+                       int declaringTypeIndex = (int) row.Parent - 1;
+                       EventMapRow next = (EventMapRow) NextRow 
(m_currentRowIndex);
+                       int endIndex = next != null ? (int) next.EventList - 1 
: GetRowCount (m_tables.Heap [EventTable.RId]);
+                       for (int i = startIndex; i < endIndex; ++i)
+                               GetOrCreate (i).m_declaringType = 
declaringTypeIndex;
+                       m_currentRowIndex++;
+               }
+
+               public override void VisitMethodSemanticsRow 
(MethodSemanticsRow row) {
+                       if (row.Semantics == MethodSemanticsAttributes.AddOn)
+                               GetOrCreate ((int) row.Association.RID - 
1).m_addMethod = (int) row.Method - 1;
+                       else if (row.Semantics == 
MethodSemanticsAttributes.RemoveOn)
+                               GetOrCreate ((int) row.Association.RID - 
1).m_removeMethod = (int) row.Method - 1;
+               }
+
+               private EventExtRow GetOrCreate (int i) {
+                       if (m_rows [i] == null)
+                               m_rows [i] = new EventExtRow ();
+                       return m_rows [i];
+               }
+       }
+
+       public class EventExtRow
+       {
+               public int m_constant = -1;
+               public ArrayList m_customAttributes;
+               public int m_declaringType;
+               public int m_addMethod = -1;
+               public int m_removeMethod = -1;
+       }
+}
\ No newline at end of file

Modified: branches/cecil-delayed-loading/Mono.Cecil/ExtendedMetadata.cs
===================================================================
--- branches/cecil-delayed-loading/Mono.Cecil/ExtendedMetadata.cs       
2007-12-02 12:28:57 UTC (rev 90519)
+++ branches/cecil-delayed-loading/Mono.Cecil/ExtendedMetadata.cs       
2007-12-02 12:31:57 UTC (rev 90520)
@@ -41,6 +41,7 @@
                FieldDefExtendedTable m_fieldsExtTable = new 
FieldDefExtendedTable ();
                PropertyDefExtendedTable m_propertyExtTable = new 
PropertyDefExtendedTable ();
                ParamDefExtendedTable m_paramExtTable = new 
ParamDefExtendedTable ();
+               EventDefExtendedTable m_eventsTable = new EventDefExtendedTable 
();
 
                public MetadataExtendedTables (TableCollection tables) {
                        BuildTables (tables);
@@ -52,6 +53,7 @@
                        tables.Accept (m_fieldsExtTable);
                        tables.Accept (m_propertyExtTable);
                        tables.Accept (m_paramExtTable);
+                       tables.Accept (m_eventsTable);
                }
 
                internal TypeDefExtendedTable Types {
@@ -83,5 +85,11 @@
                                return m_paramExtTable;
                        }
                }
+
+               internal EventDefExtendedTable Events {
+                       get {
+                               return m_eventsTable;
+                       }
+               }
        }
 }

Modified: branches/cecil-delayed-loading/Mono.Cecil/LazyReflectionReader.cs
===================================================================
--- branches/cecil-delayed-loading/Mono.Cecil/LazyReflectionReader.cs   
2007-12-02 12:28:57 UTC (rev 90519)
+++ branches/cecil-delayed-loading/Mono.Cecil/LazyReflectionReader.cs   
2007-12-02 12:31:57 UTC (rev 90520)
@@ -178,19 +178,22 @@
                }
 
                public override EventDefinition GetEventDefAt (uint rid) {
-                       return null;
-                       //EventDefinition current = base.GetEventDefAt (rid);
-                       //if (current == null) {
-                       //    EventRow erow = TableReader.GetEventTable () 
[(int) rid - 1];
-                       //    MetadataToken ownersToken = m_metaResolver 
[TokenType.Event] [RelationType.DeclaringType].GetRelatedItem (rid);
-                       //    TypeDefinition owner = GetTypeDefAt 
(ownersToken.RID);
-                       //    current = new EventDefinition (
-                       //        m_root.Streams.StringsHeap [erow.Name],
-                       //        GetTypeDefOrRef (erow.EventType, new 
GenericContext (owner)), erow.EventFlags);
-                       //    current.MetadataToken = 
MetadataToken.FromMetadataRow (TokenType.Event, (int) rid - 1);
-                       //    m_events [(int) rid - 1] = current;
-                       //}
-                       //return current;
+                       EventDefinition current = base.GetEventDefAt (rid);
+                       if (current == null) {
+                               EventRow erow = TableReader.GetEventTable () 
[(int) rid - 1];
+                               EventExtRow extRow = m_extTables.Events [(int) 
rid - 1];
+                               int ownerRow = extRow.m_declaringType;
+                               TypeDefinition owner = GetTypeDefAt ((uint) 
ownerRow + 1);
+                               current = new EventDefinition (
+                                       m_root.Streams.StringsHeap [erow.Name],
+                                       GetTypeDefOrRef (erow.EventType, new 
GenericContext (owner)), erow.EventFlags);
+                               current.MetadataToken = 
MetadataToken.FromMetadataRow (TokenType.Event, (int) rid - 1);
+                               current.AddMethod = GetMethodDefAt ((uint) 
extRow.m_addMethod + 1);
+                               current.RemoveMethod = GetMethodDefAt ((uint) 
extRow.m_removeMethod + 1);
+                               m_metaResolver.ResolveCustomAttributes 
(current.MetadataToken, current.CustomAttributes);
+                               m_events [(int) rid - 1] = current;
+                       }
+                       return current;
                }
 
                public override PropertyDefinition GetPropertyDefAt (uint rid) {

Modified: branches/cecil-delayed-loading/Mono.Cecil/MetadataResolver.cs
===================================================================
--- branches/cecil-delayed-loading/Mono.Cecil/MetadataResolver.cs       
2007-12-02 12:28:57 UTC (rev 90519)
+++ branches/cecil-delayed-loading/Mono.Cecil/MetadataResolver.cs       
2007-12-02 12:31:57 UTC (rev 90520)
@@ -15,6 +15,7 @@
                FieldDefExtendedTable m_fieldDefTable;
                PropertyDefExtendedTable m_propertyDefTable;
                ParamDefExtendedTable m_paramDefTable;
+               EventDefExtendedTable m_eventDefTable;
 
                public MetadataResolver (LazyReflectionReader reader, 
MetadataExtendedTables tables) {
                        m_reader = reader;
@@ -23,6 +24,7 @@
                        m_fieldDefTable = tables.Fields;
                        m_propertyDefTable = tables.Properties;
                        m_paramDefTable = tables.Parameters;
+                       m_eventDefTable = tables.Events;
                }               
 
                #region Lazy helper methods
@@ -84,6 +86,11 @@
                                        return;
                                attributes = m_propertyDefTable [(int) 
token.RID - 1].m_customAttributes;
                                break;
+                       case TokenType.Event:
+                               if (m_eventDefTable [(int) token.RID - 1] == 
null)
+                                       return;
+                               attributes = m_eventDefTable [(int) token.RID - 
1].m_customAttributes;
+                               break;
                        case TokenType.Param:
                                if (m_paramDefTable [(int) token.RID - 1] == 
null)
                                        return;

Modified: branches/cecil-delayed-loading/Mono.Cecil.csproj
===================================================================
--- branches/cecil-delayed-loading/Mono.Cecil.csproj    2007-12-02 12:28:57 UTC 
(rev 90519)
+++ branches/cecil-delayed-loading/Mono.Cecil.csproj    2007-12-02 12:31:57 UTC 
(rev 90520)
@@ -243,6 +243,7 @@
     <Compile Include="Mono.Cecil\DefaultImporter.cs" />
     <Compile Include="Mono.Cecil\EmbeddedResource.cs" />
     <Compile Include="Mono.Cecil\EventAttributes.cs" />
+    <Compile Include="Mono.Cecil\EventDefExtendedTable.cs" />
     <Compile Include="Mono.Cecil\EventDefinition.cs" />
     <Compile Include="Mono.Cecil\EventDefinitionCollection.cs" />
     <Compile Include="Mono.Cecil\EventReference.cs" />

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to