Author: atsushi
Date: 2007-04-25 11:36:29 -0400 (Wed, 25 Apr 2007)
New Revision: 76255

Modified:
   trunk/mcs/class/corlib/System/ChangeLog
   trunk/mcs/class/corlib/System/DateTime.cs
   trunk/mcs/class/corlib/Test/System/ChangeLog
   trunk/mcs/class/corlib/Test/System/DateTimeTest.cs
Log:
2007-04-25  Atsushi Enomoto  <[EMAIL PROTECTED]>

        * DateTime.cs : implemented new-2.0 'F' pattern letter.

        * DateTimeTest.cs : test for new-2.0 'F' pattern letter.



Modified: trunk/mcs/class/corlib/System/ChangeLog
===================================================================
--- trunk/mcs/class/corlib/System/ChangeLog     2007-04-25 15:23:24 UTC (rev 
76254)
+++ trunk/mcs/class/corlib/System/ChangeLog     2007-04-25 15:36:29 UTC (rev 
76255)
@@ -1,3 +1,7 @@
+2007-04-25  Atsushi Enomoto  <[EMAIL PROTECTED]>
+
+       * DateTime.cs : implemented new-2.0 'F' pattern letter.
+
 2007-04-24  Jeffrey Stedfast  <[EMAIL PROTECTED]>
 
        Fixes the last of the bugs listed in bug #77525

Modified: trunk/mcs/class/corlib/System/DateTime.cs
===================================================================
--- trunk/mcs/class/corlib/System/DateTime.cs   2007-04-25 15:23:24 UTC (rev 
76254)
+++ trunk/mcs/class/corlib/System/DateTime.cs   2007-04-25 15:36:29 UTC (rev 
76255)
@@ -1007,6 +1007,8 @@
                                if (s.Length == valuePos)
                                        break;
 
+                               bool leading_zeros = true;
+
                                if (chars[pos] == '\'') {
                                        num = 1;
                                        while (pos+num < len) {
@@ -1213,11 +1215,16 @@
                                                return false;
 
                                        break;
+#if NET_2_0
+                               case 'F':
+                                       leading_zeros = false;
+                                       goto case 'f';
+#endif
                                case 'f':
                                        if (fractionalSeconds != -1)
                                                return false;
                                        num = Math.Min (num, 6);
-                                       double decimalNumber = (double) 
_ParseNumber (s, valuePos, 0, num+1, true, sloppy_parsing, out num_parsed);
+                                       double decimalNumber = (double) 
_ParseNumber (s, valuePos, 0, num+1, leading_zeros, sloppy_parsing, out 
num_parsed);
                                        if (num_parsed == -1)
                                                return false;
 
@@ -1351,6 +1358,9 @@
                                        switch (chars [pos]) {
                                        case 'm':
                                        case 's':
+#if NET_2_0
+                                       case 'F':
+#endif
                                        case 'f':
                                        case 'z':
                                                if (s.Length > valuePos && s 
[valuePos] == 'Z'
@@ -1751,6 +1761,7 @@
 
                        while (i < format.Length) {
                                int tokLen;
+                               bool omitZeros = false;
                                char ch = format [i];
 
                                switch (ch) {
@@ -1783,6 +1794,11 @@
                                        tokLen = CountRepeat (format, i, ch);
                                        ZeroPad (result, this.Second, tokLen == 
1 ? 1 : 2);
                                        break;
+#if NET_2_0
+                               case 'F':
+                                       omitZeros = true;
+                                       goto case 'f';
+#endif
                                case 'f':
                                        // fraction of second, to same number of
                                        // digits as there are f's
@@ -1792,8 +1808,13 @@
                                                throw new FormatException 
("Invalid Format String");
 
                                        int dec = (int)((long)(this.Ticks % 
TimeSpan.TicksPerSecond) / (long) Math.Pow (10, 7 - tokLen));
+                                       int startLen = result.Length;
                                        ZeroPad (result, dec, tokLen);
 
+                                       if (omitZeros)
+                                               while (result.Length > startLen 
&& result [result.Length - 1] == '0')
+                                                       result.Length--;
+
                                        break;
                                case 't':
                                        // AM/PM. t == first char, tt+ == full

Modified: trunk/mcs/class/corlib/Test/System/ChangeLog
===================================================================
--- trunk/mcs/class/corlib/Test/System/ChangeLog        2007-04-25 15:23:24 UTC 
(rev 76254)
+++ trunk/mcs/class/corlib/Test/System/ChangeLog        2007-04-25 15:36:29 UTC 
(rev 76255)
@@ -1,3 +1,7 @@
+2007-04-25  Atsushi Enomoto  <[EMAIL PROTECTED]>
+
+       * DateTimeTest.cs : test for new-2.0 'F' pattern letter.
+
 2007-04-19  Gert Driesen  <[EMAIL PROTECTED]>
 
        * ArrayTest.cs: Added test for Resize. Spaces to tabs.

Modified: trunk/mcs/class/corlib/Test/System/DateTimeTest.cs
===================================================================
--- trunk/mcs/class/corlib/Test/System/DateTimeTest.cs  2007-04-25 15:23:24 UTC 
(rev 76254)
+++ trunk/mcs/class/corlib/Test/System/DateTimeTest.cs  2007-04-25 15:36:29 UTC 
(rev 76255)
@@ -1613,6 +1613,15 @@
                // This should never throw.
                DateTime.MinValue.ToLocalTime ();
        }
+
+       [Test]
+       public void OmittedSecondsFraction ()
+       {
+               DateTime today = DateTime.Today;
+               AssertEquals ("#1", "00:00:00.13579", today.AddTicks 
(1357900).ToString ("HH:mm:ss.FFFFFFF"));
+               DateTime dt = DateTime.ParseExact ("00:00:00.13579", 
"HH:mm:ss.FFFFFFF", CultureInfo.InvariantCulture);
+               AssertEquals ("#2", today, dt.AddTicks (-1357900));
+       }
 #endif
 }
 

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

Reply via email to