/*
* 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
#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 "JSStringBuilder.h"
#include "ObjectPrototype.h"
-#include "PrototypeFunction.h"
#include <math.h>
#include <time.h>
#include <wtf/MathExtras.h>
+#if OS(WINCE) && !PLATFORM(QT)
+extern "C" time_t time(time_t* timer); // Provided by libce.
+#endif
+
#if HAVE(SYS_TIME_H)
#include <sys/time.h>
#endif
#include <sys/timeb.h>
#endif
+using namespace WTF;
+
+namespace JSC {
+
+static EncodedJSValue JSC_HOST_CALL dateParse(ExecState*);
+static EncodedJSValue JSC_HOST_CALL dateNow(ExecState*);
+static EncodedJSValue JSC_HOST_CALL dateUTC(ExecState*);
+
+}
+
+#include "DateConstructor.lut.h"
+
namespace JSC {
-// TODO: MakeTime (15.9.11.1) etc. ?
+const ClassInfo DateConstructor::s_info = { "Function", &InternalFunction::s_info, 0, ExecState::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
+*/
ASSERT_CLASS_FITS_IN_CELL(DateConstructor);
+ASSERT_HAS_TRIVIAL_DESTRUCTOR(DateConstructor);
-static JSValuePtr dateParse(ExecState*, JSObject*, JSValuePtr, const ArgList&);
-static JSValuePtr dateNow(ExecState*, JSObject*, JSValuePtr, const ArgList&);
-static JSValuePtr dateUTC(ExecState*, JSObject*, JSValuePtr, const ArgList&);
+DateConstructor::DateConstructor(JSGlobalObject* globalObject, Structure* structure)
+ : InternalFunction(globalObject, structure)
+{
+}
-DateConstructor::DateConstructor(ExecState* exec, PassRefPtr<Structure> structure, Structure* prototypeFunctionStructure, DatePrototype* datePrototype)
- : InternalFunction(&exec->globalData(), structure, Identifier(exec, datePrototype->classInfo()->className))
+void DateConstructor::finishCreation(ExecState* exec, DatePrototype* datePrototype)
{
- putDirectWithoutTransition(exec->propertyNames().prototype, datePrototype, DontEnum|DontDelete|ReadOnly);
+ Base::finishCreation(exec->globalData(), Identifier(exec, datePrototype->classInfo()->className));
+ putDirectWithoutTransition(exec->globalData(), exec->propertyNames().prototype, datePrototype, DontEnum | DontDelete | ReadOnly);
+ putDirectWithoutTransition(exec->globalData(), exec->propertyNames().length, jsNumber(7), ReadOnly | DontEnum | DontDelete);
+}
- 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);
+bool DateConstructor::getOwnPropertySlot(JSCell* cell, ExecState* exec, const Identifier& propertyName, PropertySlot &slot)
+{
+ return getStaticFunctionSlot<InternalFunction>(exec, ExecState::dateConstructorTable(exec), jsCast<DateConstructor*>(cell), propertyName, slot);
+}
- putDirectWithoutTransition(exec->propertyNames().length, jsNumber(exec, 7), ReadOnly | DontEnum | DontDelete);
+bool DateConstructor::getOwnPropertyDescriptor(JSObject* object, ExecState* exec, const Identifier& propertyName, PropertyDescriptor& descriptor)
+{
+ return getStaticFunctionDescriptor<InternalFunction>(exec, ExecState::dateConstructorTable(exec), jsCast<DateConstructor*>(object), propertyName, descriptor);
}
// ECMA 15.9.3
-JSObject* constructDate(ExecState* exec, const ArgList& args)
+JSObject* constructDate(ExecState* exec, JSGlobalObject* globalObject, const ArgList& args)
{
int numArgs = args.size();
double value;
if (numArgs == 0) // new Date() ECMA 15.9.3.3
- value = getCurrentUTCTime();
+ value = jsCurrentTime();
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::s_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(exec, 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 (!isfinite(doubleArguments[0])
+ || !isfinite(doubleArguments[1])
+ || (numArgs >= 3 && !isfinite(doubleArguments[2]))
+ || (numArgs >= 4 && !isfinite(doubleArguments[3]))
+ || (numArgs >= 5 && !isfinite(doubleArguments[4]))
+ || (numArgs >= 6 && !isfinite(doubleArguments[5]))
+ || (numArgs >= 7 && !isfinite(doubleArguments[6])))
+ value = std::numeric_limits<double>::quiet_NaN();
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.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;
+ double ms = (numArgs >= 7) ? doubleArguments[6] : 0;
+ value = gregorianDateTimeToMS(exec, t, ms, false);
}
}
- DateInstance* result = new (exec) DateInstance(exec->lexicalGlobalObject()->dateStructure());
- result->setInternalValue(jsNumber(exec, timeClip(value)));
- return result;
+ return DateInstance::create(exec, 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));
+ GregorianDateTime ts;
+ msToGregorianDateTime(exec, currentTimeMS(), false, ts);
+ DateConversionBuffer date;
+ DateConversionBuffer time;
+ formatDate(ts, date);
+ formatTime(ts, time);
+ return JSValue::encode(jsMakeNontrivialString(exec, date, " ", time));
}
-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)
+static EncodedJSValue JSC_HOST_CALL dateParse(ExecState* exec)
{
- return jsNumber(exec, parseDate(args.at(exec, 0).toString(exec)));
+ return JSValue::encode(jsNumber(parseDate(exec, exec->argument(0).toString(exec)->value(exec))));
}
-static JSValuePtr dateNow(ExecState* exec, JSObject*, JSValuePtr, const ArgList&)
+static EncodedJSValue JSC_HOST_CALL dateNow(ExecState*)
{
- return jsNumber(exec, getCurrentUTCTime());
+ return JSValue::encode(jsNumber(jsCurrentTime()));
}
-static JSValuePtr dateUTC(ExecState* exec, JSObject*, JSValuePtr, const ArgList& args)
+static 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 (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])))
+ return JSValue::encode(jsNaN());
GregorianDateTime t;
- int year = args.at(exec, 0).toInt32(exec);
+ int year = JSC::toInt32(doubleArguments[0]);
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));
+ 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]);
+ double ms = (n >= 7) ? doubleArguments[6] : 0;
+ return JSValue::encode(jsNumber(timeClip(gregorianDateTimeToMS(exec, t, ms, true))));
}
} // namespace JSC
projects / apple / javascriptcore.git / blobdiff