Sharing of sources for corelib date implementation between VM and

corelib/src/implementation/date.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.
 
 class DateImplementation implements Date {
   final int millisecondsSinceEpoch;
   final bool isUtc;
 
   factory DateImplementation.fromString(String formattedString) {
     // 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.
+        @'^([+-]?\d?\d\d\d\d)-?(\d\d)-?(\d\d)'  // The day part.
         @'(?:[ T](\d\d)(?::?(\d\d)(?::?(\d\d)(.\d{1,6})?)?)? ?([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);
       }
 
       double parseDoubleOrZero(String matched) {
         // TODO(floitsch): we should not need to test against the empty string.
         if (matched === null || matched == "") return 0.0;
         return Math.parseDouble(matched);
       }
 
       int years = Math.parseInt(match[1]);
       int month = Math.parseInt(match[2]);
       int day = Math.parseInt(match[3]);
       int hour = parseIntOrZero(match[4]);
       int minute = parseIntOrZero(match[5]);
       int second = parseIntOrZero(match[6]);
       bool addOneMillisecond = false;
       int millisecond = (parseDoubleOrZero(match[7]) * 1000).round().toInt();
       if (millisecond == 1000) {
         addOneMillisecond = true;
         millisecond = 999;
       }
       // TODO(floitsch): we should not need to test against the empty string.
       bool isUtc = (match[8] !== null) && (match[8] != "");
-      int millisecondsSinceEpoch = Primitives.valueFromDecomposedDate(
+      int millisecondsSinceEpoch = _brokenDownDateToMillisecondsSinceEpoch(
           years, month, day, hour, minute, second, millisecond, isUtc);
       if (millisecondsSinceEpoch === null) {
         throw new IllegalArgumentException(formattedString);
       }
       if (addOneMillisecond) millisecondsSinceEpoch++;
       return new Date.fromMillisecondsSinceEpoch(millisecondsSinceEpoch, isUtc);
     } else {
       throw new IllegalArgumentException(formattedString);
     }
   }
@@ skipping 70 matching lines @@
     String min = twoDigits(minute);
     String sec = twoDigits(second);
     String ms = threeDigits(millisecond);
     if (isUtc) {
       return "$y-$m-$d $h:$min:$sec.${ms}Z";
     } else {
       return "$y-$m-$d $h:$min:$sec.$ms";
     }
   }
 
-  // Adds the [duration] to this Date instance.
+  /** Returns a new [Date] with the [duration] added to [this]. */
   Date add(Duration duration) {
     int ms = millisecondsSinceEpoch;
     return new Date.fromMillisecondsSinceEpoch(
         ms + duration.inMilliseconds, isUtc);
   }
 
-  // Subtracts the [duration] from this Date instance.
+  /** Returns a new [Date] with the [duration] subtracted from [this]. */
   Date subtract(Duration duration) {
     int ms = millisecondsSinceEpoch;
     return new Date.fromMillisecondsSinceEpoch(
         ms - duration.inMilliseconds, isUtc);
   }
 
-  // Returns a [Duration] with the difference of [this] and [other].
+  /** Returns a [Duration] with the difference of [this] and [other]. */
   Duration difference(Date other) {
     int ms = millisecondsSinceEpoch;
     int otherMs = other.millisecondsSinceEpoch;
     return new Duration(milliseconds: ms - otherMs);
   }
 
   external DateImplementation(int year,
                               [int month,
                                int day,
                                int hour,
                                int minute,
                                int second,
                                int millisecond,
                                bool isUtc]);
   external DateImplementation.now();
+  external static int _brokenDownDateToMillisecondsSinceEpoch(
+      int years, int month, int day, int hour, int minute, int second,
+      int millisecond, bool isUtc);
   external String get timeZoneName();
   external Duration get timeZoneOffset();
   external int get year();
   external int get month();
   external int get day();
   external int get hour();
   external int get minute();
   external int get second();
   external int get millisecond();
   external int get weekday();
 }