Author: jbevain
Date: 2007-09-12 08:28:16 -0400 (Wed, 12 Sep 2007)
New Revision: 85680

Modified:
   trunk/mcs/class/Mono.Cecil/ChangeLog
   trunk/mcs/class/Mono.Cecil/Mono.Cecil.Signatures/SignatureReader.cs
   trunk/mcs/class/Mono.Cecil/Mono.Cecil.Signatures/SignatureWriter.cs
   trunk/mcs/class/Mono.Cecil/Mono.Cecil.Signatures/TypeSpec.cs
   trunk/mcs/class/Mono.Cecil/Mono.Cecil/ReflectionWriter.cs
Log:
2007-09-12  Jb Evain  <[EMAIL PROTECTED]>

        * Mono.Cecil/ReflectionReader.cs
          Mono.Cecil.Signatures/SignatureReader.cs
          Mono.Cecil.Signatures/TypeSpec.cs
          Mono.Cecil.Signatures/SignatureWriter.cs:
                Deal with custom mods on typespecs.


Modified: trunk/mcs/class/Mono.Cecil/ChangeLog
===================================================================
--- trunk/mcs/class/Mono.Cecil/ChangeLog        2007-09-12 12:26:21 UTC (rev 
85679)
+++ trunk/mcs/class/Mono.Cecil/ChangeLog        2007-09-12 12:28:16 UTC (rev 
85680)
@@ -1,5 +1,13 @@
 2007-09-12  Jb Evain  <[EMAIL PROTECTED]>
 
+       * Mono.Cecil/ReflectionReader.cs
+         Mono.Cecil.Signatures/SignatureReader.cs
+         Mono.Cecil.Signatures/TypeSpec.cs
+         Mono.Cecil.Signatures/SignatureWriter.cs:
+               Deal with custom mods on typespecs.
+
+2007-09-12  Jb Evain  <[EMAIL PROTECTED]>
+
        * Mono.Cecil.Binary/ImageReader.cs: some 64bits assemblies
        have a strange header without import tables.
 

Modified: trunk/mcs/class/Mono.Cecil/Mono.Cecil/ReflectionWriter.cs
===================================================================
--- trunk/mcs/class/Mono.Cecil/Mono.Cecil/ReflectionWriter.cs   2007-09-12 
12:26:21 UTC (rev 85679)
+++ trunk/mcs/class/Mono.Cecil/Mono.Cecil/ReflectionWriter.cs   2007-09-12 
12:28:16 UTC (rev 85680)
@@ -1298,7 +1298,9 @@
 
                public TypeSpec GetTypeSpecSig (TypeReference type)
                {
-                       TypeSpec ts = new TypeSpec (GetSigType (type));
+                       TypeSpec ts = new TypeSpec ();
+                       ts.CustomMods = GetCustomMods (type);
+                       ts.Type = GetSigType (type);
                        return ts;
                }
 

Modified: trunk/mcs/class/Mono.Cecil/Mono.Cecil.Signatures/SignatureReader.cs
===================================================================
--- trunk/mcs/class/Mono.Cecil/Mono.Cecil.Signatures/SignatureReader.cs 
2007-09-12 12:26:21 UTC (rev 85679)
+++ trunk/mcs/class/Mono.Cecil/Mono.Cecil.Signatures/SignatureReader.cs 
2007-09-12 12:28:16 UTC (rev 85680)
@@ -334,8 +334,10 @@
                {
                        int start = pos;
                        Utilities.ReadCompressedInteger (data, start, out 
start);
-                       SigType t = ReadType (data, start, out start);
-                       return new TypeSpec (t);
+                       TypeSpec ts = new TypeSpec ();
+                       ts.CustomMods = ReadCustomMods (data, start, out start);
+                       ts.Type = ReadType (data, start, out start);
+                       return ts;
                }
 
                MethodSpec ReadMethodSpec (byte [] data, int pos)

Modified: trunk/mcs/class/Mono.Cecil/Mono.Cecil.Signatures/SignatureWriter.cs
===================================================================
--- trunk/mcs/class/Mono.Cecil/Mono.Cecil.Signatures/SignatureWriter.cs 
2007-09-12 12:26:21 UTC (rev 85679)
+++ trunk/mcs/class/Mono.Cecil/Mono.Cecil.Signatures/SignatureWriter.cs 
2007-09-12 12:28:16 UTC (rev 85680)
@@ -294,6 +294,7 @@
 
                void Write (TypeSpec ts)
                {
+                       Write (ts.CustomMods);
                        Write (ts.Type);
                }
 

Modified: trunk/mcs/class/Mono.Cecil/Mono.Cecil.Signatures/TypeSpec.cs
===================================================================
--- trunk/mcs/class/Mono.Cecil/Mono.Cecil.Signatures/TypeSpec.cs        
2007-09-12 12:26:21 UTC (rev 85679)
+++ trunk/mcs/class/Mono.Cecil/Mono.Cecil.Signatures/TypeSpec.cs        
2007-09-12 12:28:16 UTC (rev 85680)
@@ -30,11 +30,7 @@
 
        internal sealed class TypeSpec {
 
+               public CustomMod [] CustomMods;
                public SigType Type;
-
-               public TypeSpec (SigType type)
-               {
-                       this.Type = type;
-               }
        }
 }

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

Reply via email to