JavaScriptCore-7601.1.46.3.tar.gz

[apple/javascriptcore.git] / runtime / DateConstructor.cpp

diff --git a/runtime/DateConstructor.cpp b/runtime/DateConstructor.cpp
index 8fb5aef44abc83d1c021c760a854dfb3e1b57bc6..d6329fdf1b0250d7824c8c8bd70dd6870472b4fc 100644 (file)
--- a/runtime/DateConstructor.cpp
+++ b/runtime/DateConstructor.cpp
@@ -25,18 +25,19 @@
 #include "DateConversion.h"
 #include "DateInstance.h"
 #include "DatePrototype.h"
 #include "DateConversion.h"
 #include "DateInstance.h"
 #include "DatePrototype.h"

+#include "JSDateMath.h"

 #include "JSFunction.h"
 #include "JSGlobalObject.h"
 #include "JSString.h"
 #include "JSFunction.h"
 #include "JSGlobalObject.h"
 #include "JSString.h"

-#include "JSStringBuilder.h"

 #include "ObjectPrototype.h"
 #include "ObjectPrototype.h"

+#include "JSCInlines.h"

 #include <math.h>
 #include <time.h>
 #include <math.h>
 #include <time.h>

-#include <wtf/DateMath.h>

 #include <wtf/MathExtras.h>
 
 #include <wtf/MathExtras.h>
 

-#if OS(WINCE) && !PLATFORM(QT)
-extern "C" time_t time(time_t* timer); // Provided by libce.
+#if ENABLE(WEB_REPLAY)
+#include "InputCursor.h"
+#include "JSReplayInputs.h"

 #endif
 
 #if HAVE(SYS_TIME_H)
 #endif
 
 #if HAVE(SYS_TIME_H)


@@ -51,9 +52,9 @@ using namespace WTF;
 
 namespace JSC {
 
 
 namespace JSC {
 

-static EncodedJSValue JSC_HOST_CALL dateParse(ExecState*);
-static EncodedJSValue JSC_HOST_CALL dateNow(ExecState*);
-static EncodedJSValue JSC_HOST_CALL dateUTC(ExecState*);
+EncodedJSValue JSC_HOST_CALL dateParse(ExecState*);
+EncodedJSValue JSC_HOST_CALL dateNow(ExecState*);
+EncodedJSValue JSC_HOST_CALL dateUTC(ExecState*);

 
 }
 
 
 }
 


@@ -61,7 +62,7 @@ static EncodedJSValue JSC_HOST_CALL dateUTC(ExecState*);
 
 namespace JSC {
 
 
 namespace JSC {
 

-const ClassInfo DateConstructor::s_info = { "Function", &InternalFunction::s_info, 0, ExecState::dateConstructorTable };
+const ClassInfo DateConstructor::s_info = { "Function", &InternalFunction::s_info, &dateConstructorTable, CREATE_METHOD_TABLE(DateConstructor) };

 
 /* Source for DateConstructor.lut.h
 @begin dateConstructorTable
 
 /* Source for DateConstructor.lut.h
 @begin dateConstructorTable


@@ -71,41 +72,64 @@ const ClassInfo DateConstructor::s_info = { "Function", &InternalFunction::s_inf
 @end
 */
 
 @end
 */
 

-ASSERT_CLASS_FITS_IN_CELL(DateConstructor);
+#if ENABLE(WEB_REPLAY)
+static double deterministicCurrentTime(JSGlobalObject* globalObject)
+{
+    double currentTime = jsCurrentTime();
+    InputCursor& cursor = globalObject->inputCursor();
+    if (cursor.isCapturing())
+        cursor.appendInput<GetCurrentTime>(currentTime);
+
+    if (cursor.isReplaying()) {
+        if (GetCurrentTime* input = cursor.fetchInput<GetCurrentTime>())
+            currentTime = input->currentTime();
+    }
+    return currentTime;
+}
+#endif

 
 

-DateConstructor::DateConstructor(ExecState* exec, JSGlobalObject* globalObject, Structure* structure, DatePrototype* datePrototype)
-    : InternalFunction(&exec->globalData(), globalObject, structure, Identifier(exec, datePrototype->classInfo()->className))
+#if ENABLE(WEB_REPLAY)
+#define NORMAL_OR_DETERMINISTIC_FUNCTION(a, b) (b)
+#else
+#define NORMAL_OR_DETERMINISTIC_FUNCTION(a, b) (a)
+#endif
+
+STATIC_ASSERT_IS_TRIVIALLY_DESTRUCTIBLE(DateConstructor);
+
+DateConstructor::DateConstructor(VM& vm, Structure* structure)
+    : InternalFunction(vm, structure)

 {
 {

-    putDirectWithoutTransition(exec->globalData(), exec->propertyNames().prototype, datePrototype, DontEnum | DontDelete | ReadOnly);
-    putDirectWithoutTransition(exec->globalData(), exec->propertyNames().length, jsNumber(7), ReadOnly | DontEnum | DontDelete);

 }
 
 }
 

-bool DateConstructor::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot &slot)
+void DateConstructor::finishCreation(VM& vm, DatePrototype* datePrototype)

 {
 {

-    return getStaticFunctionSlot<InternalFunction>(exec, ExecState::dateConstructorTable(exec), this, propertyName, slot);
+    Base::finishCreation(vm, datePrototype->classInfo()->className);
+    putDirectWithoutTransition(vm, vm.propertyNames->prototype, datePrototype, DontEnum | DontDelete | ReadOnly);
+    putDirectWithoutTransition(vm, vm.propertyNames->length, jsNumber(7), ReadOnly | DontEnum | DontDelete);

 }
 
 }
 

-bool DateConstructor::getOwnPropertyDescriptor(ExecState* exec, const Identifier& propertyName, PropertyDescriptor& descriptor)
+bool DateConstructor::getOwnPropertySlot(JSObject* object, ExecState* exec, PropertyName propertyName, PropertySlot &slot)

 {
 {

-    return getStaticFunctionDescriptor<InternalFunction>(exec, ExecState::dateConstructorTable(exec), this, propertyName, descriptor);
+    return getStaticFunctionSlot<InternalFunction>(exec, dateConstructorTable, jsCast<DateConstructor*>(object), propertyName, slot);

 }
 
 // ECMA 15.9.3
 JSObject* constructDate(ExecState* exec, JSGlobalObject* globalObject, const ArgList& args)
 {
 }
 
 // ECMA 15.9.3
 JSObject* constructDate(ExecState* exec, JSGlobalObject* globalObject, const ArgList& args)
 {

+    VM& vm = exec->vm();

     int numArgs = args.size();
 
     double value;
 
     if (numArgs == 0) // new Date() ECMA 15.9.3.3
     int numArgs = args.size();
 
     double value;
 
     if (numArgs == 0) // new Date() ECMA 15.9.3.3

-        value = jsCurrentTime();
+        value = NORMAL_OR_DETERMINISTIC_FUNCTION(jsCurrentTime(), deterministicCurrentTime(globalObject));

     else if (numArgs == 1) {
     else if (numArgs == 1) {

-        if (args.at(0).inherits(&DateInstance::s_info))
+        if (args.at(0).inherits(DateInstance::info()))

             value = asDateInstance(args.at(0))->internalNumber();
         else {
             JSValue primitive = args.at(0).toPrimitive(exec);
             if (primitive.isString())
             value = asDateInstance(args.at(0))->internalNumber();
         else {
             JSValue primitive = args.at(0).toPrimitive(exec);
             if (primitive.isString())

-                value = parseDate(exec, primitive.getString(exec));
+                value = parseDate(vm, primitive.getString(exec));

             else
                 value = primitive.toNumber(exec);
         }
             else
                 value = primitive.toNumber(exec);
         }


@@ -119,30 +143,30 @@ JSObject* constructDate(ExecState* exec, JSGlobalObject* globalObject, const Arg
             args.at(5).toNumber(exec), 
             args.at(6).toNumber(exec)
         };
             args.at(5).toNumber(exec), 
             args.at(6).toNumber(exec)
         };

-        if (isnan(doubleArguments[0])
-                || isnan(doubleArguments[1])
-                || (numArgs >= 3 && isnan(doubleArguments[2]))
-                || (numArgs >= 4 && isnan(doubleArguments[3]))
-                || (numArgs >= 5 && isnan(doubleArguments[4]))
-                || (numArgs >= 6 && isnan(doubleArguments[5]))
-                || (numArgs >= 7 && isnan(doubleArguments[6])))
-            value = NaN;
+        if ((!std::isfinite(doubleArguments[0]) || (doubleArguments[0] > INT_MAX) || (doubleArguments[0] < INT_MIN))
+            || (!std::isfinite(doubleArguments[1]) || (doubleArguments[1] > INT_MAX) || (doubleArguments[1] < INT_MIN))
+            || (numArgs >= 3 && (!std::isfinite(doubleArguments[2]) || (doubleArguments[2] > INT_MAX) || (doubleArguments[2] < INT_MIN)))
+            || (numArgs >= 4 && (!std::isfinite(doubleArguments[3]) || (doubleArguments[3] > INT_MAX) || (doubleArguments[3] < INT_MIN)))
+            || (numArgs >= 5 && (!std::isfinite(doubleArguments[4]) || (doubleArguments[4] > INT_MAX) || (doubleArguments[4] < INT_MIN)))
+            || (numArgs >= 6 && (!std::isfinite(doubleArguments[5]) || (doubleArguments[5] > INT_MAX) || (doubleArguments[5] < INT_MIN)))
+            || (numArgs >= 7 && (!std::isfinite(doubleArguments[6]) || (doubleArguments[6] > INT_MAX) || (doubleArguments[6] < INT_MIN))))
+            value = PNaN;

         else {
             GregorianDateTime t;
             int year = JSC::toInt32(doubleArguments[0]);
         else {
             GregorianDateTime t;
             int year = JSC::toInt32(doubleArguments[0]);

-            t.year = (year >= 0 && year <= 99) ? year : year - 1900;
-            t.month = JSC::toInt32(doubleArguments[1]);
-            t.monthDay = (numArgs >= 3) ? JSC::toInt32(doubleArguments[2]) : 1;
-            t.hour = JSC::toInt32(doubleArguments[3]);
-            t.minute = JSC::toInt32(doubleArguments[4]);
-            t.second = JSC::toInt32(doubleArguments[5]);
-            t.isDST = -1;
+            t.setYear((year >= 0 && year <= 99) ? (year + 1900) : year);
+            t.setMonth(JSC::toInt32(doubleArguments[1]));
+            t.setMonthDay((numArgs >= 3) ? JSC::toInt32(doubleArguments[2]) : 1);
+            t.setHour(JSC::toInt32(doubleArguments[3]));
+            t.setMinute(JSC::toInt32(doubleArguments[4]));
+            t.setSecond(JSC::toInt32(doubleArguments[5]));
+            t.setIsDST(-1);

             double ms = (numArgs >= 7) ? doubleArguments[6] : 0;
             double ms = (numArgs >= 7) ? doubleArguments[6] : 0;

-            value = gregorianDateTimeToMS(exec, t, ms, false);
+            value = gregorianDateTimeToMS(vm, t, ms, WTF::LocalTime);

         }
     }
 
         }
     }
 

-    return new (exec) DateInstance(exec, globalObject->dateStructure(), value);
+    return DateInstance::create(vm, globalObject->dateStructure(), value);

 }
     
 static EncodedJSValue JSC_HOST_CALL constructWithDateConstructor(ExecState* exec)
 }
     
 static EncodedJSValue JSC_HOST_CALL constructWithDateConstructor(ExecState* exec)


@@ -151,7 +175,7 @@ static EncodedJSValue JSC_HOST_CALL constructWithDateConstructor(ExecState* exec
     return JSValue::encode(constructDate(exec, asInternalFunction(exec->callee())->globalObject(), args));
 }
 
     return JSValue::encode(constructDate(exec, asInternalFunction(exec->callee())->globalObject(), args));
 }
 

-ConstructType DateConstructor::getConstructData(ConstructData& constructData)
+ConstructType DateConstructor::getConstructData(JSCell*, ConstructData& constructData)

 {
     constructData.native.function = constructWithDateConstructor;
     return ConstructTypeHost;
 {
     constructData.native.function = constructWithDateConstructor;
     return ConstructTypeHost;


@@ -160,34 +184,33 @@ ConstructType DateConstructor::getConstructData(ConstructData& constructData)
 // ECMA 15.9.2
 static EncodedJSValue JSC_HOST_CALL callDate(ExecState* exec)
 {
 // ECMA 15.9.2
 static EncodedJSValue JSC_HOST_CALL callDate(ExecState* exec)
 {

-    time_t localTime = time(0);
-    tm localTM;
-    getLocalTime(&localTime, &localTM);
-    GregorianDateTime ts(exec, localTM);
-    DateConversionBuffer date;
-    DateConversionBuffer time;
-    formatDate(ts, date);
-    formatTime(ts, time);
-    return JSValue::encode(jsMakeNontrivialString(exec, date, " ", time));
+    VM& vm = exec->vm();
+    GregorianDateTime ts;
+    msToGregorianDateTime(vm, currentTimeMS(), WTF::LocalTime, ts);
+    return JSValue::encode(jsNontrivialString(&vm, formatDateTime(ts, DateTimeFormatDateAndTime, false)));

 }
 
 }
 

-CallType DateConstructor::getCallData(CallData& callData)
+CallType DateConstructor::getCallData(JSCell*, CallData& callData)

 {
     callData.native.function = callDate;
     return CallTypeHost;
 }
 
 {
     callData.native.function = callDate;
     return CallTypeHost;
 }
 

-static EncodedJSValue JSC_HOST_CALL dateParse(ExecState* exec)
+EncodedJSValue JSC_HOST_CALL dateParse(ExecState* exec)

 {
 {

-    return JSValue::encode(jsNumber(parseDate(exec, exec->argument(0).toString(exec))));
+    return JSValue::encode(jsNumber(parseDate(exec->vm(), exec->argument(0).toString(exec)->value(exec))));

 }
 
 }
 

-static EncodedJSValue JSC_HOST_CALL dateNow(ExecState*)
+EncodedJSValue JSC_HOST_CALL dateNow(ExecState* exec)

 {
 {

-    return JSValue::encode(jsNumber(jsCurrentTime()));
+#if !ENABLE(WEB_REPLAY)
+    UNUSED_PARAM(exec);
+#endif
+
+    return JSValue::encode(jsNumber(NORMAL_OR_DETERMINISTIC_FUNCTION(jsCurrentTime(), deterministicCurrentTime(exec->lexicalGlobalObject()))));

 }
 
 }
 

-static EncodedJSValue JSC_HOST_CALL dateUTC(ExecState* exec) 
+EncodedJSValue JSC_HOST_CALL dateUTC(ExecState* exec) 

 {
     double doubleArguments[7] = {
         exec->argument(0).toNumber(exec), 
 {
     double doubleArguments[7] = {
         exec->argument(0).toNumber(exec), 


@@ -199,25 +222,25 @@ static EncodedJSValue JSC_HOST_CALL dateUTC(ExecState* exec)
         exec->argument(6).toNumber(exec)
     };
     int n = exec->argumentCount();
         exec->argument(6).toNumber(exec)
     };
     int n = exec->argumentCount();

-    if (isnan(doubleArguments[0])
-            || isnan(doubleArguments[1])
-            || (n >= 3 && isnan(doubleArguments[2]))
-            || (n >= 4 && isnan(doubleArguments[3]))
-            || (n >= 5 && isnan(doubleArguments[4]))
-            || (n >= 6 && isnan(doubleArguments[5]))
-            || (n >= 7 && isnan(doubleArguments[6])))
+    if ((std::isnan(doubleArguments[0]) || (doubleArguments[0] > INT_MAX) || (doubleArguments[0] < INT_MIN))
+        || (std::isnan(doubleArguments[1]) || (doubleArguments[1] > INT_MAX) || (doubleArguments[1] < INT_MIN))
+        || (n >= 3 && (std::isnan(doubleArguments[2]) || (doubleArguments[2] > INT_MAX) || (doubleArguments[2] < INT_MIN)))
+        || (n >= 4 && (std::isnan(doubleArguments[3]) || (doubleArguments[3] > INT_MAX) || (doubleArguments[3] < INT_MIN)))
+        || (n >= 5 && (std::isnan(doubleArguments[4]) || (doubleArguments[4] > INT_MAX) || (doubleArguments[4] < INT_MIN)))
+        || (n >= 6 && (std::isnan(doubleArguments[5]) || (doubleArguments[5] > INT_MAX) || (doubleArguments[5] < INT_MIN)))
+        || (n >= 7 && (std::isnan(doubleArguments[6]) || (doubleArguments[6] > INT_MAX) || (doubleArguments[6] < INT_MIN))))

         return JSValue::encode(jsNaN());
 
     GregorianDateTime t;
     int year = JSC::toInt32(doubleArguments[0]);
         return JSValue::encode(jsNaN());
 
     GregorianDateTime t;
     int year = JSC::toInt32(doubleArguments[0]);

-    t.year = (year >= 0 && year <= 99) ? year : year - 1900;
-    t.month = JSC::toInt32(doubleArguments[1]);
-    t.monthDay = (n >= 3) ? JSC::toInt32(doubleArguments[2]) : 1;
-    t.hour = JSC::toInt32(doubleArguments[3]);
-    t.minute = JSC::toInt32(doubleArguments[4]);
-    t.second = JSC::toInt32(doubleArguments[5]);
+    t.setYear((year >= 0 && year <= 99) ? (year + 1900) : year);
+    t.setMonth(JSC::toInt32(doubleArguments[1]));
+    t.setMonthDay((n >= 3) ? JSC::toInt32(doubleArguments[2]) : 1);
+    t.setHour(JSC::toInt32(doubleArguments[3]));
+    t.setMinute(JSC::toInt32(doubleArguments[4]));
+    t.setSecond(JSC::toInt32(doubleArguments[5]));

     double ms = (n >= 7) ? doubleArguments[6] : 0;
     double ms = (n >= 7) ? doubleArguments[6] : 0;

-    return JSValue::encode(jsNumber(timeClip(gregorianDateTimeToMS(exec, t, ms, true))));
+    return JSValue::encode(jsNumber(timeClip(gregorianDateTimeToMS(exec->vm(), t, ms, WTF::UTCTime))));

 }
 
 } // namespace JSC
 }
 
 } // namespace JSC