Changeset 3177 in webkit for trunk/JavaScriptCore/kjs/date_object.cpp

Timestamp:

Dec 23, 2002, 2:35:52 PM (22 years ago)

Author:

darin

Message:

Reviewed by Don and John.

• fixed 3134449 -- Date.UTC returns NaN (invalid date)

Did more testing of the date functions and made them behave like the other browsers.
There were three problems:

1) We did a validity check that other browsers don't do (hence the NaN).
2) We treated passed-in dates as local time even in Date.UTC (hence a wrong result

once I fixed the NaN).

3) The results of ToUTCString (and ToGMTString) weren't formatted quite the same

as other browsers.

Also found a couple of silly but unrelated coding mistakes.

• kjs/date_object.cpp: (timetUsingCF): Added. Has the guts of mktimeUsingCF, but without the CFGregorianDateIsValid check. Other browsers accept invalid dates. Also takes a time zone parameter. (mktimeUsingCF): Calls timetUsingCF with the current time zone. (timegmUsingCF): Calls timetUsingCF with the UTC time zone. (formatDate): Remove the includeComma flag. (formatDateUTCVariant): Added. For use instead of formatDate with the includeComma flag. Puts the day before the month name. (DateProtoFuncImp::call): Use the new formatDateUTCVariant for ToGMTString and ToUTCString. Without this change the date didn't match other browsers. (DateObjectImp::DateObjectImp): Use UTCPropertyName. Somehow I declared this and didn't use it before. (DateObjectImp::construct): Pass -1 for is_dst literally instead of using invalidDate. Changing this to invalidDate was just a mistake (although no real difference in compiled code since invalidDate is just -1). (DateObjectFuncImp::call): Call timegm for the UTC case instead of mktime.

File:

• trunk/JavaScriptCore/kjs/date_object.cpp (modified) (8 diffs)

trunk/JavaScriptCore/kjs/date_object.cpp

@@ -74 +74 @@
 #define localtime(x) localtimeUsingCF(x)
 #define mktime(x) mktimeUsingCF(x)
+#define timegm(x) timegmUsingCF(x)
 #define time(x) timeUsingCF(x)
 
@@ -123 +124 @@
 }
 
-static time_t mktimeUsingCF(struct tm *tm)
+static time_t timetUsingCF(struct tm *tm, CFTimeZoneRef timeZone)
 {
     CFGregorianDate date;
@@ -135 +136 @@
     // CFGregorianDateGetAbsoluteTime will go nuts if the year is too large,
     // so we pick an arbitrary cutoff.
-    if (!CFGregorianDateIsValid(date, kCFGregorianAllUnits) || date.year > 2500) {
+    if (date.year > 2500) {
         return invalidDate;
     }
 
+    CFAbsoluteTime absoluteTime = CFGregorianDateGetAbsoluteTime(date, timeZone);
+
+    return (time_t)(absoluteTime + kCFAbsoluteTimeIntervalSince1970);
+}
+
+static time_t mktimeUsingCF(struct tm *tm)
+{
     CFTimeZoneRef timeZone = CFTimeZoneCopyDefault();
-    CFAbsoluteTime absoluteTime = CFGregorianDateGetAbsoluteTime(date, timeZone);
+    time_t result = timetUsingCF(tm, timeZone);
     CFRelease(timeZone);
-
-    return (time_t)(absoluteTime + kCFAbsoluteTimeIntervalSince1970);
+    return result;
+}
+
+static time_t timegmUsingCF(struct tm *tm)
+{
+    static CFTimeZoneRef timeZoneUTC = CFTimeZoneCreateWithName(NULL, CFSTR("UTC"), TRUE);
+    return timetUsingCF(tm, timeZoneUTC);
 }
 
@@ -155 +168 @@
 }
 
-static UString formatDate(struct tm &tm, bool includeComma = false)
+static UString formatDate(struct tm &tm)
 {
     char buffer[100];
-    snprintf(buffer, sizeof(buffer), "%s%s %s %02d %04d",
-        weekdayName[(tm.tm_wday + 6) % 7], includeComma ? "," : "",
+    snprintf(buffer, sizeof(buffer), "%s %s %02d %04d",
+        weekdayName[(tm.tm_wday + 6) % 7],
         monthName[tm.tm_mon], tm.tm_mday, tm.tm_year + 1900);
+    return buffer;
+}
+
+static UString formatDateUTCVariant(struct tm &tm)
+{
+    char buffer[100];
+    snprintf(buffer, sizeof(buffer), "%s, %02d %s %04d",
+        weekdayName[(tm.tm_wday + 6) % 7],
+        tm.tm_mday, monthName[tm.tm_mon], tm.tm_year + 1900);
     return buffer;
 }
@@ -377 +399 @@
   case ToGMTString:
   case ToUTCString:
-    result = String(formatDate(*t, true) + " " + formatTime(*t));
+    result = String(formatDateUTCVariant(*t) + " " + formatTime(*t));
     break;
   case ToLocaleString:
@@ -532 +554 @@
   putDirect(parsePropertyName, new DateObjectFuncImp(exec,funcProto,DateObjectFuncImp::Parse, 1), DontEnum);
   static const Identifier UTCPropertyName("UTC");
-  putDirect("UTC",   new DateObjectFuncImp(exec,funcProto,DateObjectFuncImp::UTC,   7),   DontEnum);
+  putDirect(UTCPropertyName,   new DateObjectFuncImp(exec,funcProto,DateObjectFuncImp::UTC,   7),   DontEnum);
 
   // no. of arguments for constructor
@@ -595 +617 @@
       t.tm_min = (numArgs >= 5) ? args[4].toInt32(exec) : 0;
       t.tm_sec = (numArgs >= 6) ? args[5].toInt32(exec) : 0;
-      t.tm_isdst = invalidDate;
+      t.tm_isdst = -1;
       int ms = (numArgs >= 7) ? args[6].toInt32(exec) : 0;
       time_t mktimeResult = mktime(&t);
@@ -679 +701 @@
     t.tm_sec = (n >= 6) ? args[5].toInt32(exec) : 0;
     int ms = (n >= 7) ? args[6].toInt32(exec) : 0;
-    time_t mktimeResult = mktime(&t);
+    time_t mktimeResult = timegm(&t);
     if (mktimeResult == invalidDate)
       return Number(NaN);