Changeset 16783 in webkit for trunk/JavaScriptCore/kjs

Timestamp:

Oct 4, 2006, 1:35:58 PM (19 years ago)

Author:

kmccullo

Message:

Reviewed by Adam.

• wtf/Assertions.cpp: Changed assertion formatting to omit the "======" lines so you can see more assertions in less space. Also improved format of file/line information so it works with more development environments.

File:

• trunk/JavaScriptCore/kjs/DateMath.cpp (modified) (10 diffs)

trunk/JavaScriptCore/kjs/DateMath.cpp

@@ -64 +64 @@
  * each month, where index 0 is January, and day 0 is January 1.
  */
-static double firstDayOfMonth[2][12] = {
-    {0.0, 31.0, 59.0, 90.0, 120.0, 151.0, 181.0, 212.0, 243.0, 273.0, 304.0, 334.0},
-    {0.0, 31.0, 60.0, 91.0, 121.0, 152.0, 182.0, 213.0, 244.0, 274.0, 305.0, 335.0}
+static int firstDayOfMonth[2][12] = {
+    {0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334},
+    {0, 31, 60, 91, 121, 152, 182, 213, 244, 274, 305, 335}
 };
 
@@ -109 +109 @@
 }
 
-static inline int msToDays(double ms)
+static inline double msToDays(double ms)
 {
     return floor(ms / msPerDay);
 }
 
-static inline int msToYear(double ms)
-{
-    int y = floor(ms /(msPerDay*365.2425)) + 1970;
+static inline double msToYear(double ms)
+{
+    double y = floor(ms /(msPerDay*365.2425)) + 1970;
     double t2 = msFrom1970ToYear(y);
 
@@ -144 +144 @@
 }
 
-static inline int dayInYear(double ms, int year)
+static inline double dayInYear(double ms, int year)
 {
     return msToDays(ms) - daysFrom1970ToYear(year);
@@ -266 +266 @@
 }
 
-static inline double monthToDayInYear(int month, bool isLeapYear)
+static inline int monthToDayInYear(int month, bool isLeapYear)
 {
     return firstDayOfMonth[isLeapYear][month];
@@ -276 +276 @@
 }
 
-static double dateToDayInYear(double year, double month, double day)
+static int dateToDayInYear(int year, int month, int day)
 {
     year += floor(month / 12);
@@ -284 +284 @@
         month += 12;
 
-    double yearday = floor(msFrom1970ToYear(year) / msPerDay);
-    double monthday = monthToDayInYear(month, isLeapYear(year));
+    int yearday = static_cast<int>(floor(msFrom1970ToYear(year) / msPerDay));
+    int monthday = monthToDayInYear(month, isLeapYear(year));
 
     return yearday + monthday + day - 1;
@@ -363 +363 @@
     prtm.tm_hour  =  msToHours(offsetTime);
 
-
-    time_t localTime = localTimeSeconds;
+    // FIXME: time_t has a potential problem in 2038
+    time_t localTime = static_cast<time_t>(localTimeSeconds);
 
     struct tm tm;
@@ -390 +390 @@
     if (ms < 0.0 || ms > 2145916800000.0) {
         int year;
-        double day;
+        int day;
 
         year = equivalentYearForDST(msToYear(ms));
@@ -417 +417 @@
 double dateToMseconds(tm* t, double ms, bool inputIsUTC)
 {
-    double day = dateToDayInYear(t->tm_year + 1900, t->tm_mon, t->tm_mday);
+    int day = dateToDayInYear(t->tm_year + 1900, t->tm_mon, t->tm_mday);
     double msec_time = timeToMseconds(t->tm_hour, t->tm_min, t->tm_sec, ms);
     double result = (day * msPerDay) + msec_time;
@@ -446 +446 @@
     #if !PLATFORM(WIN_OS)
     struct tm xtm;
-    time_t seconds = ms/usecPerMsec;
+    // FIXME: time_t has a potential problem in 2038
+    time_t seconds = static_cast<time_t>(ms/usecPerMsec);
     localtime_r(&seconds, &xtm);
     tm.tm_gmtoff = xtm.tm_gmtoff;