Unify Date.fromString and support more Iso 8601.

frog/leg/lib/mockimpl.dart

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 // Mocks of classes and interfaces that Leg cannot read directly.
 
 // TODO(ahe): Remove this file.
 
 class JSSyntaxRegExp implements RegExp {
   final String pattern;
@@ skipping 218 matching lines @@
     _asJs();
   }
 
   DateImplementation.now()
       : timeZone = new TimeZone.local(),
         value = Primitives.dateNow() {
     _asJs();
   }
 
   factory DateImplementation.fromString(String formattedString) {
-    // JavaScript's parse function is not specified and there are differences
-    // between the different implementations. Make sure we can at least read in
-    // Dart's output: try to read in (a subset of) ISO 8601 first. If that fails
-    // fall back to JavaScript's implementation.
-    final RegExp re =
-        const RegExp(@'^([+-]?\d?\d\d\d\d)-?(\d\d)-?(\d\d) (\d\d):(\d\d):(\d\d)(?:.(\d{1,3}))? ?([zZ]?)$');
+    // Read in (a subset of) ISO 8601.
+    // Examples:
+    //    - "2012-02-27 13:27:00"
+    //    - "2012-02-27 13:27:00.423z"
+    //    - "20120227 13:27:00"
+    //    - "20120227T132700"
+    //    - "20120227"
+    //    - "2012-02-27T14Z"
+    //    - "-123450101 00:00:00 Z"  // In the year -12345.
+    final RegExp re = const RegExp(
+        @'^([+-]?\d?\d\d\d\d)-?(\d\d)-?(\d\d)' +  // The day part.
+        @'(?:[ T](\d\d)(?::?(\d\d)(?::?(\d\d)(?:.(\d{1,5}))?)?)? ?([zZ])?)?$');
     Match match = re.firstMatch(formattedString);
     if (match !== null) {
+      int parseIntOrZero(String matched) {
+        // TODO(floitsch): we should not need to test against the empty string.
+        if (matched === null || matched == "") return 0;
+        return Math.parseInt(matched);
+      }
+
       int years = Math.parseInt(match[1]);
       int month = Math.parseInt(match[2]);
       int day = Math.parseInt(match[3]);
-      int hours = Math.parseInt(match[4]);
-      int minutes = Math.parseInt(match[5]);
-      int seconds = Math.parseInt(match[6]);
-      int milliseconds = 0;
-      if (match[7] !== null) {
-        milliseconds = Math.parseInt(match[7]);
+      int hours = parseIntOrZero(match[4]);
+      int minutes = parseIntOrZero(match[5]);
+      int seconds = parseIntOrZero(match[6]);
+      bool addOneMillisecond = false;
+      int milliseconds = parseIntOrZero(match[7]);
+      if (milliseconds != 0) {
         if (match[7].length == 1) {
           milliseconds *= 100;
         } else if (match[7].length == 2) {
           milliseconds *= 10;
+        } else if (match[7].length == 3) {
+          // Do nothing.
+        } else if (match[7].length == 4) {
+          addOneMillisecond = ((milliseconds % 10) >= 5);
+          milliseconds ~/= 10;
         } else {
-          assert(match[7].length == 3);
+          assert(match[7].length == 5);
+          addOneMillisecond = ((milliseconds %100) >= 50);
+          milliseconds ~/= 100;
+        }
+        if (addOneMillisecond && milliseconds < 999) {
+          addOneMillisecond = false;
+          milliseconds++;
         }
       }
+      // TODO(floitsch): we should not need to test against the empty string.
       bool isUtc = (match[8] !== null) && (match[8] != "");
       TimeZone timezone = isUtc ? const TimeZone.utc() : new TimeZone.local();
-      return new DateImplementation.withTimeZone(
-          years, month, day, hours, minutes, seconds, milliseconds, timezone);
+      int epochValue = Primitives.valueFromDecomposedDate(
+          years, month, day, hours, minutes, seconds, milliseconds, isUtc);
+      if (epochValue === null) {
+        throw new IllegalArgumentException(formattedString);
+      }
+      if (addOneMillisecond) epochValue++;
+      return new DateImplementation.fromEpoch(epochValue, timezone);
     } else {
-      return new DateImplementation.fromEpoch(formattedString,
-                                              new TimeZone.local());
+      throw new IllegalArgumentException(formattedString);
     }
   }
 
   const DateImplementation.fromEpoch(this.value, this.timeZone);
 
   bool operator ==(other) {
     if (!(other is DateImplementation)) return false;
     return (value == other.value) && (timeZone == other.timeZone);
   }
 
@@ skipping 31 matching lines @@
 
   bool isLocalTime() {
     return !timeZone.isUtc;
   }
 
   bool isUtc() {
     return timeZone.isUtc;
   }
 
   String toString() {
+    String y = fourDigits(year);
     String m = twoDigits(month);
     String d = twoDigits(day);
     String h = twoDigits(hours);
     String min = twoDigits(minutes);
     String sec = twoDigits(seconds);
     String ms = threeDigits(milliseconds);
     if (timeZone.isUtc) {
-      return "$year-$m-$d $h:$min:$sec.${ms}Z";
+      return "$y-$m-$d $h:$min:$sec.${ms}Z";
     } else {
-      return "$year-$m-$d $h:$min:$sec.$ms";
+      return "$y-$m-$d $h:$min:$sec.$ms";
     }
   }
 
   // Adds the [duration] to this Date instance.
   Date add(Duration duration) {
     checkNull(duration);
     return new DateImplementation.fromEpoch(value + duration.inMilliseconds,
                                             timeZone);
   }
 
@@ skipping 78 matching lines @@
     }
     String twoDigitMinutes =
         twoDigits(inMinutes.remainder(Duration.MINUTES_PER_HOUR));
     String twoDigitSeconds =
         twoDigits(inSeconds.remainder(Duration.SECONDS_PER_MINUTE));
     String threeDigitMs =
         threeDigits(inMilliseconds.remainder(Duration.MILLISECONDS_PER_SECOND));
     return "${inHours}:${twoDigitMinutes}:${twoDigitSeconds}.${threeDigitMs}";
   }
 }