X-Git-Url: https://git.saurik.com/apple/javascriptcore.git/blobdiff_plain/9dae56ea45a0f5f8136a5c93d6f3a7f99399ca73..ed1e77d3adeb83d26fd1dfb16dd84cabdcefd250:/runtime/DateConstructor.cpp diff --git a/runtime/DateConstructor.cpp b/runtime/DateConstructor.cpp index 92ab897..d6329fd 100644 --- a/runtime/DateConstructor.cpp +++ b/runtime/DateConstructor.cpp @@ -1,6 +1,6 @@ /* * Copyright (C) 1999-2000 Harri Porten (porten@kde.org) - * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved. + * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2011 Apple Inc. All rights reserved. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -22,17 +22,24 @@ #include "config.h" #include "DateConstructor.h" +#include "DateConversion.h" #include "DateInstance.h" -#include "DateMath.h" #include "DatePrototype.h" +#include "JSDateMath.h" +#include "JSFunction.h" #include "JSGlobalObject.h" #include "JSString.h" #include "ObjectPrototype.h" -#include "PrototypeFunction.h" +#include "JSCInlines.h" #include #include #include +#if ENABLE(WEB_REPLAY) +#include "InputCursor.h" +#include "JSReplayInputs.h" +#endif + #if HAVE(SYS_TIME_H) #include #endif @@ -41,135 +48,199 @@ #include #endif +using namespace WTF; + namespace JSC { -// TODO: MakeTime (15.9.11.1) etc. ? +EncodedJSValue JSC_HOST_CALL dateParse(ExecState*); +EncodedJSValue JSC_HOST_CALL dateNow(ExecState*); +EncodedJSValue JSC_HOST_CALL dateUTC(ExecState*); + +} + +#include "DateConstructor.lut.h" + +namespace JSC { + +const ClassInfo DateConstructor::s_info = { "Function", &InternalFunction::s_info, &dateConstructorTable, CREATE_METHOD_TABLE(DateConstructor) }; + +/* Source for DateConstructor.lut.h +@begin dateConstructorTable + parse dateParse DontEnum|Function 1 + UTC dateUTC DontEnum|Function 7 + now dateNow DontEnum|Function 0 +@end +*/ + +#if ENABLE(WEB_REPLAY) +static double deterministicCurrentTime(JSGlobalObject* globalObject) +{ + double currentTime = jsCurrentTime(); + InputCursor& cursor = globalObject->inputCursor(); + if (cursor.isCapturing()) + cursor.appendInput(currentTime); + + if (cursor.isReplaying()) { + if (GetCurrentTime* input = cursor.fetchInput()) + currentTime = input->currentTime(); + } + return currentTime; +} +#endif -ASSERT_CLASS_FITS_IN_CELL(DateConstructor); +#if ENABLE(WEB_REPLAY) +#define NORMAL_OR_DETERMINISTIC_FUNCTION(a, b) (b) +#else +#define NORMAL_OR_DETERMINISTIC_FUNCTION(a, b) (a) +#endif -static JSValuePtr dateParse(ExecState*, JSObject*, JSValuePtr, const ArgList&); -static JSValuePtr dateNow(ExecState*, JSObject*, JSValuePtr, const ArgList&); -static JSValuePtr dateUTC(ExecState*, JSObject*, JSValuePtr, const ArgList&); +STATIC_ASSERT_IS_TRIVIALLY_DESTRUCTIBLE(DateConstructor); -DateConstructor::DateConstructor(ExecState* exec, PassRefPtr structure, Structure* prototypeFunctionStructure, DatePrototype* datePrototype) - : InternalFunction(&exec->globalData(), structure, Identifier(exec, datePrototype->classInfo()->className)) +DateConstructor::DateConstructor(VM& vm, Structure* structure) + : InternalFunction(vm, structure) { - putDirectWithoutTransition(exec->propertyNames().prototype, datePrototype, DontEnum|DontDelete|ReadOnly); +} - putDirectFunctionWithoutTransition(exec, new (exec) PrototypeFunction(exec, prototypeFunctionStructure, 1, exec->propertyNames().parse, dateParse), DontEnum); - putDirectFunctionWithoutTransition(exec, new (exec) PrototypeFunction(exec, prototypeFunctionStructure, 7, exec->propertyNames().UTC, dateUTC), DontEnum); - putDirectFunctionWithoutTransition(exec, new (exec) PrototypeFunction(exec, prototypeFunctionStructure, 0, exec->propertyNames().now, dateNow), DontEnum); +void DateConstructor::finishCreation(VM& vm, DatePrototype* datePrototype) +{ + 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); +} - putDirectWithoutTransition(exec->propertyNames().length, jsNumber(exec, 7), ReadOnly | DontEnum | DontDelete); +bool DateConstructor::getOwnPropertySlot(JSObject* object, ExecState* exec, PropertyName propertyName, PropertySlot &slot) +{ + return getStaticFunctionSlot(exec, dateConstructorTable, jsCast(object), propertyName, slot); } // ECMA 15.9.3 -JSObject* constructDate(ExecState* exec, const ArgList& args) +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 - value = getCurrentUTCTime(); + value = NORMAL_OR_DETERMINISTIC_FUNCTION(jsCurrentTime(), deterministicCurrentTime(globalObject)); else if (numArgs == 1) { - if (args.at(exec, 0).isObject(&DateInstance::info)) - value = asDateInstance(args.at(exec, 0))->internalNumber(); + if (args.at(0).inherits(DateInstance::info())) + value = asDateInstance(args.at(0))->internalNumber(); else { - JSValuePtr primitive = args.at(exec, 0).toPrimitive(exec); + JSValue primitive = args.at(0).toPrimitive(exec); if (primitive.isString()) - value = parseDate(primitive.getString()); + value = parseDate(vm, primitive.getString(exec)); else value = primitive.toNumber(exec); } } else { - if (isnan(args.at(exec, 0).toNumber(exec)) - || isnan(args.at(exec, 1).toNumber(exec)) - || (numArgs >= 3 && isnan(args.at(exec, 2).toNumber(exec))) - || (numArgs >= 4 && isnan(args.at(exec, 3).toNumber(exec))) - || (numArgs >= 5 && isnan(args.at(exec, 4).toNumber(exec))) - || (numArgs >= 6 && isnan(args.at(exec, 5).toNumber(exec))) - || (numArgs >= 7 && isnan(args.at(exec, 6).toNumber(exec)))) - value = NaN; + double doubleArguments[7] = { + args.at(0).toNumber(exec), + args.at(1).toNumber(exec), + args.at(2).toNumber(exec), + args.at(3).toNumber(exec), + args.at(4).toNumber(exec), + args.at(5).toNumber(exec), + args.at(6).toNumber(exec) + }; + 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 = args.at(exec, 0).toInt32(exec); - t.year = (year >= 0 && year <= 99) ? year : year - 1900; - t.month = args.at(exec, 1).toInt32(exec); - t.monthDay = (numArgs >= 3) ? args.at(exec, 2).toInt32(exec) : 1; - t.hour = args.at(exec, 3).toInt32(exec); - t.minute = args.at(exec, 4).toInt32(exec); - t.second = args.at(exec, 5).toInt32(exec); - t.isDST = -1; - double ms = (numArgs >= 7) ? args.at(exec, 6).toNumber(exec) : 0; - value = gregorianDateTimeToMS(t, ms, false); + GregorianDateTime t; + int year = JSC::toInt32(doubleArguments[0]); + 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; + value = gregorianDateTimeToMS(vm, t, ms, WTF::LocalTime); } } - DateInstance* result = new (exec) DateInstance(exec->lexicalGlobalObject()->dateStructure()); - result->setInternalValue(jsNumber(exec, timeClip(value))); - return result; + return DateInstance::create(vm, globalObject->dateStructure(), value); } -static JSObject* constructWithDateConstructor(ExecState* exec, JSObject*, const ArgList& args) +static EncodedJSValue JSC_HOST_CALL constructWithDateConstructor(ExecState* exec) { - return constructDate(exec, args); + ArgList args(exec); + 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; } // ECMA 15.9.2 -static JSValuePtr callDate(ExecState* exec, JSObject*, JSValuePtr, const ArgList&) +static EncodedJSValue JSC_HOST_CALL callDate(ExecState* exec) { - time_t localTime = time(0); - tm localTM; - getLocalTime(&localTime, &localTM); - GregorianDateTime ts(localTM); - return jsNontrivialString(exec, formatDate(ts) + " " + formatTime(ts, false)); + 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; } -static JSValuePtr dateParse(ExecState* exec, JSObject*, JSValuePtr, const ArgList& args) +EncodedJSValue JSC_HOST_CALL dateParse(ExecState* exec) { - return jsNumber(exec, parseDate(args.at(exec, 0).toString(exec))); + return JSValue::encode(jsNumber(parseDate(exec->vm(), exec->argument(0).toString(exec)->value(exec)))); } -static JSValuePtr dateNow(ExecState* exec, JSObject*, JSValuePtr, const ArgList&) +EncodedJSValue JSC_HOST_CALL dateNow(ExecState* exec) { - return jsNumber(exec, getCurrentUTCTime()); +#if !ENABLE(WEB_REPLAY) + UNUSED_PARAM(exec); +#endif + + return JSValue::encode(jsNumber(NORMAL_OR_DETERMINISTIC_FUNCTION(jsCurrentTime(), deterministicCurrentTime(exec->lexicalGlobalObject())))); } -static JSValuePtr dateUTC(ExecState* exec, JSObject*, JSValuePtr, const ArgList& args) +EncodedJSValue JSC_HOST_CALL dateUTC(ExecState* exec) { - int n = args.size(); - if (isnan(args.at(exec, 0).toNumber(exec)) - || isnan(args.at(exec, 1).toNumber(exec)) - || (n >= 3 && isnan(args.at(exec, 2).toNumber(exec))) - || (n >= 4 && isnan(args.at(exec, 3).toNumber(exec))) - || (n >= 5 && isnan(args.at(exec, 4).toNumber(exec))) - || (n >= 6 && isnan(args.at(exec, 5).toNumber(exec))) - || (n >= 7 && isnan(args.at(exec, 6).toNumber(exec)))) - return jsNaN(exec); + double doubleArguments[7] = { + exec->argument(0).toNumber(exec), + exec->argument(1).toNumber(exec), + exec->argument(2).toNumber(exec), + exec->argument(3).toNumber(exec), + exec->argument(4).toNumber(exec), + exec->argument(5).toNumber(exec), + exec->argument(6).toNumber(exec) + }; + int n = exec->argumentCount(); + 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 = args.at(exec, 0).toInt32(exec); - t.year = (year >= 0 && year <= 99) ? year : year - 1900; - t.month = args.at(exec, 1).toInt32(exec); - t.monthDay = (n >= 3) ? args.at(exec, 2).toInt32(exec) : 1; - t.hour = args.at(exec, 3).toInt32(exec); - t.minute = args.at(exec, 4).toInt32(exec); - t.second = args.at(exec, 5).toInt32(exec); - double ms = (n >= 7) ? args.at(exec, 6).toNumber(exec) : 0; - return jsNumber(exec, gregorianDateTimeToMS(t, ms, true)); + int year = JSC::toInt32(doubleArguments[0]); + 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; + return JSValue::encode(jsNumber(timeClip(gregorianDateTimeToMS(exec->vm(), t, ms, WTF::UTCTime)))); } } // namespace JSC