← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/monodevelop/oneiric-updates

« back to all changes in this revision

Viewing changes to contrib/Mono.Cecil/Mono.Cecil/Mono.Cecil/AggressiveReflectionReader.cs

  • Committer: Bazaar Package Importer
  • Author(s): Jo Shields
  • Date: 2009-02-18 08:40:51 UTC
  • mfrom: (1.2.1 upstream)
  • Revision ID: james.westby@ubuntu.com-20090218084051-gh8m6ukvokbwj7cf
Tags: 1.9.2+dfsg-1ubuntu1
https://launchpad.net/bugs/330519
* Merge from Debian Experimental (LP: #330519), remaining Ubuntu changes:
  + debian/control:
    - Update for Gnome# 2.24
    - Add libmono-cairo1.0-cil to build-deps to fool pkg-config check

Show diffs side-by-side

added added

removed removed

Lines of Context:
contrib/Mono.Cecil/Mono.Cecil/Mono.Cecil/AggressiveReflectionReader.cs
124
124
 
125
125
                void ReadProperties ()
126
126
                {
127
 
                        if (!m_tHeap.HasTable (PropertyTable.RId))
 
127
                        if (!m_tHeap.HasTable (PropertyTable.RId)) {
 
128
                                m_properties = new PropertyDefinition [0];
128
129
                                return;
 
130
                        }
129
131
 
130
132
                        PropertyTable propsTable = m_tableReader.GetPropertyTable ();
131
133
                        PropertyMapTable pmapTable = m_tableReader.GetPropertyMapTable ();
169
171
 
170
172
                void ReadEvents ()
171
173
                {
172
 
                        if (!m_tHeap.HasTable (EventTable.RId))
 
174
                        if (!m_tHeap.HasTable (EventTable.RId)) {
 
175
                                m_events = new EventDefinition [0];
173
176
                                return;
 
177
                        }
174
178
 
175
179
                        EventTable evtTable = m_tableReader.GetEventTable ();
176
180
                        EventMapTable emapTable = m_tableReader.GetEventMapTable ();
325
329
                                        ctor = GetMemberRefAt (caRow.Type.RID, new GenericContext ()) as MethodReference;
326
330
 
327
331
                                CustomAttrib ca = m_sigReader.GetCustomAttrib (caRow.Value, ctor);
328
 
                                CustomAttribute cattr;
329
 
                                if (!ca.Read) {
330
 
                                        cattr = new CustomAttribute (ctor);
331
 
                                        cattr.Resolved = false;
332
 
                                        cattr.Blob = m_root.Streams.BlobHeap.Read (caRow.Value);
333
 
                                } else
334
 
                                        cattr = BuildCustomAttribute (ctor, ca);
 
332
                                CustomAttribute cattr = BuildCustomAttribute (ctor, m_root.Streams.BlobHeap.Read (caRow.Value), ca);
335
333
 
336
334
                                if (caRow.Parent.RID == 0)
337
335
                                        continue;
420
418
                        for (int i = 0; i < fmTable.Rows.Count; i++) {
421
419
                                FieldMarshalRow fmRow = fmTable [i];
422
420
 
 
421
                                if (fmRow.Parent.RID == 0)
 
422
                                        continue;
 
423
 
423
424
                                IHasMarshalSpec owner = null;
424
425
                                switch (fmRow.Parent.TokenType) {
425
426
                                case TokenType.Field: