Author: jbevain
Date: 2007-07-21 11:34:17 -0400 (Sat, 21 Jul 2007)
New Revision: 82416

Modified:
   trunk/mcs/class/Mono.Cecil/Mono.Cecil/CallSite.cs
   trunk/mcs/class/Mono.Cecil/Mono.Cecil/FunctionPointerType.cs
   trunk/mcs/class/Mono.Cecil/Mono.Cecil/MethodReference.cs
Log:
update ToStrings to take sentinels into account

Modified: trunk/mcs/class/Mono.Cecil/Mono.Cecil/CallSite.cs
===================================================================
--- trunk/mcs/class/Mono.Cecil/Mono.Cecil/CallSite.cs   2007-07-21 14:57:44 UTC 
(rev 82415)
+++ trunk/mcs/class/Mono.Cecil/Mono.Cecil/CallSite.cs   2007-07-21 15:34:17 UTC 
(rev 82416)
@@ -83,12 +83,17 @@
 
                public override string ToString ()
                {
+                       int sentinel = GetSentinel ();
                        StringBuilder sb = new StringBuilder ();
                        sb.Append (m_function.ReturnType.ReturnType.FullName);
                        sb.Append ("(");
                        for (int i = 0; i < m_function.Parameters.Count; i++) {
                                if (i > 0)
                                        sb.Append (",");
+
+                               if (i == sentinel)
+                                       sb.Append ("...,");
+
                                sb.Append (m_function.Parameters 
[i].ParameterType.FullName);
                        }
                        sb.Append (")");

Modified: trunk/mcs/class/Mono.Cecil/Mono.Cecil/FunctionPointerType.cs
===================================================================
--- trunk/mcs/class/Mono.Cecil/Mono.Cecil/FunctionPointerType.cs        
2007-07-21 14:57:44 UTC (rev 82415)
+++ trunk/mcs/class/Mono.Cecil/Mono.Cecil/FunctionPointerType.cs        
2007-07-21 15:34:17 UTC (rev 82416)
@@ -75,6 +75,7 @@
 
                public override string FullName {
                        get {
+                               int sentinel = GetSentinel ();
                                StringBuilder sb = new StringBuilder ();
                                sb.Append (m_function.Name);
                                sb.Append (" ");
@@ -83,6 +84,10 @@
                                for (int i = 0; i < 
m_function.Parameters.Count; i++) {
                                        if (i > 0)
                                                sb.Append (",");
+
+                                       if (i == sentinel)
+                                               sb.Append ("...,");
+
                                        sb.Append (m_function.Parameters 
[i].ParameterType.FullName);
                                }
                                sb.Append (")");

Modified: trunk/mcs/class/Mono.Cecil/Mono.Cecil/MethodReference.cs
===================================================================
--- trunk/mcs/class/Mono.Cecil/Mono.Cecil/MethodReference.cs    2007-07-21 
14:57:44 UTC (rev 82415)
+++ trunk/mcs/class/Mono.Cecil/Mono.Cecil/MethodReference.cs    2007-07-21 
15:34:17 UTC (rev 82416)
@@ -118,13 +118,13 @@
                        sb.Append (base.ToString ());
                        sb.Append ("(");
                        for (int i = 0; i < this.Parameters.Count; i++) {
+                               if (i > 0)
+                                       sb.Append (",");
+
                                if (i == sentinel)
                                        sb.Append ("...,");
 
                                sb.Append (this.Parameters 
[i].ParameterType.FullName);
-
-                               if (i < this.Parameters.Count - 1)
-                                       sb.Append (",");
                        }
                        sb.Append (")");
                        return sb.ToString ();

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

Reply via email to