[Dotgnu-pnet-commits] CVS: pnetlib/System.Xml XmlConvert.cs,1.2,1.3

[Rhys Weatherley <address@hidden>]

Update of /cvsroot/dotgnu-pnet/pnetlib/System.Xml
In directory subversions:/tmp/cvs-serv11082/System.Xml

Modified Files:
        XmlConvert.cs 
Log Message:


Test cases and bug fixes for "NameTable" and "XmlConvert".


Index: XmlConvert.cs
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/System.Xml/XmlConvert.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** XmlConvert.cs       26 Jul 2002 10:57:03 -0000      1.2
--- XmlConvert.cs       2 Dec 2002 03:14:31 -0000       1.3
***************
*** 181,185 ****
                        }
  
!       // Decode a name that has escaped hexadecimal characters.EnclosingMark 
||
        public static String DecodeName(String name)
                        {
--- 181,185 ----
                        }
  
!       // Decode a name that has escaped hexadecimal characters.
        public static String DecodeName(String name)
                        {
***************
*** 210,214 ****
                                                                                
         (FromHex(name[posn + 3]) << 8) |
                                                                                
         (FromHex(name[posn + 4]) << 4) |
!                                                                               
          FromHex(name[posn + 3])));
                                                posn += 7;
                                        }
--- 210,214 ----
                                                                                
         (FromHex(name[posn + 3]) << 8) |
                                                                                
         (FromHex(name[posn + 4]) << 4) |
!                                                                               
          FromHex(name[posn + 5])));
                                                posn += 7;
                                        }
***************
*** 216,220 ****
                                        {
                                                // Search for the next 
candidate.
-                                               result.Append('_');
                                                posn2 = name.IndexOf('_', posn 
+ 1);
                                                if(posn2 != -1)
--- 216,219 ----
***************
*** 225,228 ****
--- 224,228 ----
                                                else
                                                {
+                                                       result.Append('_');
                                                        break;
                                                }
***************
*** 244,251 ****
--- 244,254 ----
        private static void AppendHex(StringBuilder result, char ch)
                        {
+                               result.Append('_');
+                               result.Append('x');
                                result.Append(hexchars[(ch >> 12) & 0x0F]);
                                result.Append(hexchars[(ch >> 8) & 0x0F]);
                                result.Append(hexchars[(ch >> 4) & 0x0F]);
                                result.Append(hexchars[ch & 0x0F]);
+                               result.Append('_');
                        }
  
***************
*** 428,431 ****
--- 431,435 ----
        public static double ToDouble(String s)
                        {
+                               s = s.Trim();
                                if(s == "-INF")
                                {
***************
*** 511,514 ****
--- 515,519 ----
        public static float ToSingle(String s)
                        {
+                               s = s.Trim();
                                if(s == "-INF")
                                {