[Dotgnu-pnet-commits] CVS: pnetlib/runtime/System DateTime.cs,1.25,1.26 String.cs,1.34,1.35

[Rhys Weatherley <address@hidden>]

Update of /cvsroot/dotgnu-pnet/pnetlib/runtime/System
In directory subversions:/tmp/cvs-serv25329/runtime/System

Modified Files:
        DateTime.cs String.cs 
Log Message:


Rewrite DateTimeParser to be culture-sensitive and more efficient.


Index: DateTime.cs
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/runtime/System/DateTime.cs,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -r1.25 -r1.26
*** DateTime.cs 1 Jun 2003 10:36:54 -0000       1.25
--- DateTime.cs 3 Jun 2003 03:26:47 -0000       1.26
***************
*** 361,382 ****
        public static DateTime Parse(String s)
                        {
!                               return Parse(s,null);
                        }
        public static DateTime Parse(String s, IFormatProvider provider)
                        {
!                               return Parse(s, provider, 
DateTimeStyles.AllowWhiteSpaces);
                        }
        public static DateTime Parse(String s, IFormatProvider provider,
                                                                 DateTimeStyles 
style)
                        {
!                               return DateTimeParser.Parse(s,
!                                       
DateTimeFormatInfo.GetInstance(provider),style);
                        }
        public static DateTime ParseExact(String s, String format,
                                                                          
IFormatProvider provider)
                        {
!                               return DateTimeParser.ParseExact(s,format,
!                                                       
DateTimeFormatInfo.GetInstance(provider),
!                                                                       
DateTimeStyles.AllowWhiteSpaces);
                        }
        public static DateTime ParseExact(String s, String format,
--- 361,387 ----
        public static DateTime Parse(String s)
                        {
!                               return DateTimeParser.Parse
!                                       (s, null, 
DateTimeStyles.AllowWhiteSpaces);
                        }
        public static DateTime Parse(String s, IFormatProvider provider)
                        {
!                               return DateTimeParser.Parse
!                                       (s, provider, 
DateTimeStyles.AllowWhiteSpaces);
                        }
        public static DateTime Parse(String s, IFormatProvider provider,
                                                                 DateTimeStyles 
style)
                        {
!                               return DateTimeParser.Parse(s, provider, style);
                        }
        public static DateTime ParseExact(String s, String format,
                                                                          
IFormatProvider provider)
                        {
!                               if(format == null)
!                               {
!                                       throw new 
ArgumentNullException("format");
!                               }
!                               return DateTimeParser.ParseExact
!                                       (s, new String[] {format}, provider,
!                                        DateTimeStyles.AllowWhiteSpaces);
                        }
        public static DateTime ParseExact(String s, String format,
***************
*** 384,390 ****
                                                                          
DateTimeStyles style)
                        {
!                               return DateTimeParser.ParseExact(s,format,
!                                                       
DateTimeFormatInfo.GetInstance(provider),
!                                                                       style);
                        }
        public static DateTime ParseExact(String s, String[] formats,
--- 389,398 ----
                                                                          
DateTimeStyles style)
                        {
!                               if(format == null)
!                               {
!                                       throw new 
ArgumentNullException("format");
!                               }
!                               return DateTimeParser.ParseExact
!                                       (s, new String[] {format}, provider, 
style);
                        }
        public static DateTime ParseExact(String s, String[] formats,
***************
*** 392,397 ****
                                                                          
DateTimeStyles style)
                        {
!                               return DateTimeParser.ParseExact(s,formats,
!                                                       
DateTimeFormatInfo.GetInstance(provider),style);
                        }
  
--- 400,405 ----
                                                                          
DateTimeStyles style)
                        {
!                               return DateTimeParser.ParseExact
!                                       (s, formats, provider, style);
                        }
  

Index: String.cs
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/runtime/System/String.cs,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -r1.34 -r1.35
*** String.cs   23 Apr 2003 05:39:48 -0000      1.34
--- String.cs   3 Jun 2003 03:26:47 -0000       1.35
***************
*** 234,243 ****
                        }
  
- #if !ECMA_COMPAT
        // Compare two sub-strings with a particular culture's comparison rules.
!       public static int Compare(String strA, int indexA,
!                                                         String strB, int 
indexB,
!                                                         int length, bool 
ignoreCase,
!                                                         CultureInfo culture)
                        {
                                if(culture == null)
--- 234,247 ----
                        }
  
        // Compare two sub-strings with a particular culture's comparison rules.
! #if ECMA_COMPAT
!       internal
! #else
!       public
! #endif
!       static int Compare(String strA, int indexA,
!                                          String strB, int indexB,
!                                          int length, bool ignoreCase,
!                                          CultureInfo culture)
                        {
                                if(culture == null)
***************
*** 250,254 ****
                                                                           
ignoreCase, culture);
                        }
- #endif
  
        // Internal version of "CompareOrdinal", with all parameters.
--- 254,257 ----