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

Timestamp:

May 12, 2008, 12:12:31 AM (17 years ago)

Author:

[email protected]

Message:

Roll out recent threading changes (r32807, r32810, r32819, r32822) to simplify
SquirrelFish merging.

File:

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

trunk/JavaScriptCore/kjs/date_object.cpp

@@ -171 +171 @@
 enum LocaleDateTimeFormat { LocaleDateAndTime, LocaleDate, LocaleTime };
  
-static JSCell* formatLocaleDate(ExecState* exec, const GregorianDateTime& gdt, const LocaleDateTimeFormat format)
+static JSCell* formatLocaleDate(const GregorianDateTime& gdt, const LocaleDateTimeFormat format)
 {
     static const char* formatStrings[] = {"%#c", "%#x", "%X"};
@@ -189 +189 @@
  
     if ( ret == 0 )
-        return jsString(exec, "");
+        return jsString("");
  
     // Copy original into the buffer
@@ -203 +203 @@
     }
  
-    return jsString(exec, timebuffer);
+    return jsString(timebuffer);
 }
 
@@ -470 +470 @@
 // ECMA 15.9.4
 
-DatePrototype::DatePrototype(ExecState* exec, ObjectPrototype *objectProto)
+DatePrototype::DatePrototype(ExecState *, ObjectPrototype *objectProto)
   : DateInstance(objectProto)
 {
-    setInternalValue(jsNaN(exec));
+    setInternalValue(jsNaN());
     // The constructor will be added later, after DateObjectImp has been built.
 }
@@ -490 +490 @@
 {
   putDirect(exec->propertyNames().prototype, dateProto, DontEnum|DontDelete|ReadOnly);
-  putDirectFunction(new (exec) DateObjectFuncImp(exec, funcProto, DateObjectFuncImp::Parse, 1, exec->propertyNames().parse), DontEnum);
-  putDirectFunction(new (exec) DateObjectFuncImp(exec, funcProto, DateObjectFuncImp::UTC, 7, exec->propertyNames().UTC), DontEnum);
-  putDirect(exec, exec->propertyNames().length, 7, ReadOnly|DontDelete|DontEnum);
+  putDirectFunction(new DateObjectFuncImp(exec, funcProto, DateObjectFuncImp::Parse, 1, exec->propertyNames().parse), DontEnum);
+  putDirectFunction(new DateObjectFuncImp(exec, funcProto, DateObjectFuncImp::UTC, 7, exec->propertyNames().UTC), DontEnum);
+  putDirect(exec->propertyNames().length, 7, ReadOnly|DontDelete|DontEnum);
 }
 
@@ -543 +543 @@
   }
   
-  DateInstance* ret = new (exec) DateInstance(exec->lexicalGlobalObject()->datePrototype());
-  ret->setInternalValue(jsNumber(exec, timeClip(value)));
+  DateInstance *ret = new DateInstance(exec->lexicalGlobalObject()->datePrototype());
+  ret->setInternalValue(jsNumber(timeClip(value)));
   return ret;
 }
 
 // ECMA 15.9.2
-JSValue* DateObjectImp::callAsFunction(ExecState* exec, JSObject* /*thisObj*/, const List& /*args*/)
+JSValue *DateObjectImp::callAsFunction(ExecState * /*exec*/, JSObject * /*thisObj*/, const List &/*args*/)
 {
     time_t localTime = time(0);
@@ -555 +555 @@
     getLocalTime(&localTime, &localTM);
     GregorianDateTime ts(localTM);
-    return jsString(exec, formatDate(ts) + " " + formatTime(ts, false));
+    return jsString(formatDate(ts) + " " + formatTime(ts, false));
 }
 
@@ -563 +563 @@
     : InternalFunctionImp(funcProto, name), id(i)
 {
-    putDirect(exec, exec->propertyNames().length, len, DontDelete|ReadOnly|DontEnum);
+    putDirect(exec->propertyNames().length, len, DontDelete|ReadOnly|DontEnum);
 }
 
@@ -570 +570 @@
 {
   if (id == Parse) {
-    return jsNumber(exec, parseDate(args[0]->toString(exec)));
+    return jsNumber(parseDate(args[0]->toString(exec)));
   }
   else { // UTC
@@ -581 +581 @@
         || (n >= 6 && isnan(args[5]->toNumber(exec)))
         || (n >= 7 && isnan(args[6]->toNumber(exec)))) {
-      return jsNaN(exec);
+      return jsNaN();
     }
 
@@ -593 +593 @@
     t.second = args[5]->toInt32(exec);
     double ms = (n >= 7) ? args[6]->toNumber(exec) : 0;
-    return jsNumber(exec, gregorianDateTimeToMS(t, ms, true));
+    return jsNumber(gregorianDateTimeToMS(t, ms, true));
   }
 }
@@ -988 +988 @@
     double milli = v->toNumber(exec);
     if (isnan(milli))
-        return jsString(exec, "Invalid Date");
-
-    GregorianDateTime t;
-    thisDateObj->msToGregorianDateTime(milli, utc, t);
-    return jsString(exec, formatDate(t) + " " + formatTime(t, utc));
+        return jsString("Invalid Date");
+
+    GregorianDateTime t;
+    thisDateObj->msToGregorianDateTime(milli, utc, t);
+    return jsString(formatDate(t) + " " + formatTime(t, utc));
 }
 
@@ -1006 +1006 @@
     double milli = v->toNumber(exec);
     if (isnan(milli))
-        return jsString(exec, "Invalid Date");
-
-    GregorianDateTime t;
-    thisDateObj->msToGregorianDateTime(milli, utc, t);
-    return jsString(exec, formatDateUTCVariant(t) + " " + formatTime(t, utc));
+        return jsString("Invalid Date");
+
+    GregorianDateTime t;
+    thisDateObj->msToGregorianDateTime(milli, utc, t);
+    return jsString(formatDateUTCVariant(t) + " " + formatTime(t, utc));
 }
 
@@ -1024 +1024 @@
     double milli = v->toNumber(exec);
     if (isnan(milli))
-        return jsString(exec, "Invalid Date");
-
-    GregorianDateTime t;
-    thisDateObj->msToGregorianDateTime(milli, utc, t);
-    return jsString(exec, formatDate(t));
+        return jsString("Invalid Date");
+
+    GregorianDateTime t;
+    thisDateObj->msToGregorianDateTime(milli, utc, t);
+    return jsString(formatDate(t));
 }
 
@@ -1042 +1042 @@
     double milli = v->toNumber(exec);
     if (isnan(milli))
-        return jsString(exec, "Invalid Date");
-
-    GregorianDateTime t;
-    thisDateObj->msToGregorianDateTime(milli, utc, t);
-    return jsString(exec, formatTime(t, utc));
+        return jsString("Invalid Date");
+
+    GregorianDateTime t;
+    thisDateObj->msToGregorianDateTime(milli, utc, t);
+    return jsString(formatTime(t, utc));
 }
 
@@ -1058 +1058 @@
     double milli = v->toNumber(exec);
     if (isnan(milli))
-        return jsString(exec, "Invalid Date");
+        return jsString("Invalid Date");
 
 #if PLATFORM(MAC)
     double secs = floor(milli / msPerSecond);
-    return jsString(exec, formatLocaleDate(exec, secs, true, true, args));
+    return jsString(formatLocaleDate(exec, secs, true, true, args));
 #else
     UNUSED_PARAM(args);
@@ -1070 +1070 @@
     GregorianDateTime t;
     thisDateObj->msToGregorianDateTime(milli, utc, t);
-    return formatLocaleDate(exec, t, LocaleDateAndTime);
+    return formatLocaleDate(t, LocaleDateAndTime);
 #endif
 }
@@ -1083 +1083 @@
     double milli = v->toNumber(exec);
     if (isnan(milli))
-        return jsString(exec, "Invalid Date");
+        return jsString("Invalid Date");
 
 #if PLATFORM(MAC)
     double secs = floor(milli / msPerSecond);
-    return jsString(exec, formatLocaleDate(exec, secs, true, false, args));
+    return jsString(formatLocaleDate(exec, secs, true, false, args));
 #else
     UNUSED_PARAM(args);
@@ -1095 +1095 @@
     GregorianDateTime t;
     thisDateObj->msToGregorianDateTime(milli, utc, t);
-    return formatLocaleDate(exec, t, LocaleDate);
+    return formatLocaleDate(t, LocaleDate);
 #endif
 }
@@ -1108 +1108 @@
     double milli = v->toNumber(exec);
     if (isnan(milli))
-        return jsString(exec, "Invalid Date");
+        return jsString("Invalid Date");
 
 #if PLATFORM(MAC)
     double secs = floor(milli / msPerSecond);
-    return jsString(exec, formatLocaleDate(exec, secs, false, true, args));
+    return jsString(formatLocaleDate(exec, secs, false, true, args));
 #else
     UNUSED_PARAM(args);
@@ -1120 +1120 @@
     GregorianDateTime t;
     thisDateObj->msToGregorianDateTime(milli, utc, t);
-    return formatLocaleDate(exec, t, LocaleTime);
+    return formatLocaleDate(t, LocaleTime);
 #endif
 }
@@ -1133 +1133 @@
     double milli = v->toNumber(exec);
     if (isnan(milli))
-        return jsNaN(exec);
-
-    return jsNumber(exec, milli);
+        return jsNaN();
+
+    return jsNumber(milli);
 }
 
@@ -1147 +1147 @@
     double milli = v->toNumber(exec);
     if (isnan(milli))
-        return jsNaN(exec);
-
-    return jsNumber(exec, milli);
+        return jsNaN();
+
+    return jsNumber(milli);
 }
 
@@ -1163 +1163 @@
     double milli = v->toNumber(exec);
     if (isnan(milli))
-        return jsNaN(exec);
-
-    GregorianDateTime t;
-    thisDateObj->msToGregorianDateTime(milli, utc, t);
-    return jsNumber(exec, 1900 + t.year);
+        return jsNaN();
+
+    GregorianDateTime t;
+    thisDateObj->msToGregorianDateTime(milli, utc, t);
+    return jsNumber(1900 + t.year);
 }
 
@@ -1181 +1181 @@
     double milli = v->toNumber(exec);
     if (isnan(milli))
-        return jsNaN(exec);
-
-    GregorianDateTime t;
-    thisDateObj->msToGregorianDateTime(milli, utc, t);
-    return jsNumber(exec, 1900 + t.year);
+        return jsNaN();
+
+    GregorianDateTime t;
+    thisDateObj->msToGregorianDateTime(milli, utc, t);
+    return jsNumber(1900 + t.year);
 }
 
@@ -1199 +1199 @@
     double milli = v->toNumber(exec);
     if (isnan(milli))
-        return jsString(exec, "Invalid Date");
-
-    GregorianDateTime t;
-    thisDateObj->msToGregorianDateTime(milli, utc, t);
-    return jsString(exec, formatDateUTCVariant(t) + " " + formatTime(t, utc));
+        return jsString("Invalid Date");
+
+    GregorianDateTime t;
+    thisDateObj->msToGregorianDateTime(milli, utc, t);
+    return jsString(formatDateUTCVariant(t) + " " + formatTime(t, utc));
 }
 
@@ -1217 +1217 @@
     double milli = v->toNumber(exec);
     if (isnan(milli))
-        return jsNaN(exec);
-
-    GregorianDateTime t;
-    thisDateObj->msToGregorianDateTime(milli, utc, t);
-    return jsNumber(exec, t.month);
+        return jsNaN();
+
+    GregorianDateTime t;
+    thisDateObj->msToGregorianDateTime(milli, utc, t);
+    return jsNumber(t.month);
 }
 
@@ -1235 +1235 @@
     double milli = v->toNumber(exec);
     if (isnan(milli))
-        return jsNaN(exec);
-
-    GregorianDateTime t;
-    thisDateObj->msToGregorianDateTime(milli, utc, t);
-    return jsNumber(exec, t.month);
+        return jsNaN();
+
+    GregorianDateTime t;
+    thisDateObj->msToGregorianDateTime(milli, utc, t);
+    return jsNumber(t.month);
 }
 
@@ -1253 +1253 @@
     double milli = v->toNumber(exec);
     if (isnan(milli))
-        return jsNaN(exec);
-
-    GregorianDateTime t;
-    thisDateObj->msToGregorianDateTime(milli, utc, t);
-    return jsNumber(exec, t.monthDay);
+        return jsNaN();
+
+    GregorianDateTime t;
+    thisDateObj->msToGregorianDateTime(milli, utc, t);
+    return jsNumber(t.monthDay);
 }
 
@@ -1271 +1271 @@
     double milli = v->toNumber(exec);
     if (isnan(milli))
-        return jsNaN(exec);
-
-    GregorianDateTime t;
-    thisDateObj->msToGregorianDateTime(milli, utc, t);
-    return jsNumber(exec, t.monthDay);
+        return jsNaN();
+
+    GregorianDateTime t;
+    thisDateObj->msToGregorianDateTime(milli, utc, t);
+    return jsNumber(t.monthDay);
 }
 
@@ -1289 +1289 @@
     double milli = v->toNumber(exec);
     if (isnan(milli))
-        return jsNaN(exec);
-
-    GregorianDateTime t;
-    thisDateObj->msToGregorianDateTime(milli, utc, t);
-    return jsNumber(exec, t.weekDay);
+        return jsNaN();
+
+    GregorianDateTime t;
+    thisDateObj->msToGregorianDateTime(milli, utc, t);
+    return jsNumber(t.weekDay);
 }
 
@@ -1307 +1307 @@
     double milli = v->toNumber(exec);
     if (isnan(milli))
-        return jsNaN(exec);
-
-    GregorianDateTime t;
-    thisDateObj->msToGregorianDateTime(milli, utc, t);
-    return jsNumber(exec, t.weekDay);
+        return jsNaN();
+
+    GregorianDateTime t;
+    thisDateObj->msToGregorianDateTime(milli, utc, t);
+    return jsNumber(t.weekDay);
 }
 
@@ -1325 +1325 @@
     double milli = v->toNumber(exec);
     if (isnan(milli))
-        return jsNaN(exec);
-
-    GregorianDateTime t;
-    thisDateObj->msToGregorianDateTime(milli, utc, t);
-    return jsNumber(exec, t.hour);
+        return jsNaN();
+
+    GregorianDateTime t;
+    thisDateObj->msToGregorianDateTime(milli, utc, t);
+    return jsNumber(t.hour);
 }
 
@@ -1343 +1343 @@
     double milli = v->toNumber(exec);
     if (isnan(milli))
-        return jsNaN(exec);
-
-    GregorianDateTime t;
-    thisDateObj->msToGregorianDateTime(milli, utc, t);
-    return jsNumber(exec, t.hour);
+        return jsNaN();
+
+    GregorianDateTime t;
+    thisDateObj->msToGregorianDateTime(milli, utc, t);
+    return jsNumber(t.hour);
 }
 
@@ -1361 +1361 @@
     double milli = v->toNumber(exec);
     if (isnan(milli))
-        return jsNaN(exec);
-
-    GregorianDateTime t;
-    thisDateObj->msToGregorianDateTime(milli, utc, t);
-    return jsNumber(exec, t.minute);
+        return jsNaN();
+
+    GregorianDateTime t;
+    thisDateObj->msToGregorianDateTime(milli, utc, t);
+    return jsNumber(t.minute);
 }
 
@@ -1379 +1379 @@
     double milli = v->toNumber(exec);
     if (isnan(milli))
-        return jsNaN(exec);
-
-    GregorianDateTime t;
-    thisDateObj->msToGregorianDateTime(milli, utc, t);
-    return jsNumber(exec, t.minute);
+        return jsNaN();
+
+    GregorianDateTime t;
+    thisDateObj->msToGregorianDateTime(milli, utc, t);
+    return jsNumber(t.minute);
 }
 
@@ -1397 +1397 @@
     double milli = v->toNumber(exec);
     if (isnan(milli))
-        return jsNaN(exec);
-
-    GregorianDateTime t;
-    thisDateObj->msToGregorianDateTime(milli, utc, t);
-    return jsNumber(exec, t.second);
+        return jsNaN();
+
+    GregorianDateTime t;
+    thisDateObj->msToGregorianDateTime(milli, utc, t);
+    return jsNumber(t.second);
 }
 
@@ -1415 +1415 @@
     double milli = v->toNumber(exec);
     if (isnan(milli))
-        return jsNaN(exec);
-
-    GregorianDateTime t;
-    thisDateObj->msToGregorianDateTime(milli, utc, t);
-    return jsNumber(exec, t.second);
+        return jsNaN();
+
+    GregorianDateTime t;
+    thisDateObj->msToGregorianDateTime(milli, utc, t);
+    return jsNumber(t.second);
 }
 
@@ -1431 +1431 @@
     double milli = v->toNumber(exec);
     if (isnan(milli))
-        return jsNaN(exec);
+        return jsNaN();
 
     double secs = floor(milli / msPerSecond);
     double ms = milli - secs * msPerSecond;
-    return jsNumber(exec, ms);
+    return jsNumber(ms);
 }
 
@@ -1447 +1447 @@
     double milli = v->toNumber(exec);
     if (isnan(milli))
-        return jsNaN(exec);
+        return jsNaN();
 
     double secs = floor(milli / msPerSecond);
     double ms = milli - secs * msPerSecond;
-    return jsNumber(exec, ms);
+    return jsNumber(ms);
 }
 
@@ -1465 +1465 @@
     double milli = v->toNumber(exec);
     if (isnan(milli))
-        return jsNaN(exec);
-
-    GregorianDateTime t;
-    thisDateObj->msToGregorianDateTime(milli, utc, t);
-    return jsNumber(exec, -gmtoffset(t) / minutesPerHour);
+        return jsNaN();
+
+    GregorianDateTime t;
+    thisDateObj->msToGregorianDateTime(milli, utc, t);
+    return jsNumber(-gmtoffset(t) / minutesPerHour);
 }
 
@@ -1480 +1480 @@
 
     double milli = timeClip(args[0]->toNumber(exec));
-    JSValue* result = jsNumber(exec, milli);
+    JSValue* result = jsNumber(milli);
     thisDateObj->setInternalValue(result);
     return result;
@@ -1495 +1495 @@
     
     if (args.isEmpty() || isnan(milli)) {
-        JSValue* result = jsNaN(exec);
+        JSValue* result = jsNaN();
         thisDateObj->setInternalValue(result);
         return result;
@@ -1507 +1507 @@
 
     if (!fillStructuresUsingTimeArgs(exec, args, numArgsToUse, &ms, &t)) {
-        JSValue* result = jsNaN(exec);
+        JSValue* result = jsNaN();
         thisDateObj->setInternalValue(result);
         return result;
     } 
     
-    JSValue* result = jsNumber(exec, gregorianDateTimeToMS(t, ms, inputIsUTC));
+    JSValue* result = jsNumber(gregorianDateTimeToMS(t, ms, inputIsUTC));
     thisDateObj->setInternalValue(result);
     return result;
@@ -1524 +1524 @@
     DateInstance* thisDateObj = static_cast<DateInstance*>(thisObj);
     if (args.isEmpty()) {
-        JSValue* result = jsNaN(exec);
+        JSValue* result = jsNaN();
         thisDateObj->setInternalValue(result);
         return result;
@@ -1545 +1545 @@
     
     if (!fillStructuresUsingDateArgs(exec, args, numArgsToUse, &ms, &t)) {
-        JSValue* result = jsNaN(exec);
+        JSValue* result = jsNaN();
         thisDateObj->setInternalValue(result);
         return result;
     } 
            
-    JSValue* result = jsNumber(exec, gregorianDateTimeToMS(t, ms, inputIsUTC));
+    JSValue* result = jsNumber(gregorianDateTimeToMS(t, ms, inputIsUTC));
     thisDateObj->setInternalValue(result);
     return result;
@@ -1648 +1648 @@
     DateInstance* thisDateObj = static_cast<DateInstance*>(thisObj);     
     if (args.isEmpty()) { 
-        JSValue* result = jsNaN(exec);
+        JSValue* result = jsNaN();
         thisDateObj->setInternalValue(result);
         return result;
@@ -1671 +1671 @@
     int32_t year = args[0]->toInt32(exec, ok);
     if (!ok) {
-        JSValue* result = jsNaN(exec);
+        JSValue* result = jsNaN();
         thisDateObj->setInternalValue(result);
         return result;
@@ -1677 +1677 @@
             
     t.year = (year > 99 || year < 0) ? year - 1900 : year;
-    JSValue* result = jsNumber(exec, gregorianDateTimeToMS(t, ms, utc));
+    JSValue* result = jsNumber(gregorianDateTimeToMS(t, ms, utc));
     thisDateObj->setInternalValue(result);
     return result;
@@ -1693 +1693 @@
     double milli = v->toNumber(exec);
     if (isnan(milli))
-        return jsNaN(exec);
+        return jsNaN();
 
     GregorianDateTime t;
@@ -1699 +1699 @@
 
     // NOTE: IE returns the full year even in getYear.
-    return jsNumber(exec, t.year);
+    return jsNumber(t.year);
 }