Changeset 34754 in webkit for trunk/JavaScriptCore/kjs

Timestamp:

Jun 23, 2008, 10:23:17 PM (17 years ago)

Author:

Darin Adler

Message:

JavaScriptCore:

2008-06-23 Darin Adler <Darin Adler>

Reviewed by Geoff.

• work toward ​https://bugs.webkit.org/show_bug.cgi?id=19721

More preparation toward making functions work on primitive types without
creating wrapper objects. No speedup this time, but prepares for a future
speedup without slowing things down.

SunSpider reports no change.

• Eliminated the implementsCall, callAsFunction and construct virtual functions from JSObject. Instead, the CallData and ConstructData for a native function includes a function pointer that the caller can use directly. Changed all call sites to use CallData and ConstructData.

• Changed the "this" argument to native functions to be a JSValue rather than a JSObject. This prepares us for passing primitives into these functions. The conversion to an object now must be done inside the function. Critically, if it's a function that can be called on a DOM window object, then we have to be sure to call toThisObject on the argument before we use it for anything even if it's already an object.

• Eliminated the practice of using constructor objects in the global object to make objects of the various basic types. Since these constructors can't be replaced by script, there's no reason to involve a constructor object at all. Added functions to do the construction directly.

• Made some more class members private and protected, including virtual function overrides. This can catch code using unnecessarily slow virtual function code paths when the type of an object is known statically. If we later find a new reason use the members outside the class it's easy to make them public again.

• Moved the declarations of the native implementations for functions out of header files. These can have internal linkage and be declared inside the source file.

• Changed PrototypeFunction to take function pointers with the right arguments to be put directly into CallData. This eliminates the need to have a separate PrototypeReflexiveFunction, and reveals that the real purpose of that class included something else specific to eval -- storage of a cached global object. So renamed PrototypeReflexiveFunction to GlobalEvalFunction.

• API/JSCallbackConstructor.cpp: (KJS::constructJSCallback): (KJS::JSCallbackConstructor::getConstructData):
• API/JSCallbackConstructor.h:
• API/JSCallbackFunction.cpp: (KJS::JSCallbackFunction::implementsHasInstance): (KJS::JSCallbackFunction::call): (KJS::JSCallbackFunction::getCallData):
• API/JSCallbackFunction.h: (KJS::JSCallbackFunction::classInfo):
• API/JSCallbackObject.h: (KJS::JSCallbackObject::classRef): (KJS::JSCallbackObject::classInfo):
• API/JSCallbackObjectFunctions.h: (KJS::::getConstructData): (KJS::::construct): (KJS::::getCallData): (KJS::::call):
• API/JSObjectRef.cpp: (JSObjectMakeFunction): (JSObjectIsFunction): (JSObjectCallAsFunction): (JSObjectCallAsConstructor):
• JavaScriptCore.exp:
• VM/Machine.cpp: (KJS::jsTypeStringForValue): (KJS::Machine::privateExecute):
• kjs/ArrayPrototype.cpp: (KJS::arrayProtoFuncToString): (KJS::arrayProtoFuncToLocaleString): (KJS::arrayProtoFuncJoin): (KJS::arrayProtoFuncConcat): (KJS::arrayProtoFuncPop): (KJS::arrayProtoFuncPush): (KJS::arrayProtoFuncReverse): (KJS::arrayProtoFuncShift): (KJS::arrayProtoFuncSlice): (KJS::arrayProtoFuncSort): (KJS::arrayProtoFuncSplice): (KJS::arrayProtoFuncUnShift): (KJS::arrayProtoFuncFilter): (KJS::arrayProtoFuncMap): (KJS::arrayProtoFuncEvery): (KJS::arrayProtoFuncForEach): (KJS::arrayProtoFuncSome): (KJS::arrayProtoFuncIndexOf): (KJS::arrayProtoFuncLastIndexOf): (KJS::ArrayConstructor::ArrayConstructor): (KJS::constructArrayWithSizeQuirk): (KJS::constructWithArrayConstructor): (KJS::ArrayConstructor::getConstructData): (KJS::callArrayConstructor): (KJS::ArrayConstructor::getCallData):
• kjs/ArrayPrototype.h:
• kjs/BooleanObject.cpp: (KJS::booleanProtoFuncToString): (KJS::booleanProtoFuncValueOf): (KJS::constructBoolean): (KJS::constructWithBooleanConstructor): (KJS::BooleanConstructor::getConstructData): (KJS::callBooleanConstructor): (KJS::BooleanConstructor::getCallData): (KJS::constructBooleanFromImmediateBoolean):
• kjs/BooleanObject.h:
• kjs/CallData.h: (KJS::):
• kjs/ConstructData.h: (KJS::):
• kjs/FunctionPrototype.cpp: (KJS::callFunctionPrototype): (KJS::FunctionPrototype::getCallData): (KJS::functionProtoFuncToString): (KJS::functionProtoFuncApply): (KJS::functionProtoFuncCall): (KJS::constructWithFunctionConstructor): (KJS::FunctionConstructor::getConstructData): (KJS::callFunctionConstructor): (KJS::FunctionConstructor::getCallData): (KJS::constructFunction):
• kjs/FunctionPrototype.h:
• kjs/JSArray.cpp: (KJS::AVLTreeAbstractorForArrayCompare::compare_key_key): (KJS::JSArray::sort): (KJS::constructEmptyArray): (KJS::constructArray):
• kjs/JSArray.h: (KJS::JSArray::classInfo):
• kjs/JSFunction.cpp: (KJS::JSFunction::call): (KJS::globalFuncEval): (KJS::globalFuncParseInt): (KJS::globalFuncParseFloat): (KJS::globalFuncIsNaN): (KJS::globalFuncIsFinite): (KJS::globalFuncDecodeURI): (KJS::globalFuncDecodeURIComponent): (KJS::globalFuncEncodeURI): (KJS::globalFuncEncodeURIComponent): (KJS::globalFuncEscape): (KJS::globalFuncUnescape): (KJS::globalFuncKJSPrint): (KJS::PrototypeFunction::PrototypeFunction): (KJS::PrototypeFunction::getCallData): (KJS::GlobalEvalFunction::GlobalEvalFunction): (KJS::GlobalEvalFunction::mark):
• kjs/JSFunction.h: (KJS::InternalFunction::classInfo): (KJS::InternalFunction::functionName): (KJS::JSFunction::classInfo): (KJS::GlobalEvalFunction::cachedGlobalObject):
• kjs/JSGlobalObject.cpp: (KJS::JSGlobalObject::reset): (KJS::JSGlobalObject::mark):
• kjs/JSGlobalObject.h: (KJS::JSGlobalObject::JSGlobalObject): (KJS::JSGlobalObject::evalFunction):
• kjs/JSImmediate.cpp: (KJS::JSImmediate::toObject):
• kjs/JSNotAnObject.cpp:
• kjs/JSNotAnObject.h:
• kjs/JSObject.cpp: (KJS::JSObject::put): (KJS::callDefaultValueFunction): (KJS::JSObject::defaultValue): (KJS::JSObject::lookupGetter): (KJS::JSObject::lookupSetter): (KJS::JSObject::hasInstance): (KJS::JSObject::fillGetterPropertySlot): (KJS::Error::create): (KJS::constructEmptyObject):
• kjs/JSObject.h: (KJS::GetterSetter::GetterSetter): (KJS::GetterSetter::getter): (KJS::GetterSetter::setGetter): (KJS::GetterSetter::setter): (KJS::GetterSetter::setSetter):
• kjs/JSValue.cpp: (KJS::JSCell::deleteProperty): (KJS::call): (KJS::construct):
• kjs/JSValue.h:
• kjs/MathObject.cpp: (KJS::mathProtoFuncAbs): (KJS::mathProtoFuncACos): (KJS::mathProtoFuncASin): (KJS::mathProtoFuncATan): (KJS::mathProtoFuncATan2): (KJS::mathProtoFuncCeil): (KJS::mathProtoFuncCos): (KJS::mathProtoFuncExp): (KJS::mathProtoFuncFloor): (KJS::mathProtoFuncLog): (KJS::mathProtoFuncMax): (KJS::mathProtoFuncMin): (KJS::mathProtoFuncPow): (KJS::mathProtoFuncRandom): (KJS::mathProtoFuncRound): (KJS::mathProtoFuncSin): (KJS::mathProtoFuncSqrt): (KJS::mathProtoFuncTan):
• kjs/MathObject.h:
• kjs/NumberObject.cpp: (KJS::numberProtoFuncToString): (KJS::numberProtoFuncToLocaleString): (KJS::numberProtoFuncValueOf): (KJS::numberProtoFuncToFixed): (KJS::numberProtoFuncToExponential): (KJS::numberProtoFuncToPrecision): (KJS::NumberConstructor::NumberConstructor): (KJS::constructWithNumberConstructor): (KJS::NumberConstructor::getConstructData): (KJS::callNumberConstructor): (KJS::NumberConstructor::getCallData): (KJS::constructNumber): (KJS::constructNumberFromImmediateNumber):
• kjs/NumberObject.h: (KJS::NumberObject::classInfo): (KJS::NumberConstructor::classInfo):
• kjs/PropertySlot.cpp: (KJS::PropertySlot::functionGetter):
• kjs/RegExpObject.cpp: (KJS::regExpProtoFuncTest): (KJS::regExpProtoFuncExec): (KJS::regExpProtoFuncCompile): (KJS::regExpProtoFuncToString): (KJS::callRegExpObject): (KJS::RegExpObject::getCallData): (KJS::constructRegExp): (KJS::constructWithRegExpConstructor): (KJS::RegExpConstructor::getConstructData): (KJS::callRegExpConstructor): (KJS::RegExpConstructor::getCallData):
• kjs/RegExpObject.h: (KJS::RegExpConstructor::classInfo):
• kjs/Shell.cpp: (GlobalObject::GlobalObject): (functionPrint): (functionDebug): (functionGC): (functionVersion): (functionRun): (functionLoad): (functionReadline): (functionQuit):
• kjs/date_object.cpp: (KJS::gmtoffset): (KJS::formatLocaleDate): (KJS::fillStructuresUsingDateArgs): (KJS::DateInstance::getTime): (KJS::DateInstance::getUTCTime): (KJS::DateConstructor::DateConstructor): (KJS::constructDate): (KJS::DateConstructor::getConstructData): (KJS::callDate): (KJS::DateConstructor::getCallData): (KJS::dateParse): (KJS::dateNow): (KJS::dateUTC): (KJS::dateProtoFuncToString): (KJS::dateProtoFuncToUTCString): (KJS::dateProtoFuncToDateString): (KJS::dateProtoFuncToTimeString): (KJS::dateProtoFuncToLocaleString): (KJS::dateProtoFuncToLocaleDateString): (KJS::dateProtoFuncToLocaleTimeString): (KJS::dateProtoFuncValueOf): (KJS::dateProtoFuncGetTime): (KJS::dateProtoFuncGetFullYear): (KJS::dateProtoFuncGetUTCFullYear): (KJS::dateProtoFuncToGMTString): (KJS::dateProtoFuncGetMonth): (KJS::dateProtoFuncGetUTCMonth): (KJS::dateProtoFuncGetDate): (KJS::dateProtoFuncGetUTCDate): (KJS::dateProtoFuncGetDay): (KJS::dateProtoFuncGetUTCDay): (KJS::dateProtoFuncGetHours): (KJS::dateProtoFuncGetUTCHours): (KJS::dateProtoFuncGetMinutes): (KJS::dateProtoFuncGetUTCMinutes): (KJS::dateProtoFuncGetSeconds): (KJS::dateProtoFuncGetUTCSeconds): (KJS::dateProtoFuncGetMilliSeconds): (KJS::dateProtoFuncGetUTCMilliseconds): (KJS::dateProtoFuncGetTimezoneOffset): (KJS::dateProtoFuncSetTime): (KJS::setNewValueFromTimeArgs): (KJS::setNewValueFromDateArgs): (KJS::dateProtoFuncSetMilliSeconds): (KJS::dateProtoFuncSetUTCMilliseconds): (KJS::dateProtoFuncSetSeconds): (KJS::dateProtoFuncSetUTCSeconds): (KJS::dateProtoFuncSetMinutes): (KJS::dateProtoFuncSetUTCMinutes): (KJS::dateProtoFuncSetHours): (KJS::dateProtoFuncSetUTCHours): (KJS::dateProtoFuncSetDate): (KJS::dateProtoFuncSetUTCDate): (KJS::dateProtoFuncSetMonth): (KJS::dateProtoFuncSetUTCMonth): (KJS::dateProtoFuncSetFullYear): (KJS::dateProtoFuncSetUTCFullYear): (KJS::dateProtoFuncSetYear): (KJS::dateProtoFuncGetYear):
• kjs/date_object.h: (KJS::DateInstance::internalNumber): (KJS::DateInstance::classInfo):
• kjs/error_object.cpp: (KJS::errorProtoFuncToString): (KJS::constructError): (KJS::constructWithErrorConstructor): (KJS::ErrorConstructor::getConstructData): (KJS::callErrorConstructor): (KJS::ErrorConstructor::getCallData): (KJS::NativeErrorConstructor::construct): (KJS::constructWithNativeErrorConstructor): (KJS::NativeErrorConstructor::getConstructData): (KJS::callNativeErrorConstructor): (KJS::NativeErrorConstructor::getCallData):
• kjs/error_object.h: (KJS::NativeErrorConstructor::classInfo):
• kjs/internal.cpp: (KJS::JSNumberCell::toObject): (KJS::JSNumberCell::toThisObject): (KJS::GetterSetter::mark): (KJS::GetterSetter::toPrimitive): (KJS::GetterSetter::toBoolean): (KJS::GetterSetter::toNumber): (KJS::GetterSetter::toString): (KJS::GetterSetter::toObject): (KJS::InternalFunction::InternalFunction): (KJS::InternalFunction::implementsHasInstance):
• kjs/lookup.h: (KJS::HashEntry::):
• kjs/nodes.cpp: (KJS::FuncDeclNode::makeFunction): (KJS::FuncExprNode::makeFunction):
• kjs/object_object.cpp: (KJS::objectProtoFuncValueOf): (KJS::objectProtoFuncHasOwnProperty): (KJS::objectProtoFuncIsPrototypeOf): (KJS::objectProtoFuncDefineGetter): (KJS::objectProtoFuncDefineSetter): (KJS::objectProtoFuncLookupGetter): (KJS::objectProtoFuncLookupSetter): (KJS::objectProtoFuncPropertyIsEnumerable): (KJS::objectProtoFuncToLocaleString): (KJS::objectProtoFuncToString): (KJS::ObjectConstructor::ObjectConstructor): (KJS::constructObject): (KJS::constructWithObjectConstructor): (KJS::ObjectConstructor::getConstructData): (KJS::callObjectConstructor): (KJS::ObjectConstructor::getCallData):
• kjs/object_object.h:
• kjs/string_object.cpp: (KJS::replace): (KJS::stringProtoFuncToString): (KJS::stringProtoFuncValueOf): (KJS::stringProtoFuncCharAt): (KJS::stringProtoFuncCharCodeAt): (KJS::stringProtoFuncConcat): (KJS::stringProtoFuncIndexOf): (KJS::stringProtoFuncLastIndexOf): (KJS::stringProtoFuncMatch): (KJS::stringProtoFuncSearch): (KJS::stringProtoFuncReplace): (KJS::stringProtoFuncSlice): (KJS::stringProtoFuncSplit): (KJS::stringProtoFuncSubstr): (KJS::stringProtoFuncSubstring): (KJS::stringProtoFuncToLowerCase): (KJS::stringProtoFuncToUpperCase): (KJS::stringProtoFuncToLocaleLowerCase): (KJS::stringProtoFuncToLocaleUpperCase): (KJS::stringProtoFuncLocaleCompare): (KJS::stringProtoFuncBig): (KJS::stringProtoFuncSmall): (KJS::stringProtoFuncBlink): (KJS::stringProtoFuncBold): (KJS::stringProtoFuncFixed): (KJS::stringProtoFuncItalics): (KJS::stringProtoFuncStrike): (KJS::stringProtoFuncSub): (KJS::stringProtoFuncSup): (KJS::stringProtoFuncFontcolor): (KJS::stringProtoFuncFontsize): (KJS::stringProtoFuncAnchor): (KJS::stringProtoFuncLink): (KJS::stringFromCharCode): (KJS::StringConstructor::StringConstructor): (KJS::constructWithStringConstructor): (KJS::StringConstructor::getConstructData): (KJS::callStringConstructor): (KJS::StringConstructor::getCallData):
• kjs/string_object.h:

JavaScriptGlue:

2008-06-23 Darin Adler <Darin Adler>

Reviewed by Geoff.

• JSValueWrapper.cpp: (JSValueWrapper::JSObjectCallFunction): Updated to use getCallData and call instead of the old callAsFunction.

WebCore:

2008-06-23 Darin Adler <Darin Adler>

Reviewed by Geoff.

Update for JavaScript changes.

• Use CallData and ConstructData instead of the obsolete implementsCall, callAsFunction, and construct functions.

• Updated native function arguments, specifically to allow a JSValue rather than a JSObject for the this argument, and to call toThisObject as needed when treating it as an object.

• Made some more class members private and protected, including virtual function overrides.

• Eliminated the use of getCallData in the JavaScript bridging code as a way to check if an instance supports invokeDefaultMethod.

• Eliminated unnecessary polymorphism in the NodeIterator and TreeWalker classes. They were using virtual functions simply to share an instance of the RefCounted template, which was not helpful.

• bindings/js/JSAudioConstructor.cpp: (WebCore::constructAudio): (WebCore::JSAudioConstructor::getConstructData):
• bindings/js/JSAudioConstructor.h: (WebCore::JSAudioConstructor::document): (WebCore::JSAudioConstructor::classInfo):
• bindings/js/JSClipboardCustom.cpp: (WebCore::JSClipboard::types):
• bindings/js/JSCustomSQLStatementCallback.cpp: (WebCore::JSCustomSQLStatementCallback::handleEvent):
• bindings/js/JSCustomSQLStatementErrorCallback.cpp: (WebCore::JSCustomSQLStatementErrorCallback::handleEvent):
• bindings/js/JSCustomSQLTransactionCallback.cpp: (WebCore::JSCustomSQLTransactionCallback::handleEvent):
• bindings/js/JSCustomSQLTransactionErrorCallback.cpp: (WebCore::JSCustomSQLTransactionErrorCallback::handleEvent):
• bindings/js/JSCustomVoidCallback.cpp: (WebCore::JSCustomVoidCallback::handleEvent):
• bindings/js/JSCustomXPathNSResolver.cpp: (WebCore::JSCustomXPathNSResolver::lookupNamespaceURI):
• bindings/js/JSDOMBinding.h: (WebCore::DOMObject::DOMObject):
• bindings/js/JSDOMWindowBase.cpp: (WebCore::windowProtoFuncAToB): (WebCore::windowProtoFuncBToA): (WebCore::windowProtoFuncOpen): (WebCore::windowProtoFuncSetTimeout): (WebCore::windowProtoFuncClearTimeout): (WebCore::windowProtoFuncSetInterval): (WebCore::windowProtoFuncAddEventListener): (WebCore::windowProtoFuncRemoveEventListener): (WebCore::windowProtoFuncShowModalDialog): (WebCore::windowProtoFuncNotImplemented): (WebCore::toJSDOMWindow):
• bindings/js/JSDOMWindowBase.h:
• bindings/js/JSDOMWindowShell.h: (WebCore::JSDOMWindowShell::classInfo):
• bindings/js/JSEventListener.cpp: (WebCore::JSAbstractEventListener::handleEvent): (WebCore::JSLazyEventListener::parseCode):
• bindings/js/JSEventTargetBase.cpp: (WebCore::retrieveEventTargetAndCorrespondingNode): (WebCore::jsEventTargetAddEventListener): (WebCore::jsEventTargetRemoveEventListener): (WebCore::jsEventTargetDispatchEvent):
• bindings/js/JSEventTargetBase.h:
• bindings/js/JSHTMLAppletElementCustom.cpp: (WebCore::JSHTMLAppletElement::customGetOwnPropertySlot): (WebCore::JSHTMLAppletElement::customPut): (WebCore::JSHTMLAppletElement::getCallData):
• bindings/js/JSHTMLCollectionCustom.cpp: (WebCore::callHTMLCollection): (WebCore::JSHTMLCollection::getCallData):
• bindings/js/JSHTMLDocumentCustom.cpp: (WebCore::JSHTMLDocument::open):
• bindings/js/JSHTMLEmbedElementCustom.cpp: (WebCore::JSHTMLEmbedElement::customGetOwnPropertySlot): (WebCore::JSHTMLEmbedElement::customPut): (WebCore::JSHTMLEmbedElement::getCallData):
• bindings/js/JSHTMLInputElementBase.cpp: (WebCore::jsHTMLInputElementBaseFunctionSetSelectionRange):
• bindings/js/JSHTMLInputElementBase.h:
• bindings/js/JSHTMLObjectElementCustom.cpp: (WebCore::JSHTMLObjectElement::customGetOwnPropertySlot): (WebCore::JSHTMLObjectElement::customPut): (WebCore::JSHTMLObjectElement::getCallData):
• bindings/js/JSHTMLOptionElementConstructor.cpp: (WebCore::constructHTMLOptionElement): (WebCore::JSHTMLOptionElementConstructor::getConstructData):
• bindings/js/JSHTMLOptionElementConstructor.h: (WebCore::JSHTMLOptionElementConstructor::document): (WebCore::JSHTMLOptionElementConstructor::classInfo):
• bindings/js/JSImageConstructor.cpp: (WebCore::constructImage): (WebCore::JSImageConstructor::getConstructData):
• bindings/js/JSImageConstructor.h: (WebCore::JSImageConstructor::document): (WebCore::JSImageConstructor::classInfo):
• bindings/js/JSInspectedObjectWrapper.h: (WebCore::JSInspectedObjectWrapper::classInfo):
• bindings/js/JSInspectorCallbackWrapper.cpp: (WebCore::JSInspectorCallbackWrapper::prepareIncomingValue):
• bindings/js/JSJavaScriptCallFrameCustom.cpp: (WebCore::JSJavaScriptCallFrame::scopeChain):
• bindings/js/JSNodeFilterCondition.cpp: (WebCore::JSNodeFilterCondition::JSNodeFilterCondition): (WebCore::JSNodeFilterCondition::mark): (WebCore::JSNodeFilterCondition::acceptNode):
• bindings/js/JSNodeFilterCondition.h: (WebCore::JSNodeFilterCondition::create):
• bindings/js/JSNodeFilterCustom.cpp: (WebCore::toNodeFilter):
• bindings/js/JSNodeListCustom.cpp: (WebCore::callNodeList): (WebCore::JSNodeList::getCallData): (WebCore::JSNodeList::canGetItemsForName): (WebCore::JSNodeList::nameGetter):
• bindings/js/JSPluginElementFunctions.cpp: (WebCore::runtimeObjectGetter): (WebCore::runtimeObjectPropertyGetter): (WebCore::runtimeObjectCustomGetOwnPropertySlot): (WebCore::runtimeObjectCustomPut): (WebCore::runtimeObjectGetCallData): (WebCore::pluginInstance): (WebCore::getRuntimeObject): (WebCore::callPlugin):
• bindings/js/JSPluginElementFunctions.h:
• bindings/js/JSQuarantinedObjectWrapper.cpp: (WebCore::JSQuarantinedObjectWrapper::put): (WebCore::JSQuarantinedObjectWrapper::construct): (WebCore::JSQuarantinedObjectWrapper::getConstructData): (WebCore::JSQuarantinedObjectWrapper::hasInstance): (WebCore::JSQuarantinedObjectWrapper::call): (WebCore::JSQuarantinedObjectWrapper::getCallData):
• bindings/js/JSQuarantinedObjectWrapper.h: (WebCore::JSQuarantinedObjectWrapper::className):
• bindings/js/JSRGBColor.cpp:
• bindings/js/JSXMLHttpRequestConstructor.cpp: (WebCore::constructXMLHttpRequest): (WebCore::JSXMLHttpRequestConstructor::getConstructData):
• bindings/js/JSXMLHttpRequestConstructor.h: (WebCore::JSXMLHttpRequestConstructor::document): (WebCore::JSXMLHttpRequestConstructor::classInfo):
• bindings/js/JSXSLTProcessorConstructor.cpp: (WebCore::constructXSLTProcessor): (WebCore::JSXSLTProcessorConstructor::getConstructData):
• bindings/js/JSXSLTProcessorConstructor.h: (WebCore::JSXSLTProcessorConstructor::classInfo):
• bindings/js/ScheduledAction.cpp: (WebCore::ScheduledAction::ScheduledAction): (WebCore::ScheduledAction::execute):
• bindings/js/ScheduledAction.h:
• bindings/objc/WebScriptObject.mm: (-[WebScriptObject callWebScriptMethod:withArguments:]):
• bindings/scripts/CodeGeneratorJS.pm:
• bridge/NP_jsobject.cpp: (_NPN_InvokeDefault): (_NPN_Invoke):
• bridge/c/c_instance.cpp: (KJS::Bindings::CInstance::supportsInvokeDefaultMethod):
• bridge/c/c_instance.h:
• bridge/jni/jni_jsobject.mm: (JavaJSObject::call):
• bridge/objc/objc_instance.h:
• bridge/objc/objc_instance.mm: (ObjcInstance::supportsInvokeDefaultMethod):
• bridge/objc/objc_runtime.h: (KJS::Bindings::ObjcFallbackObjectImp::propertyName): (KJS::Bindings::ObjcFallbackObjectImp::classInfo):
• bridge/objc/objc_runtime.mm: (Bindings::webScriptObjectClass): (Bindings::webUndefinedClass): (ObjcFallbackObjectImp::ObjcFallbackObjectImp): (callObjCFallbackObject): (ObjcFallbackObjectImp::getCallData):
• bridge/qt/qt_instance.h:
• bridge/runtime.cpp: (KJS::Bindings::Instance::createRuntimeObject): (KJS::Bindings::Instance::getInstance):
• bridge/runtime.h: (KJS::Bindings::Field::~Field): (KJS::Bindings::Method::~Method): (KJS::Bindings::Class::~Class): (KJS::Bindings::Instance::supportsInvokeDefaultMethod):
• bridge/runtime_method.cpp: (KJS::callRuntimeMethod): (KJS::RuntimeMethod::getCallData):
• bridge/runtime_method.h: (KJS::RuntimeMethod::methods):
• bridge/runtime_object.cpp: (RuntimeObjectImp::defaultValue): (callRuntimeObject): (RuntimeObjectImp::getCallData):
• bridge/runtime_object.h: (KJS::RuntimeObjectImp::getInternalInstance): (KJS::RuntimeObjectImp::classInfo):
• dom/NodeIterator.h:
• dom/Traversal.cpp:
• dom/Traversal.h:
• dom/TreeWalker.h:

Location:

trunk/JavaScriptCore/kjs

Files:

• ArrayPrototype.cpp (modified) (30 diffs)
• ArrayPrototype.h (modified) (1 diff)
• BooleanObject.cpp (modified) (3 diffs)
• BooleanObject.h (modified) (1 diff)
• CallData.h (modified) (3 diffs)
• ConstructData.h (modified) (3 diffs)
• FunctionPrototype.cpp (modified) (8 diffs)
• FunctionPrototype.h (modified) (2 diffs)
• JSArray.cpp (modified) (6 diffs)
• JSArray.h (modified) (2 diffs)
• JSFunction.cpp (modified) (16 diffs)
• JSFunction.h (modified) (5 diffs)
• JSGlobalObject.cpp (modified) (7 diffs)
• JSGlobalObject.h (modified) (9 diffs)
• JSImmediate.cpp (modified) (1 diff)
• JSNotAnObject.cpp (modified) (1 diff)
• JSNotAnObject.h (modified) (2 diffs)
• JSObject.cpp (modified) (14 diffs)
• JSObject.h (modified) (8 diffs)
• JSValue.cpp (modified) (3 diffs)
• JSValue.h (modified) (4 diffs)
• MathObject.cpp (modified) (12 diffs)
• MathObject.h (modified) (2 diffs)
• NumberObject.cpp (modified) (12 diffs)
• NumberObject.h (modified) (2 diffs)
• PropertySlot.cpp (modified) (1 diff)
• RegExpObject.cpp (modified) (10 diffs)
• RegExpObject.h (modified) (5 diffs)
• Shell.cpp (modified) (10 diffs)
• date_object.cpp (modified) (50 diffs)
• date_object.h (modified) (4 diffs)
• error_object.cpp (modified) (5 diffs)
• error_object.h (modified) (2 diffs)
• internal.cpp (modified) (4 diffs)
• lookup.h (modified) (1 diff)
• nodes.cpp (modified) (2 diffs)
• object_object.cpp (modified) (5 diffs)
• object_object.h (modified) (2 diffs)
• string_object.cpp (modified) (29 diffs)
• string_object.h (modified) (3 diffs)

trunk/JavaScriptCore/kjs/ArrayPrototype.cpp

@@ -24 +24 @@
 #include "config.h"
 #include "ArrayPrototype.h"
-#include "ArrayPrototype.lut.h"
 
 #include "Machine.h"
@@ -35 +34 @@
 
 #include <algorithm> // for std::min
+
+namespace KJS {
+
+static JSValue* arrayProtoFuncToString(ExecState*, JSObject*, JSValue*, const ArgList&);
+static JSValue* arrayProtoFuncToLocaleString(ExecState*, JSObject*, JSValue*, const ArgList&);
+static JSValue* arrayProtoFuncConcat(ExecState*, JSObject*, JSValue*, const ArgList&);
+static JSValue* arrayProtoFuncJoin(ExecState*, JSObject*, JSValue*, const ArgList&);
+static JSValue* arrayProtoFuncPop(ExecState*, JSObject*, JSValue*, const ArgList&);
+static JSValue* arrayProtoFuncPush(ExecState*, JSObject*, JSValue*, const ArgList&);
+static JSValue* arrayProtoFuncReverse(ExecState*, JSObject*, JSValue*, const ArgList&);
+static JSValue* arrayProtoFuncShift(ExecState*, JSObject*, JSValue*, const ArgList&);
+static JSValue* arrayProtoFuncSlice(ExecState*, JSObject*, JSValue*, const ArgList&);
+static JSValue* arrayProtoFuncSort(ExecState*, JSObject*, JSValue*, const ArgList&);
+static JSValue* arrayProtoFuncSplice(ExecState*, JSObject*, JSValue*, const ArgList&);
+static JSValue* arrayProtoFuncUnShift(ExecState*, JSObject*, JSValue*, const ArgList&);
+static JSValue* arrayProtoFuncEvery(ExecState*, JSObject*, JSValue*, const ArgList&);
+static JSValue* arrayProtoFuncForEach(ExecState*, JSObject*, JSValue*, const ArgList&);
+static JSValue* arrayProtoFuncSome(ExecState*, JSObject*, JSValue*, const ArgList&);
+static JSValue* arrayProtoFuncIndexOf(ExecState*, JSObject*, JSValue*, const ArgList&);
+static JSValue* arrayProtoFuncFilter(ExecState*, JSObject*, JSValue*, const ArgList&);
+static JSValue* arrayProtoFuncMap(ExecState*, JSObject*, JSValue*, const ArgList&);
+static JSValue* arrayProtoFuncLastIndexOf(ExecState*, JSObject*, JSValue*, const ArgList&);
+
+}
+
+#include "ArrayPrototype.lut.h"
 
 namespace KJS {
@@ -89 +114 @@
 }
 
-JSValue* arrayProtoFuncToString(ExecState* exec, JSObject* thisObj, const ArgList&)
-{
-    if (!thisObj->inherits(&JSArray::info))
+JSValue* arrayProtoFuncToString(ExecState* exec, JSObject*, JSValue* thisValue, const ArgList&)
+{
+    if (!thisValue->isObject(&JSArray::info))
         return throwError(exec, TypeError);
+    JSObject* thisObj = static_cast<JSArray*>(thisValue);
 
     HashSet<JSObject*>& arrayVisitedElements = exec->dynamicGlobalObject()->arrayVisitedElements();
@@ -132 +158 @@
 }
 
-JSValue* arrayProtoFuncToLocaleString(ExecState* exec, JSObject* thisObj, const ArgList&)
-{
-    if (!thisObj->inherits(&JSArray::info))
+JSValue* arrayProtoFuncToLocaleString(ExecState* exec, JSObject*, JSValue* thisValue, const ArgList&)
+{
+    if (!thisValue->isObject(&JSArray::info))
         return throwError(exec, TypeError);
+    JSObject* thisObj = static_cast<JSArray*>(thisValue);
 
     HashSet<JSObject*>& arrayVisitedElements = exec->dynamicGlobalObject()->arrayVisitedElements();
@@ -163 +190 @@
         JSValue* conversionFunction = o->get(exec, exec->propertyNames().toLocaleString);
         UString str;
-        if (conversionFunction->isObject() && static_cast<JSObject*>(conversionFunction)->implementsCall())
-            str = static_cast<JSObject*>(conversionFunction)->callAsFunction(exec, o, exec->emptyList())->toString(exec);
+        CallData callData;
+        CallType callType = conversionFunction->getCallData(callData);
+        if (callType != CallTypeNone)
+            str = call(exec, conversionFunction, callType, callData, element, exec->emptyList())->toString(exec);
         else
             str = element->toString(exec);
@@ -181 +210 @@
 }
 
-JSValue* arrayProtoFuncJoin(ExecState* exec, JSObject* thisObj, const ArgList& args)
-{
+JSValue* arrayProtoFuncJoin(ExecState* exec, JSObject*, JSValue* thisValue, const ArgList& args)
+{
+    JSObject* thisObj = thisValue->toThisObject(exec);
+
     HashSet<JSObject*>& arrayVisitedElements = exec->dynamicGlobalObject()->arrayVisitedElements();
     if (arrayVisitedElements.size() > MaxReentryDepth)
@@ -224 +255 @@
 }
 
-JSValue* arrayProtoFuncConcat(ExecState* exec, JSObject* thisObj, const ArgList& args)
-{
-    JSObject* arr = static_cast<JSObject*>(exec->lexicalGlobalObject()->arrayConstructor()->construct(exec, exec->emptyList()));
+JSValue* arrayProtoFuncConcat(ExecState* exec, JSObject*, JSValue* thisValue, const ArgList& args)
+{
+    JSArray* arr = constructEmptyArray(exec);
     int n = 0;
-    JSValue* curArg = thisObj;
-    JSObject* curObj = static_cast<JSObject* >(thisObj);
+    JSValue* curArg = thisValue->toThisObject(exec);
     ArgList::const_iterator it = args.begin();
     ArgList::const_iterator end = args.end();
     while (1) {
-        if (curArg->isObject() && curObj->inherits(&JSArray::info)) {
-            unsigned k = 0;
-            // Older versions tried to optimize out getting the length of thisObj
-            // by checking for n != 0, but that doesn't work if thisObj is an empty array.
-            unsigned length = curObj->get(exec, exec->propertyNames().length)->toUInt32(exec);
-            while (k < length) {
-                if (JSValue* v = getProperty(exec, curObj, k))
+        if (curArg->isObject(&JSArray::info)) {
+            JSArray* curArray = static_cast<JSArray*>(curArg);
+            unsigned length = curArray->getLength();
+            for (unsigned k = 0; k < length; ++k) {
+                if (JSValue* v = curArray->getItem(k))
                     arr->put(exec, n, v);
                 n++;
-                k++;
             }
         } else {
@@ -251 +278 @@
             break;
         curArg = *it;
-        curObj = static_cast<JSObject*>(curArg); // may be 0
         ++it;
     }
-    arr->put(exec, exec->propertyNames().length, jsNumber(exec, n));
+    arr->setLength(n);
     return arr;
 }
 
-JSValue* arrayProtoFuncPop(ExecState* exec, JSObject* thisObj, const ArgList&)
-{
+JSValue* arrayProtoFuncPop(ExecState* exec, JSObject*, JSValue* thisValue, const ArgList&)
+{
+    JSObject* thisObj = thisValue->toThisObject(exec);
     JSValue* result = 0;
     unsigned length = thisObj->get(exec, exec->propertyNames().length)->toUInt32(exec);
@@ -273 +300 @@
 }
 
-JSValue* arrayProtoFuncPush(ExecState* exec, JSObject* thisObj, const ArgList& args)
-{
+JSValue* arrayProtoFuncPush(ExecState* exec, JSObject*, JSValue* thisValue, const ArgList& args)
+{
+    JSObject* thisObj = thisValue->toThisObject(exec);
     unsigned length = thisObj->get(exec, exec->propertyNames().length)->toUInt32(exec);
     for (unsigned n = 0; n < args.size(); n++)
@@ -283 +311 @@
 }
 
-JSValue* arrayProtoFuncReverse(ExecState* exec, JSObject* thisObj, const ArgList&)
-{
+JSValue* arrayProtoFuncReverse(ExecState* exec, JSObject*, JSValue* thisValue, const ArgList&)
+{
+    JSObject* thisObj = thisValue->toThisObject(exec);
     unsigned length = thisObj->get(exec, exec->propertyNames().length)->toUInt32(exec);
     unsigned middle = length / 2;
@@ -306 +335 @@
 }
 
-JSValue* arrayProtoFuncShift(ExecState* exec, JSObject* thisObj, const ArgList&)
-{
+JSValue* arrayProtoFuncShift(ExecState* exec, JSObject*, JSValue* thisValue, const ArgList&)
+{
+    JSObject* thisObj = thisValue->toThisObject(exec);
     JSValue* result = 0;
 
@@ -328 +358 @@
 }
 
-JSValue* arrayProtoFuncSlice(ExecState* exec, JSObject* thisObj, const ArgList& args)
+JSValue* arrayProtoFuncSlice(ExecState* exec, JSObject*, JSValue* thisValue, const ArgList& args)
 {
     // http://developer.netscape.com/docs/manuals/js/client/jsref/array.htm#1193713 or 15.4.4.10
 
+    JSObject* thisObj = thisValue->toThisObject(exec);
+
     // We return a new array
-    JSObject* resObj = static_cast<JSObject* >(exec->lexicalGlobalObject()->arrayConstructor()->construct(exec, exec->emptyList()));
+    JSArray* resObj = constructEmptyArray(exec);
     JSValue* result = resObj;
     double begin = args[0]->toInteger(exec);
@@ -367 +399 @@
             resObj->put(exec, n, v);
     }
-    resObj->put(exec, exec->propertyNames().length, jsNumber(exec, n));
+    resObj->setLength(n);
     return result;
 }
 
-JSValue* arrayProtoFuncSort(ExecState* exec, JSObject* thisObj, const ArgList& args)
-{
-    JSObject* sortFunction = 0;
-    if (!args[0]->isUndefined()) {
-        sortFunction = args[0]->toObject(exec);
-        if (!sortFunction->implementsCall())
-            sortFunction = 0;
-    }
+JSValue* arrayProtoFuncSort(ExecState* exec, JSObject*, JSValue* thisValue, const ArgList& args)
+{
+    JSObject* thisObj = thisValue->toThisObject(exec);
+
+    JSValue* function = args[0];
+    CallData callData;
+    CallType callType = function->getCallData(callData);
 
     if (thisObj->classInfo() == &JSArray::info) {
-        if (sortFunction)
-            static_cast<JSArray*>(thisObj)->sort(exec, sortFunction);
+        if (callType != CallTypeNone)
+            static_cast<JSArray*>(thisObj)->sort(exec, function, callType, callData);
         else
             static_cast<JSArray*>(thisObj)->sort(exec);
@@ -406 +437 @@
             else if (minObj->isUndefined())
                 compareResult = -1;
-            else if (sortFunction) {
+            else if (callType != CallTypeNone) {
                 ArgList l;
                 l.append(jObj);
                 l.append(minObj);
-                compareResult = sortFunction->callAsFunction(exec, exec->globalThisValue(), l)->toNumber(exec);
+                compareResult = call(exec, function, callType, callData, exec->globalThisValue(), l)->toNumber(exec);
             } else
                 compareResult = (jObj->toString(exec) < minObj->toString(exec)) ? -1 : 1;
@@ -428 +459 @@
 }
 
-JSValue* arrayProtoFuncSplice(ExecState* exec, JSObject* thisObj, const ArgList& args)
-{
+JSValue* arrayProtoFuncSplice(ExecState* exec, JSObject*, JSValue* thisValue, const ArgList& args)
+{
+    JSObject* thisObj = thisValue->toThisObject(exec);
+
     // 15.4.4.12
-    JSObject* resObj = static_cast<JSObject* >(exec->lexicalGlobalObject()->arrayConstructor()->construct(exec, exec->emptyList()));
+    JSArray* resObj = constructEmptyArray(exec);
     JSValue* result = resObj;
     unsigned length = thisObj->get(exec, exec->propertyNames().length)->toUInt32(exec);
@@ -452 +485 @@
             resObj->put(exec, k, v);
     }
-    resObj->put(exec, exec->propertyNames().length, jsNumber(exec, deleteCount));
+    resObj->setLength(deleteCount);
 
     unsigned additionalArgs = std::max<int>(args.size() - 2, 0);
@@ -481 +514 @@
 }
 
-JSValue* arrayProtoFuncUnShift(ExecState* exec, JSObject* thisObj, const ArgList& args)
-{
+JSValue* arrayProtoFuncUnShift(ExecState* exec, JSObject*, JSValue* thisValue, const ArgList& args)
+{
+    JSObject* thisObj = thisValue->toThisObject(exec);
+
     // 15.4.4.13
     unsigned length = thisObj->get(exec, exec->propertyNames().length)->toUInt32(exec);
@@ -501 +536 @@
 }
 
-JSValue* arrayProtoFuncFilter(ExecState* exec, JSObject* thisObj, const ArgList& args)
-{
-    JSObject* eachFunction = args[0]->toObject(exec);
-
-    if (!eachFunction->implementsCall())
+JSValue* arrayProtoFuncFilter(ExecState* exec, JSObject*, JSValue* thisValue, const ArgList& args)
+{
+    JSObject* thisObj = thisValue->toThisObject(exec);
+
+    JSValue* function = args[0];
+    CallData callData;
+    CallType callType = function->getCallData(callData);
+    if (callType == CallTypeNone)
         return throwError(exec, TypeError);
 
-    JSObject* applyThis = args[1]->isUndefinedOrNull() ? exec->globalThisValue() :  args[1]->toObject(exec);
-    JSObject* resultArray = static_cast<JSObject*>(exec->lexicalGlobalObject()->arrayConstructor()->construct(exec, exec->emptyList()));
+    JSObject* applyThis = args[1]->isUndefinedOrNull() ? exec->globalThisValue() : args[1]->toObject(exec);
+    JSArray* resultArray = constructEmptyArray(exec);
 
     unsigned filterIndex = 0;
@@ -527 +565 @@
         eachArguments.append(thisObj);
 
-        JSValue* result = eachFunction->callAsFunction(exec, applyThis, eachArguments);
+        JSValue* result = call(exec, function, callType, callData, applyThis, eachArguments);
 
         if (result->toBoolean(exec))
@@ -535 +573 @@
 }
 
-JSValue* arrayProtoFuncMap(ExecState* exec, JSObject* thisObj, const ArgList& args)
-{
-    JSObject* eachFunction = args[0]->toObject(exec);
-    if (!eachFunction->implementsCall())
+JSValue* arrayProtoFuncMap(ExecState* exec, JSObject*, JSValue* thisValue, const ArgList& args)
+{
+    JSObject* thisObj = thisValue->toThisObject(exec);
+
+    JSValue* function = args[0];
+    CallData callData;
+    CallType callType = function->getCallData(callData);
+    if (callType == CallTypeNone)
         return throwError(exec, TypeError);
 
-    JSObject* applyThis = args[1]->isUndefinedOrNull() ? exec->globalThisValue() :  args[1]->toObject(exec);
-
-    unsigned length = thisObj->get(exec, exec->propertyNames().length)->toUInt32(exec);
-
-    ArgList mapArgs;
-    mapArgs.append(jsNumber(exec, length));
-    JSObject* resultArray = static_cast<JSObject*>(exec->lexicalGlobalObject()->arrayConstructor()->construct(exec, mapArgs));
+    JSObject* applyThis = args[1]->isUndefinedOrNull() ? exec->globalThisValue() : args[1]->toObject(exec);
+
+    unsigned length = thisObj->get(exec, exec->propertyNames().length)->toUInt32(exec);
+
+    JSArray* resultArray = constructEmptyArray(exec, length);
 
     for (unsigned k = 0; k < length && !exec->hadException(); ++k) {
@@ -562 +602 @@
         eachArguments.append(thisObj);
 
-        JSValue* result = eachFunction->callAsFunction(exec, applyThis, eachArguments);
+        JSValue* result = call(exec, function, callType, callData, applyThis, eachArguments);
         resultArray->put(exec, k, result);
     }
@@ -574 +614 @@
 // http://developer-test.mozilla.org/en/docs/Core_JavaScript_1.5_Reference:Objects:Array:some
 
-JSValue* arrayProtoFuncEvery(ExecState* exec, JSObject* thisObj, const ArgList& args)
-{
-    JSObject* eachFunction = args[0]->toObject(exec);
-
-    if (!eachFunction->implementsCall())
+JSValue* arrayProtoFuncEvery(ExecState* exec, JSObject*, JSValue* thisValue, const ArgList& args)
+{
+    JSObject* thisObj = thisValue->toThisObject(exec);
+
+    JSValue* function = args[0];
+    CallData callData;
+    CallType callType = function->getCallData(callData);
+    if (callType == CallTypeNone)
         return throwError(exec, TypeError);
 
-    JSObject* applyThis = args[1]->isUndefinedOrNull() ? exec->globalThisValue() :  args[1]->toObject(exec);
+    JSObject* applyThis = args[1]->isUndefinedOrNull() ? exec->globalThisValue() : args[1]->toObject(exec);
 
     JSValue* result = jsBoolean(true);
@@ -598 +641 @@
         eachArguments.append(thisObj);
 
-        bool predicateResult = eachFunction->callAsFunction(exec, applyThis, eachArguments)->toBoolean(exec);
+        bool predicateResult = call(exec, function, callType, callData, applyThis, eachArguments)->toBoolean(exec);
 
         if (!predicateResult) {
@@ -609 +652 @@
 }
 
-JSValue* arrayProtoFuncForEach(ExecState* exec, JSObject* thisObj, const ArgList& args)
-{
-    JSObject* eachFunction = args[0]->toObject(exec);
-
-    if (!eachFunction->implementsCall())
+JSValue* arrayProtoFuncForEach(ExecState* exec, JSObject*, JSValue* thisValue, const ArgList& args)
+{
+    JSObject* thisObj = thisValue->toThisObject(exec);
+
+    JSValue* function = args[0];
+    CallData callData;
+    CallType callType = function->getCallData(callData);
+    if (callType == CallTypeNone)
         return throwError(exec, TypeError);
 
-    JSObject* applyThis = args[1]->isUndefinedOrNull() ? exec->globalThisValue() :  args[1]->toObject(exec);
+    JSObject* applyThis = args[1]->isUndefinedOrNull() ? exec->globalThisValue() : args[1]->toObject(exec);
 
     unsigned length = thisObj->get(exec, exec->propertyNames().length)->toUInt32(exec);
@@ -629 +675 @@
         eachArguments.append(thisObj);
 
-        eachFunction->callAsFunction(exec, applyThis, eachArguments);
+        call(exec, function, callType, callData, applyThis, eachArguments);
     }
     return jsUndefined();
 }
 
-JSValue* arrayProtoFuncSome(ExecState* exec, JSObject* thisObj, const ArgList& args)
-{
-    JSObject* eachFunction = args[0]->toObject(exec);
-
-    if (!eachFunction->implementsCall())
+JSValue* arrayProtoFuncSome(ExecState* exec, JSObject*, JSValue* thisValue, const ArgList& args)
+{
+    JSObject* thisObj = thisValue->toThisObject(exec);
+
+    JSValue* function = args[0];
+    CallData callData;
+    CallType callType = function->getCallData(callData);
+    if (callType == CallTypeNone)
         return throwError(exec, TypeError);
 
-    JSObject* applyThis = args[1]->isUndefinedOrNull() ? exec->globalThisValue() :  args[1]->toObject(exec);
+    JSObject* applyThis = args[1]->isUndefinedOrNull() ? exec->globalThisValue() : args[1]->toObject(exec);
 
     JSValue* result = jsBoolean(false);
@@ -656 +705 @@
         eachArguments.append(thisObj);
 
-        bool predicateResult = eachFunction->callAsFunction(exec, applyThis, eachArguments)->toBoolean(exec);
+        bool predicateResult = call(exec, function, callType, callData, applyThis, eachArguments)->toBoolean(exec);
 
         if (predicateResult) {
@@ -666 +715 @@
 }
 
-JSValue* arrayProtoFuncIndexOf(ExecState* exec, JSObject* thisObj, const ArgList& args)
+JSValue* arrayProtoFuncIndexOf(ExecState* exec, JSObject*, JSValue* thisValue, const ArgList& args)
 {
     // JavaScript 1.5 Extension by Mozilla
     // Documentation: http://developer.mozilla.org/en/docs/Core_JavaScript_1.5_Reference:Global_Objects:Array:indexOf
+
+    JSObject* thisObj = thisValue->toThisObject(exec);
 
     unsigned index = 0;
@@ -695 +746 @@
 }
 
-JSValue* arrayProtoFuncLastIndexOf(ExecState* exec, JSObject* thisObj, const ArgList& args)
+JSValue* arrayProtoFuncLastIndexOf(ExecState* exec, JSObject*, JSValue* thisValue, const ArgList& args)
 {
     // JavaScript 1.6 Extension by Mozilla
     // Documentation: http://developer.mozilla.org/en/docs/Core_JavaScript_1.5_Reference:Global_Objects:Array:lastIndexOf
+
+    JSObject* thisObj = thisValue->toThisObject(exec);
 
     unsigned length = thisObj->get(exec, exec->propertyNames().length)->toUInt32(exec);
@@ -733 +786 @@
 
     // no. of arguments for constructor
-    putDirect(exec->propertyNames().length, jsNumber(exec, 1), ReadOnly|DontDelete|DontEnum);
-}
-
-ConstructType ArrayConstructor::getConstructData(ConstructData&)
-{
-    return ConstructTypeNative;
-}
-
-// ECMA 15.4.2
-JSObject* ArrayConstructor::construct(ExecState* exec, const ArgList& args)
+    putDirect(exec->propertyNames().length, jsNumber(exec, 1), ReadOnly | DontEnum | DontDelete);
+}
+
+static JSObject* constructArrayWithSizeQuirk(ExecState* exec, const ArgList& args)
 {
     // a single numeric argument denotes the array size (!)
@@ -756 +803 @@
 }
 
+static JSObject* constructWithArrayConstructor(ExecState* exec, JSObject*, const ArgList& args)
+{
+    return constructArrayWithSizeQuirk(exec, args);
+}
+
+// ECMA 15.4.2
+ConstructType ArrayConstructor::getConstructData(ConstructData& constructData)
+{
+    constructData.native.function = constructWithArrayConstructor;
+    return ConstructTypeNative;
+}
+
+static JSValue* callArrayConstructor(ExecState* exec, JSObject*, JSValue*, const ArgList& args)
+{
+    return constructArrayWithSizeQuirk(exec, args);
+}
+
 // ECMA 15.6.1
-JSValue* ArrayConstructor::callAsFunction(ExecState* exec, JSObject*, const ArgList& args)
+CallType ArrayConstructor::getCallData(CallData& callData)
 {
     // equivalent to 'new Array(....)'
-    return construct(exec, args);
-}
-
-}
+    callData.native.function = callArrayConstructor;
+    return CallTypeNative;
+}
+
+}

trunk/JavaScriptCore/kjs/ArrayPrototype.h

@@ -40 +40 @@
   public:
     ArrayConstructor(ExecState*, FunctionPrototype*, ArrayPrototype*);
-
     virtual ConstructType getConstructData(ConstructData&);
-    virtual JSObject* construct(ExecState*, const ArgList&);
-
-    virtual JSValue* callAsFunction(ExecState*, JSObject*, const ArgList&);
-
+    virtual CallType getCallData(CallData&);
   };
-
-  JSValue* arrayProtoFuncToString(ExecState*, JSObject*, const ArgList&);
-  JSValue* arrayProtoFuncToLocaleString(ExecState*, JSObject*, const ArgList&);
-  JSValue* arrayProtoFuncConcat(ExecState*, JSObject*, const ArgList&);
-  JSValue* arrayProtoFuncJoin(ExecState*, JSObject*, const ArgList&);
-  JSValue* arrayProtoFuncPop(ExecState*, JSObject*, const ArgList&);
-  JSValue* arrayProtoFuncPush(ExecState*, JSObject*, const ArgList&);
-  JSValue* arrayProtoFuncReverse(ExecState*, JSObject*, const ArgList&);
-  JSValue* arrayProtoFuncShift(ExecState*, JSObject*, const ArgList&);
-  JSValue* arrayProtoFuncSlice(ExecState*, JSObject*, const ArgList&);
-  JSValue* arrayProtoFuncSort(ExecState*, JSObject*, const ArgList&);
-  JSValue* arrayProtoFuncSplice(ExecState*, JSObject*, const ArgList&);
-  JSValue* arrayProtoFuncUnShift(ExecState*, JSObject*, const ArgList&);
-  JSValue* arrayProtoFuncEvery(ExecState*, JSObject*, const ArgList&);
-  JSValue* arrayProtoFuncForEach(ExecState*, JSObject*, const ArgList&);
-  JSValue* arrayProtoFuncSome(ExecState*, JSObject*, const ArgList&);
-  JSValue* arrayProtoFuncIndexOf(ExecState*, JSObject*, const ArgList&);
-  JSValue* arrayProtoFuncFilter(ExecState*, JSObject*, const ArgList&);
-  JSValue* arrayProtoFuncMap(ExecState*, JSObject*, const ArgList&);
-  JSValue* arrayProtoFuncLastIndexOf(ExecState*, JSObject*, const ArgList&);
 
 } // namespace KJS

trunk/JavaScriptCore/kjs/BooleanObject.cpp

@@ -41 +41 @@
 
 // Functions
-static JSValue* booleanProtoFuncToString(ExecState*, JSObject*, const ArgList&);
-static JSValue* booleanProtoFuncValueOf(ExecState*, JSObject*, const ArgList&);
+static JSValue* booleanProtoFuncToString(ExecState*, JSObject*, JSValue*, const ArgList&);
+static JSValue* booleanProtoFuncValueOf(ExecState*, JSObject*, JSValue*, const ArgList&);
 
 // ECMA 15.6.4
@@ -60 +60 @@
 // ECMA 15.6.4.2 + 15.6.4.3
 
-JSValue* booleanProtoFuncToString(ExecState* exec, JSObject* thisObj, const ArgList&)
+JSValue* booleanProtoFuncToString(ExecState* exec, JSObject*, JSValue* thisValue, const ArgList&)
 {
-    if (!thisObj->inherits(&BooleanObject::info))
+    if (JSImmediate::isBoolean(thisValue))
+        return jsString(exec, JSImmediate::toString(thisValue));
+
+    if (!thisValue->isObject(&BooleanObject::info))
         return throwError(exec, TypeError);
 
-    JSValue* v = static_cast<BooleanObject*>(thisObj)->internalValue();
-    ASSERT(v);
+    return jsString(exec, JSImmediate::toString(static_cast<BooleanObject*>(thisValue)->internalValue()));
+}
 
-    return jsString(exec, v->toString(exec));
-}
-JSValue* booleanProtoFuncValueOf(ExecState* exec, JSObject* thisObj, const ArgList&)
+JSValue* booleanProtoFuncValueOf(ExecState* exec, JSObject*, JSValue* thisValue, const ArgList&)
 {
-    if (!thisObj->inherits(&BooleanObject::info))
+    if (JSImmediate::isBoolean(thisValue))
+        return thisValue;
+
+    if (!thisValue->isObject(&BooleanObject::info))
         return throwError(exec, TypeError);
 
-    JSValue* v = static_cast<BooleanObject*>(thisObj)->internalValue();
-    ASSERT(v);
-
-    // TODO: optimize for bool case
-    return jsBoolean(v->toBoolean(exec));
+    return static_cast<BooleanObject*>(thisValue)->internalValue();
 }
 
@@ -94 +94 @@
 }
 
-ConstructType BooleanConstructor::getConstructData(ConstructData&)
+// ECMA 15.6.2
+JSObject* constructBoolean(ExecState* exec, const ArgList& args)
 {
-    return ConstructTypeNative;
-}
-
-// ECMA 15.6.2
-JSObject* BooleanConstructor::construct(ExecState* exec, const ArgList& args)
-{
-    BooleanObject* obj(new (exec) BooleanObject(exec->lexicalGlobalObject()->booleanPrototype()));
+    BooleanObject* obj = new (exec) BooleanObject(exec->lexicalGlobalObject()->booleanPrototype());
     obj->setInternalValue(jsBoolean(args[0]->toBoolean(exec)));
     return obj;
 }
 
+static JSObject* constructWithBooleanConstructor(ExecState* exec, JSObject*, const ArgList& args)
+{
+    return constructBoolean(exec, args);
+}
+
+ConstructType BooleanConstructor::getConstructData(ConstructData& constructData)
+{
+    constructData.native.function = constructWithBooleanConstructor;
+    return ConstructTypeNative;
+}
+
 // ECMA 15.6.1
-JSValue* BooleanConstructor::callAsFunction(ExecState* exec, JSObject*, const ArgList& args)
+static JSValue* callBooleanConstructor(ExecState* exec, JSObject*, JSValue*, const ArgList& args)
 {
-    // TODO: optimize for bool case
     return jsBoolean(args[0]->toBoolean(exec));
 }
 
+CallType BooleanConstructor::getCallData(CallData& callData)
+{
+    callData.native.function = callBooleanConstructor;
+    return CallTypeNative;
+}
+
+JSObject* constructBooleanFromImmediateBoolean(ExecState* exec, JSValue* immediateBooleanValue)
+{
+    BooleanObject* obj = new (exec) BooleanObject(exec->lexicalGlobalObject()->booleanPrototype());
+    obj->setInternalValue(immediateBooleanValue);
+    return obj;
+}
+
 } // namespace KJS

trunk/JavaScriptCore/kjs/BooleanObject.h

@@ -54 +54 @@
     public:
         BooleanConstructor(ExecState*, FunctionPrototype*, BooleanPrototype*);
+    private:
+        virtual ConstructType getConstructData(ConstructData&);
+        virtual CallType getCallData(CallData&);
+    };
 
-        virtual ConstructType getConstructData(ConstructData&);
-        virtual JSObject* construct(ExecState*, const ArgList&);
-
-        virtual JSValue* callAsFunction(ExecState*, JSObject*, const ArgList&);
-    };
+    JSObject* constructBooleanFromImmediateBoolean(ExecState*, JSValue*);
+    JSObject* constructBoolean(ExecState*, const ArgList&);
 
 } // namespace KJS

trunk/JavaScriptCore/kjs/CallData.h

@@ -32 +32 @@
 namespace KJS {
 
+    class ArgList;
+    class ExecState;
     class FunctionBodyNode;
+    class JSObject;
+    class JSValue;
     class ScopeChainNode;
 
@@ -41 +45 @@
     };
 
+    typedef JSValue* (*NativeFunction)(ExecState*, JSObject*, JSValue* thisValue, const ArgList&);
+
     union CallData {
+        struct {
+            NativeFunction function;
+        } native;
         struct {
             FunctionBodyNode* functionBody;
@@ -48 +57 @@
     };
 
+    JSValue* call(ExecState*, JSValue* functionObject, CallType, const CallData&, JSValue* thisValue, const ArgList&);
+
 } // namespace KJS
 

trunk/JavaScriptCore/kjs/ConstructData.h

@@ -32 +32 @@
 namespace KJS {
 
+    class ArgList;
+    class ExecState;
     class FunctionBodyNode;
-    class ScopeChain;
+    class JSObject;
+    class JSValue;
+    class ScopeChainNode;
 
     enum ConstructType {
@@ -41 +45 @@
     };
 
+    typedef JSObject* (*NativeConstructor)(ExecState*, JSObject*, const ArgList&);
+
     union ConstructData {
+        struct {
+            NativeConstructor function;
+        } native;
         struct {
             FunctionBodyNode* functionBody;
@@ -48 +57 @@
     };
 
+    JSObject* construct(ExecState*, JSValue* constructor, ConstructType, const ConstructData&, const ArgList&);
+
 } // namespace KJS
 

trunk/JavaScriptCore/kjs/FunctionPrototype.cpp

@@ -39 +39 @@
 // ------------------------------ FunctionPrototype -------------------------
 
-static JSValue* functionProtoFuncToString(ExecState*, JSObject*, const ArgList&);
-static JSValue* functionProtoFuncApply(ExecState*, JSObject*, const ArgList&);
-static JSValue* functionProtoFuncCall(ExecState*, JSObject*, const ArgList&);
+static JSValue* functionProtoFuncToString(ExecState*, JSObject*, JSValue*, const ArgList&);
+static JSValue* functionProtoFuncApply(ExecState*, JSObject*, JSValue*, const ArgList&);
+static JSValue* functionProtoFuncCall(ExecState*, JSObject*, JSValue*, const ArgList&);
 
 FunctionPrototype::FunctionPrototype(ExecState* exec)
@@ -52 +52 @@
 }
 
+static JSValue* callFunctionPrototype(ExecState*, JSObject*, JSValue*, const ArgList&)
+{
+    return jsUndefined();
+}
+
 // ECMA 15.3.4
-JSValue* FunctionPrototype::callAsFunction(ExecState*, JSObject*, const ArgList&)
-{
-    return jsUndefined();
+CallType FunctionPrototype::getCallData(CallData& callData)
+{
+    callData.native.function = callFunctionPrototype;
+    return CallTypeNative;
 }
 
 // Functions
 
-JSValue* functionProtoFuncToString(ExecState* exec, JSObject* thisObj, const ArgList&)
-{
-    if (!thisObj || !thisObj->inherits(&InternalFunction::info)) {
-#ifndef NDEBUG
-        fprintf(stderr,"attempted toString() call on null or non-function object\n");
-#endif
+JSValue* functionProtoFuncToString(ExecState* exec, JSObject*, JSValue* thisValue, const ArgList&)
+{
+    if (!thisValue->isObject(&InternalFunction::info))
         return throwError(exec, TypeError);
-    }
-
-    if (thisObj->inherits(&JSFunction::info)) {
-        JSFunction* fi = static_cast<JSFunction*>(thisObj);
+
+    InternalFunction* function = static_cast<InternalFunction*>(thisValue);
+
+    if (function->inherits(&JSFunction::info)) {
+        JSFunction* fi = static_cast<JSFunction*>(thisValue);
         return jsString(exec, "function " + fi->functionName().ustring() + "(" + fi->body->paramString() + ") " + fi->body->toSourceString());
     }
 
-    return jsString(exec, "function " + static_cast<InternalFunction*>(thisObj)->functionName().ustring() + "() {\n    [native code]\n}");
-}
-
-JSValue* functionProtoFuncApply(ExecState* exec, JSObject* thisObj, const ArgList& args)
-{
-    if (!thisObj->implementsCall())
+    return jsString(exec, "function " + function->functionName().ustring() + "() {\n    [native code]\n}");
+}
+
+JSValue* functionProtoFuncApply(ExecState* exec, JSObject*, JSValue* thisValue, const ArgList& args)
+{
+    CallData callData;
+    CallType callType = thisValue->getCallData(callData);
+    if (callType == CallTypeNone)
         return throwError(exec, TypeError);
 
@@ -85 +91 @@
     JSValue* argArray = args[1];
 
-    JSObject* applyThis;
+    JSValue* applyThis;
     if (thisArg->isUndefinedOrNull())
         applyThis = exec->globalThisValue();
@@ -105 +111 @@
     }
 
-    return thisObj->callAsFunction(exec, applyThis, applyArgs);
-}
-
-JSValue* functionProtoFuncCall(ExecState* exec, JSObject* thisObj, const ArgList& args)
-{
-    if (!thisObj->implementsCall())
+    return call(exec, thisValue, callType, callData, applyThis, applyArgs);
+}
+
+JSValue* functionProtoFuncCall(ExecState* exec, JSObject*, JSValue* thisValue, const ArgList& args)
+{
+    CallData callData;
+    CallType callType = thisValue->getCallData(callData);
+    if (callType == CallTypeNone)
         return throwError(exec, TypeError);
 
@@ -123 +131 @@
     ArgList argsTail;
     args.getSlice(1, argsTail);
-    return thisObj->callAsFunction(exec, callThis, argsTail);
+    return call(exec, thisValue, callType, callData, callThis, argsTail);
 }
 
@@ -137 +145 @@
 }
 
-ConstructType FunctionConstructor::getConstructData(ConstructData&)
-{
+static JSObject* constructWithFunctionConstructor(ExecState* exec, JSObject*, const ArgList& args)
+{
+    return constructFunction(exec, args);
+}
+
+ConstructType FunctionConstructor::getConstructData(ConstructData& constructData)
+{
+    constructData.native.function = constructWithFunctionConstructor;
     return ConstructTypeNative;
 }
 
+static JSValue* callFunctionConstructor(ExecState* exec, JSObject*, JSValue*, const ArgList& args)
+{
+    return constructFunction(exec, args);
+}
+
+// ECMA 15.3.1 The Function Constructor Called as a Function
+CallType FunctionConstructor::getCallData(CallData& callData)
+{
+    callData.native.function = callFunctionConstructor;
+    return CallTypeNative;
+}
+
 // ECMA 15.3.2 The Function Constructor
-JSObject* FunctionConstructor::construct(ExecState* exec, const ArgList& args, const Identifier& functionName, const UString& sourceURL, int lineNumber)
+JSObject* constructFunction(ExecState* exec, const ArgList& args, const Identifier& functionName, const UString& sourceURL, int lineNumber)
 {
     UString p("");
@@ -175 +201 @@
     ScopeChain scopeChain(exec->lexicalGlobalObject(), exec->globalThisValue());
 
-    JSFunction* fimp = new (exec) JSFunction(exec, functionName, functionBody.get(), scopeChain.node());
+    JSFunction* function = new (exec) JSFunction(exec, functionName, functionBody.get(), scopeChain.node());
 
     // parse parameter list. throw syntax error on illegal identifiers
@@ -208 +234 @@
     }
   
-    JSObject* objCons = exec->lexicalGlobalObject()->objectConstructor();
-    JSObject* prototype = objCons->construct(exec, exec->emptyList());
-    prototype->putDirect(exec->propertyNames().constructor, fimp, DontEnum);
-    fimp->putDirect(exec->propertyNames().prototype, prototype, DontDelete);
-    return fimp;
+    JSObject* prototype = constructEmptyObject(exec);
+    prototype->putDirect(exec->propertyNames().constructor, function, DontEnum);
+    function->putDirect(exec->propertyNames().prototype, prototype, DontDelete);
+    return function;
 }
 
 // ECMA 15.3.2 The Function Constructor
-JSObject* FunctionConstructor::construct(ExecState* exec, const ArgList& args)
-{
-    return construct(exec, args, Identifier(exec, "anonymous"), UString(), 1);
-}
-
-// ECMA 15.3.1 The Function Constructor Called as a Function
-JSValue* FunctionConstructor::callAsFunction(ExecState* exec, JSObject*, const ArgList& args)
-{
-    return construct(exec, args);
+JSObject* constructFunction(ExecState* exec, const ArgList& args)
+{
+    return constructFunction(exec, args, Identifier(exec, "anonymous"), UString(), 1);
 }
 

trunk/JavaScriptCore/kjs/FunctionPrototype.h

@@ -38 +38 @@
     public:
         FunctionPrototype(ExecState*);
-
-        virtual JSValue* callAsFunction(ExecState*, JSObject*, const ArgList&);
+    private:
+        virtual CallType getCallData(CallData&);
     };
 
@@ -50 +50 @@
     public:
         FunctionConstructor(ExecState*, FunctionPrototype*);
+    private:
+        virtual ConstructType getConstructData(ConstructData&);
+        virtual CallType getCallData(CallData&);
+    };
 
-        virtual ConstructType getConstructData(ConstructData&);
-        virtual JSObject* construct(ExecState*, const ArgList&);
-        virtual JSObject* construct(ExecState*, const ArgList&, const Identifier& functionName, const UString& sourceURL, int lineNumber);
-
-        virtual JSValue* callAsFunction(ExecState*, JSObject*, const ArgList&);
-    };
+    JSObject* constructFunction(ExecState*, const ArgList&, const Identifier& functionName, const UString& sourceURL, int lineNumber);
+    JSObject* constructFunction(ExecState*, const ArgList&);
 
 } // namespace KJS

trunk/JavaScriptCore/kjs/JSArray.cpp

@@ -24 +24 @@
 #include "JSArray.h"
 
+#include "ArrayPrototype.h"
 #include "PropertyNameArray.h"
 #include <wtf/Assertions.h>
@@ -558 +559 @@
     Vector<AVLTreeNodeForArrayCompare> m_nodes;
     ExecState* m_exec;
-    JSObject* m_compareFunction;
-    JSObject* m_globalThisValue;
+    JSValue* m_compareFunction;
+    CallType m_compareCallType;
+    const CallData* m_compareCallData;
+    JSValue* m_globalThisValue;
 
     handle get_less(handle h) { return m_nodes[h].lt & 0x7FFFFFFF; }
@@ -596 +599 @@
         arguments.append(va);
         arguments.append(vb);
-        double compareResult = m_compareFunction->callAsFunction(m_exec, m_globalThisValue, arguments)->toNumber(m_exec);
+        double compareResult = call(m_exec, m_compareFunction, m_compareCallType, *m_compareCallData, m_globalThisValue, arguments)->toNumber(m_exec);
         return (compareResult < 0) ? -1 : 1; // Not passing equality through, because we need to store all values, even if equivalent.
     }
@@ -606 +609 @@
 };
 
-void JSArray::sort(ExecState* exec, JSObject* compareFunction)
+void JSArray::sort(ExecState* exec, JSValue* compareFunction, CallType callType, const CallData& callData)
 {
     checkConsistency();
@@ -626 +629 @@
     tree.abstractor().m_exec = exec;
     tree.abstractor().m_compareFunction = compareFunction;
+    tree.abstractor().m_compareCallType = callType;
+    tree.abstractor().m_compareCallData = &callData;
     tree.abstractor().m_globalThisValue = exec->globalThisValue();
     tree.abstractor().m_nodes.resize(usedVectorLength + (m_storage->m_sparseValueMap ? m_storage->m_sparseValueMap->size() : 0));
@@ -811 +816 @@
 #endif
 
-}
+JSArray* constructEmptyArray(ExecState* exec)
+{
+    return new (exec) JSArray(exec->lexicalGlobalObject()->arrayPrototype(), 0);
+}
+
+JSArray* constructEmptyArray(ExecState* exec, unsigned initialLength)
+{
+    return new (exec) JSArray(exec->lexicalGlobalObject()->arrayPrototype(), initialLength);
+}
+
+JSArray* constructArray(ExecState* exec, JSValue* singleItemValue)
+{
+    ArgList values;
+    values.append(singleItemValue);
+    return new (exec) JSArray(exec->lexicalGlobalObject()->arrayPrototype(), values);
+}
+
+JSArray* constructArray(ExecState* exec, const ArgList& values)
+{
+    return new (exec) JSArray(exec->lexicalGlobalObject()->arrayPrototype(), values);
+}
+
+}

trunk/JavaScriptCore/kjs/JSArray.h

@@ -33 +33 @@
     JSArray(JSObject* prototype, unsigned initialLength);
     JSArray(JSObject* prototype, const ArgList& initialValues);
-    ~JSArray();
+    virtual ~JSArray();
 
     virtual bool getOwnPropertySlot(ExecState*, const Identifier& propertyName, PropertySlot&);
     virtual bool getOwnPropertySlot(ExecState*, unsigned propertyName, PropertySlot&);
-    virtual void put(ExecState*, const Identifier& propertyName, JSValue*);
-    virtual void put(ExecState*, unsigned propertyName, JSValue*);
-    virtual bool deleteProperty(ExecState *, const Identifier& propertyName);
-    virtual bool deleteProperty(ExecState *, unsigned propertyName);
-    virtual void getPropertyNames(ExecState*, PropertyNameArray&);
+    virtual void put(ExecState*, unsigned propertyName, JSValue*); // FIXME: Make protected and add setItem.
 
-    virtual void mark();
-
-    virtual const ClassInfo* classInfo() const { return &info; }
     static const ClassInfo info;
 
     unsigned getLength() const { return m_length; }
+    void setLength(unsigned); // OK to use on new arrays, but not if it might be a RegExpMatchArray.
     JSValue* getItem(unsigned) const;
 
     void sort(ExecState*);
-    void sort(ExecState*, JSObject* compareFunction);
+    void sort(ExecState*, JSValue* compareFunction, CallType, const CallData&);
 
   protected:
+    virtual void put(ExecState*, const Identifier& propertyName, JSValue*);
+    virtual bool deleteProperty(ExecState*, const Identifier& propertyName);
+    virtual bool deleteProperty(ExecState*, unsigned propertyName);
+    virtual void getPropertyNames(ExecState*, PropertyNameArray&);
+    virtual void mark();
+
     void* lazyCreationData();
     void setLazyCreationData(void*);
 
   private:
+    using JSObject::get;
+
+    virtual const ClassInfo* classInfo() const { return &info; }
+
     static JSValue* lengthGetter(ExecState*, const Identifier&, const PropertySlot&);
     bool inlineGetOwnPropertySlot(ExecState*, unsigned propertyName, PropertySlot&);
 
-    void setLength(unsigned);
     bool increaseVectorLength(unsigned newLength);
     
@@ -75 +78 @@
   };
 
+  JSArray* constructEmptyArray(ExecState*);
+  JSArray* constructEmptyArray(ExecState*, unsigned initialLength);
+  JSArray* constructArray(ExecState*, JSValue* singleItemValue);
+  JSArray* constructArray(ExecState*, const ArgList& values);
+
 } // namespace KJS
 

trunk/JavaScriptCore/kjs/JSFunction.cpp

@@ -81 +81 @@
 }
 
-JSValue* JSFunction::callAsFunction(ExecState* exec, JSObject* thisObj, const ArgList& args)
+JSValue* JSFunction::call(ExecState* exec, JSValue* thisValue, const ArgList& args)
 {
     JSValue* exception = 0;
@@ -88 +88 @@
     if (!current->safeForReentry()) {
         stack->pushFunctionRegisterFile();
-        JSValue* result = exec->machine()->execute(body.get(), exec, this, thisObj, args, stack, _scope.node(), &exception);
+        JSValue* result = exec->machine()->execute(body.get(), exec, this, thisValue->toThisObject(exec), args, stack, _scope.node(), &exception);
         stack->popFunctionRegisterFile();
         exec->setException(exception);
         return result;
     } else {
-        JSValue* result = exec->machine()->execute(body.get(), exec, this, thisObj, args, stack, _scope.node(), &exception);
+        JSValue* result = exec->machine()->execute(body.get(), exec, this, thisValue->toThisObject(exec), args, stack, _scope.node(), &exception);
         current->setSafeForReentry(true);
         exec->setException(exception);
@@ -159 +159 @@
  * function f2(x, x): getParameterName(0) --> null
  */
-Identifier JSFunction::getParameterName(int index)
+const Identifier& JSFunction::getParameterName(int index)
 {
     Vector<Identifier>& parameters = body->parameters();
@@ -166 +166 @@
         return JSGlobalData::threadInstance().propertyNames->nullIdentifier;
   
-    Identifier name = parameters[index];
+    const Identifier& name = parameters[index];
 
     // Are there any subsequent parameters with the same name?
@@ -556 +556 @@
 }
 
-JSValue* globalFuncEval(ExecState* exec, PrototypeReflexiveFunction* function, JSObject* thisObj, const ArgList& args)
-{
-    JSGlobalObject* globalObject = thisObj->toGlobalObject(exec);
-
+JSValue* globalFuncEval(ExecState* exec, JSObject* function, JSValue* thisValue, const ArgList& args)
+{
+    JSObject* thisObject = thisValue->toThisObject(exec);
+    JSGlobalObject* globalObject = thisObject->toGlobalObject(exec);
     if (!globalObject || globalObject->evalFunction() != function)
         return throwError(exec, EvalError, "The \"this\" value passed to eval must be the global object from which eval originated");
@@ -579 +579 @@
 
     JSValue* exception = 0;
-    JSValue* value = exec->machine()->execute(evalNode.get(), exec, thisObj, &exec->dynamicGlobalObject()->registerFileStack(), globalObject->globalScopeChain().node(), &exception);
+    JSValue* value = exec->machine()->execute(evalNode.get(), exec, thisObject, &exec->dynamicGlobalObject()->registerFileStack(), globalObject->globalScopeChain().node(), &exception);
 
     if (exception) {
@@ -589 +589 @@
 }
 
-JSValue* globalFuncParseInt(ExecState* exec, JSObject*, const ArgList& args)
+JSValue* globalFuncParseInt(ExecState* exec, JSObject*, JSValue*, const ArgList& args)
 {
     return jsNumber(exec, parseInt(args[0]->toString(exec), args[1]->toInt32(exec)));
 }
 
-JSValue* globalFuncParseFloat(ExecState* exec, JSObject*, const ArgList& args)
+JSValue* globalFuncParseFloat(ExecState* exec, JSObject*, JSValue*, const ArgList& args)
 {
     return jsNumber(exec, parseFloat(args[0]->toString(exec)));
 }
 
-JSValue* globalFuncIsNaN(ExecState* exec, JSObject*, const ArgList& args)
+JSValue* globalFuncIsNaN(ExecState* exec, JSObject*, JSValue*, const ArgList& args)
 {
     return jsBoolean(isnan(args[0]->toNumber(exec)));
 }
 
-JSValue* globalFuncIsFinite(ExecState* exec, JSObject*, const ArgList& args)
+JSValue* globalFuncIsFinite(ExecState* exec, JSObject*, JSValue*, const ArgList& args)
 {
     double n = args[0]->toNumber(exec);
@@ -610 +610 @@
 }
 
-JSValue* globalFuncDecodeURI(ExecState* exec, JSObject*, const ArgList& args)
+JSValue* globalFuncDecodeURI(ExecState* exec, JSObject*, JSValue*, const ArgList& args)
 {
     static const char do_not_unescape_when_decoding_URI[] =
@@ -618 +618 @@
 }
 
-JSValue* globalFuncDecodeURIComponent(ExecState* exec, JSObject*, const ArgList& args)
+JSValue* globalFuncDecodeURIComponent(ExecState* exec, JSObject*, JSValue*, const ArgList& args)
 {
     return decode(exec, args, "", true);
 }
 
-JSValue* globalFuncEncodeURI(ExecState* exec, JSObject*, const ArgList& args)
+JSValue* globalFuncEncodeURI(ExecState* exec, JSObject*, JSValue*, const ArgList& args)
 {
     static const char do_not_escape_when_encoding_URI[] =
@@ -634 +634 @@
 }
 
-JSValue* globalFuncEncodeURIComponent(ExecState* exec, JSObject*, const ArgList& args)
+JSValue* globalFuncEncodeURIComponent(ExecState* exec, JSObject*, JSValue*, const ArgList& args)
 {
     static const char do_not_escape_when_encoding_URI_component[] =
@@ -645 +645 @@
 }
 
-JSValue* globalFuncEscape(ExecState* exec, JSObject*, const ArgList& args)
+JSValue* globalFuncEscape(ExecState* exec, JSObject*, JSValue*, const ArgList& args)
 {
     static const char do_not_escape[] =
@@ -674 +674 @@
 }
 
-JSValue* globalFuncUnescape(ExecState* exec, JSObject*, const ArgList& args)
+JSValue* globalFuncUnescape(ExecState* exec, JSObject*, JSValue*, const ArgList& args)
 {
     UString s = "", str = args[0]->toString(exec);
@@ -700 +700 @@
 
 #ifndef NDEBUG
-JSValue* globalFuncKJSPrint(ExecState* exec, JSObject*, const ArgList& args)
+JSValue* globalFuncKJSPrint(ExecState* exec, JSObject*, JSValue*, const ArgList& args)
 {
     CStringBuffer string;
@@ -711 +711 @@
 // ------------------------------ PrototypeFunction -------------------------------
 
-PrototypeFunction::PrototypeFunction(ExecState* exec, int len, const Identifier& name, JSMemberFunction function)
+PrototypeFunction::PrototypeFunction(ExecState* exec, int len, const Identifier& name, NativeFunction function)
     : InternalFunction(exec->lexicalGlobalObject()->functionPrototype(), name)
     , m_function(function)
@@ -719 +719 @@
 }
 
-PrototypeFunction::PrototypeFunction(ExecState* exec, FunctionPrototype* functionPrototype, int len, const Identifier& name, JSMemberFunction function)
+PrototypeFunction::PrototypeFunction(ExecState* exec, FunctionPrototype* functionPrototype, int len, const Identifier& name, NativeFunction function)
     : InternalFunction(functionPrototype, name)
     , m_function(function)
@@ -727 +727 @@
 }
 
-JSValue* PrototypeFunction::callAsFunction(ExecState* exec, JSObject* thisObj, const ArgList& args)
-{
-    return m_function(exec, thisObj, args);
+CallType PrototypeFunction::getCallData(CallData& callData)
+{
+    callData.native.function = m_function;
+    return CallTypeNative;
 }
 
 // ------------------------------ PrototypeReflexiveFunction -------------------------------
 
-PrototypeReflexiveFunction::PrototypeReflexiveFunction(ExecState* exec, FunctionPrototype* functionPrototype, int len, const Identifier& name, JSMemberFunction function, JSGlobalObject* cachedGlobalObject)
-    : InternalFunction(functionPrototype, name)
-    , m_function(function)
+GlobalEvalFunction::GlobalEvalFunction(ExecState* exec, FunctionPrototype* functionPrototype, int len, const Identifier& name, NativeFunction function, JSGlobalObject* cachedGlobalObject)
+    : PrototypeFunction(exec, functionPrototype, len, name, function)
     , m_cachedGlobalObject(cachedGlobalObject)
 {
-    ASSERT_ARG(function, function);
     ASSERT_ARG(cachedGlobalObject, cachedGlobalObject);
-    putDirect(exec->propertyNames().length, jsNumber(exec, len), DontDelete | ReadOnly | DontEnum);
-}
-
-JSValue* PrototypeReflexiveFunction::callAsFunction(ExecState* exec, JSObject* thisObj, const ArgList& args)
-{
-    return m_function(exec, this, thisObj, args);
-}
-
-void PrototypeReflexiveFunction::mark()
-{
-    InternalFunction::mark();
+}
+
+void GlobalEvalFunction::mark()
+{
+    PrototypeFunction::mark();
     if (!m_cachedGlobalObject->marked())
         m_cachedGlobalObject->mark();

trunk/JavaScriptCore/kjs/JSFunction.h

@@ -40 +40 @@
   class InternalFunction : public JSObject {
   public:
+    static const ClassInfo info;
+    virtual const ClassInfo* classInfo() const { return &info; }
+    const Identifier& functionName() const { return m_name; }
+
+  protected:
     InternalFunction();
     InternalFunction(FunctionPrototype*, const Identifier&);
 
-    virtual CallType getCallData(CallData&);
-
-    virtual JSValue* callAsFunction(ExecState*, JSObject* thisObjec, const ArgList& args) = 0;
+  private:
+    virtual CallType getCallData(CallData&) = 0;
     virtual bool implementsHasInstance() const;
 
-    virtual const ClassInfo* classInfo() const { return &info; }
-    static const ClassInfo info;
-    const Identifier& functionName() const { return m_name; }
-
-  private:
     Identifier m_name;
   };
@@ -64 +63 @@
     virtual bool deleteProperty(ExecState*, const Identifier& propertyName);
 
-    virtual ConstructType getConstructData(ConstructData&);
-    virtual JSObject* construct(ExecState*, const ArgList& args);
+    JSObject* construct(ExecState*, const ArgList&);
+    JSValue* call(ExecState*, JSValue* thisValue, const ArgList&);
 
-    virtual CallType getCallData(CallData&);
-    virtual JSValue* callAsFunction(ExecState*, JSObject* thisObj, const ArgList& args);
+    // Note: Returns a null identifier for any parameters that will never get set
+    // due to a later parameter with the same name.
+    const Identifier& getParameterName(int index);
 
-    // Note: unlike body->paramName, this returns Identifier::null for parameters 
-    // that will never get set, due to later param having the same name
-    Identifier getParameterName(int index);
-
-    virtual const ClassInfo* classInfo() const { return &info; }
     static const ClassInfo info;
 
@@ -85 +80 @@
 
   private:
+    virtual const ClassInfo* classInfo() const { return &info; }
+    virtual ConstructType getConstructData(ConstructData&);
+    virtual CallType getCallData(CallData&);
+
     ScopeChain _scope;
 
@@ -94 +93 @@
   class IndexToNameMap {
   public:
-    IndexToNameMap(JSFunction*, const ArgList& args);
+    IndexToNameMap(JSFunction*, const ArgList&);
     ~IndexToNameMap();
     
@@ -124 +123 @@
   class PrototypeFunction : public InternalFunction {
   public:
-    typedef JSValue* (*JSMemberFunction)(ExecState*, JSObject* thisObj, const ArgList&);
-
-    PrototypeFunction(ExecState*, int len, const Identifier&, JSMemberFunction);
-    PrototypeFunction(ExecState*, FunctionPrototype*, int len, const Identifier&, JSMemberFunction);
-
-    virtual JSValue* callAsFunction(ExecState* exec, JSObject* thisObj, const ArgList&);
+    PrototypeFunction(ExecState*, int len, const Identifier&, NativeFunction);
+    PrototypeFunction(ExecState*, FunctionPrototype*, int len, const Identifier&, NativeFunction);
 
   private:
-    const JSMemberFunction m_function;
+    virtual CallType getCallData(CallData&);
+
+    const NativeFunction m_function;
   };
 
+    class GlobalEvalFunction : public PrototypeFunction {
+    public:
+        GlobalEvalFunction(ExecState*, FunctionPrototype*, int len, const Identifier&, NativeFunction, JSGlobalObject* expectedThisObject);
+        JSGlobalObject* cachedGlobalObject() const { return m_cachedGlobalObject; }
 
-  // Just like PrototypeFunction, but callbacks also get passed the JS function object.
-  class PrototypeReflexiveFunction : public InternalFunction {
-  public:
-    typedef JSValue* (*JSMemberFunction)(ExecState*, PrototypeReflexiveFunction*, JSObject* thisObj, const ArgList&);
+    private:
+        virtual void mark();
 
-    PrototypeReflexiveFunction(ExecState*, FunctionPrototype*, int len, const Identifier&, JSMemberFunction, JSGlobalObject* expectedThisObject);
-
-    virtual void mark();
-    virtual JSValue* callAsFunction(ExecState* exec, JSObject* thisObj, const ArgList&);
-
-    JSGlobalObject* cachedGlobalObject() const { return m_cachedGlobalObject; }
-
-  private:
-    const JSMemberFunction m_function;
-    JSGlobalObject* m_cachedGlobalObject;
-  };
+        JSGlobalObject* m_cachedGlobalObject;
+    };
 
     // Global Functions
-    JSValue* globalFuncEval(ExecState*, PrototypeReflexiveFunction*, JSObject*, const ArgList&);
-    JSValue* globalFuncParseInt(ExecState*, JSObject*, const ArgList&);
-    JSValue* globalFuncParseFloat(ExecState*, JSObject*, const ArgList&);
-    JSValue* globalFuncIsNaN(ExecState*, JSObject*, const ArgList&);
-    JSValue* globalFuncIsFinite(ExecState*, JSObject*, const ArgList&);
-    JSValue* globalFuncDecodeURI(ExecState*, JSObject*, const ArgList&);
-    JSValue* globalFuncDecodeURIComponent(ExecState*, JSObject*, const ArgList&);
-    JSValue* globalFuncEncodeURI(ExecState*, JSObject*, const ArgList&);
-    JSValue* globalFuncEncodeURIComponent(ExecState*, JSObject*, const ArgList&);
-    JSValue* globalFuncEscape(ExecState*, JSObject*, const ArgList&);
-    JSValue* globalFuncUnescape(ExecState*, JSObject*, const ArgList&);
+    JSValue* globalFuncEval(ExecState*, JSObject*, JSValue*, const ArgList&);
+    JSValue* globalFuncParseInt(ExecState*, JSObject*, JSValue*, const ArgList&);
+    JSValue* globalFuncParseFloat(ExecState*, JSObject*, JSValue*, const ArgList&);
+    JSValue* globalFuncIsNaN(ExecState*, JSObject*, JSValue*, const ArgList&);
+    JSValue* globalFuncIsFinite(ExecState*, JSObject*, JSValue*, const ArgList&);
+    JSValue* globalFuncDecodeURI(ExecState*, JSObject*, JSValue*, const ArgList&);
+    JSValue* globalFuncDecodeURIComponent(ExecState*, JSObject*, JSValue*, const ArgList&);
+    JSValue* globalFuncEncodeURI(ExecState*, JSObject*, JSValue*, const ArgList&);
+    JSValue* globalFuncEncodeURIComponent(ExecState*, JSObject*, JSValue*, const ArgList&);
+    JSValue* globalFuncEscape(ExecState*, JSObject*, JSValue*, const ArgList&);
+    JSValue* globalFuncUnescape(ExecState*, JSObject*, JSValue*, const ArgList&);
 #ifndef NDEBUG
-    JSValue* globalFuncKJSPrint(ExecState*, JSObject*, const ArgList&);
+    JSValue* globalFuncKJSPrint(ExecState*, JSObject*, JSValue*, const ArgList&);
 #endif
 

trunk/JavaScriptCore/kjs/JSGlobalObject.cpp

@@ -213 +213 @@
 
     // Constructors
-    d()->objectConstructor = 0;
-    d()->functionConstructor = 0;
-    d()->arrayConstructor = 0;
-    d()->stringConstructor = 0;
-    d()->booleanConstructor = 0;
-    d()->numberConstructor = 0;
-    d()->dateConstructor = 0;
     d()->regExpConstructor = 0;
     d()->errorConstructor = 0;
@@ -235 +228 @@
 
     // Prototypes
+
     d()->functionPrototype = new (exec) FunctionPrototype(exec);
     d()->objectPrototype = new (exec) ObjectPrototype(exec, d()->functionPrototype);
@@ -255 +249 @@
 
     // Constructors
-    d()->objectConstructor = new (exec) ObjectConstructor(exec, d()->objectPrototype, d()->functionPrototype);
-    d()->functionConstructor = new (exec) FunctionConstructor(exec, d()->functionPrototype);
-    d()->arrayConstructor = new (exec) ArrayConstructor(exec, d()->functionPrototype, d()->arrayPrototype);
-    d()->stringConstructor = new (exec) StringConstructor(exec, d()->functionPrototype, d()->stringPrototype);
-    d()->booleanConstructor = new (exec) BooleanConstructor(exec, d()->functionPrototype, d()->booleanPrototype);
-    d()->numberConstructor = new (exec) NumberConstructor(exec, d()->functionPrototype, d()->numberPrototype);
-    d()->dateConstructor = new (exec) DateConstructor(exec, d()->functionPrototype, d()->datePrototype);
+
+    JSValue* objectConstructor = new (exec) ObjectConstructor(exec, d()->objectPrototype, d()->functionPrototype);
+    JSValue* functionConstructor = new (exec) FunctionConstructor(exec, d()->functionPrototype);
+    JSValue* arrayConstructor = new (exec) ArrayConstructor(exec, d()->functionPrototype, d()->arrayPrototype);
+    JSValue* stringConstructor = new (exec) StringConstructor(exec, d()->functionPrototype, d()->stringPrototype);
+    JSValue* booleanConstructor = new (exec) BooleanConstructor(exec, d()->functionPrototype, d()->booleanPrototype);
+    JSValue* numberConstructor = new (exec) NumberConstructor(exec, d()->functionPrototype, d()->numberPrototype);
+    JSValue* dateConstructor = new (exec) DateConstructor(exec, d()->functionPrototype, d()->datePrototype);
+
     d()->regExpConstructor = new (exec) RegExpConstructor(exec, d()->functionPrototype, d()->regExpPrototype);
+
     d()->errorConstructor = new (exec) ErrorConstructor(exec, d()->functionPrototype, d()->errorPrototype);
     
@@ -272 +269 @@
     d()->URIErrorConstructor = new (exec) NativeErrorConstructor(exec, d()->functionPrototype, d()->URIErrorPrototype);
     
-    d()->functionPrototype->putDirect(exec->propertyNames().constructor, d()->functionConstructor, DontEnum);
-
-    d()->objectPrototype->putDirect(exec->propertyNames().constructor, d()->objectConstructor, DontEnum);
-    d()->functionPrototype->putDirect(exec->propertyNames().constructor, d()->functionConstructor, DontEnum);
-    d()->arrayPrototype->putDirect(exec->propertyNames().constructor, d()->arrayConstructor, DontEnum);
-    d()->booleanPrototype->putDirect(exec->propertyNames().constructor, d()->booleanConstructor, DontEnum);
-    d()->stringPrototype->putDirect(exec->propertyNames().constructor, d()->stringConstructor, DontEnum);
-    d()->numberPrototype->putDirect(exec->propertyNames().constructor, d()->numberConstructor, DontEnum);
-    d()->datePrototype->putDirect(exec->propertyNames().constructor, d()->dateConstructor, DontEnum);
+    d()->functionPrototype->putDirect(exec->propertyNames().constructor, functionConstructor, DontEnum);
+
+    d()->objectPrototype->putDirect(exec->propertyNames().constructor, objectConstructor, DontEnum);
+    d()->functionPrototype->putDirect(exec->propertyNames().constructor, functionConstructor, DontEnum);
+    d()->arrayPrototype->putDirect(exec->propertyNames().constructor, arrayConstructor, DontEnum);
+    d()->booleanPrototype->putDirect(exec->propertyNames().constructor, booleanConstructor, DontEnum);
+    d()->stringPrototype->putDirect(exec->propertyNames().constructor, stringConstructor, DontEnum);
+    d()->numberPrototype->putDirect(exec->propertyNames().constructor, numberConstructor, DontEnum);
+    d()->datePrototype->putDirect(exec->propertyNames().constructor, dateConstructor, DontEnum);
     d()->regExpPrototype->putDirect(exec->propertyNames().constructor, d()->regExpConstructor, DontEnum);
     d()->errorPrototype->putDirect(exec->propertyNames().constructor, d()->errorConstructor, DontEnum);
@@ -294 +291 @@
     // FIXME: These properties could be handled by a static hash table.
 
-    putDirect(Identifier(exec, "Object"), d()->objectConstructor, DontEnum);
-    putDirect(Identifier(exec, "Function"), d()->functionConstructor, DontEnum);
-    putDirect(Identifier(exec, "Array"), d()->arrayConstructor, DontEnum);
-    putDirect(Identifier(exec, "Boolean"), d()->booleanConstructor, DontEnum);
-    putDirect(Identifier(exec, "String"), d()->stringConstructor, DontEnum);
-    putDirect(Identifier(exec, "Number"), d()->numberConstructor, DontEnum);
-    putDirect(Identifier(exec, "Date"), d()->dateConstructor, DontEnum);
+    putDirect(Identifier(exec, "Object"), objectConstructor, DontEnum);
+    putDirect(Identifier(exec, "Function"), functionConstructor, DontEnum);
+    putDirect(Identifier(exec, "Array"), arrayConstructor, DontEnum);
+    putDirect(Identifier(exec, "Boolean"), booleanConstructor, DontEnum);
+    putDirect(Identifier(exec, "String"), stringConstructor, DontEnum);
+    putDirect(Identifier(exec, "Number"), numberConstructor, DontEnum);
+    putDirect(Identifier(exec, "Date"), dateConstructor, DontEnum);
     putDirect(Identifier(exec, "RegExp"), d()->regExpConstructor, DontEnum);
     putDirect(Identifier(exec, "Error"), d()->errorConstructor, DontEnum);
@@ -322 +319 @@
     // Set global functions.
 
-    d()->evalFunction = new (exec) PrototypeReflexiveFunction(exec, d()->functionPrototype, 1, exec->propertyNames().eval, globalFuncEval, this);
+    d()->evalFunction = new (exec) GlobalEvalFunction(exec, d()->functionPrototype, 1, exec->propertyNames().eval, globalFuncEval, this);
     putDirectFunction(d()->evalFunction, DontEnum);
     putDirectFunction(new (exec) PrototypeFunction(exec, d()->functionPrototype, 2, Identifier(exec, "parseInt"), globalFuncParseInt), DontEnum);
@@ -416 +413 @@
     markIfNeeded(d()->globalExec->exception());
 
-    markIfNeeded(d()->objectConstructor);
-    markIfNeeded(d()->functionConstructor);
-    markIfNeeded(d()->arrayConstructor);
-    markIfNeeded(d()->booleanConstructor);
-    markIfNeeded(d()->stringConstructor);
-    markIfNeeded(d()->numberConstructor);
-    markIfNeeded(d()->dateConstructor);
     markIfNeeded(d()->regExpConstructor);
     markIfNeeded(d()->errorConstructor);

trunk/JavaScriptCore/kjs/JSGlobalObject.h

@@ -33 +33 @@
 namespace KJS {
 
-    class ArrayConstructor;
     class ArrayPrototype;
-    class BooleanConstructor;
     class BooleanPrototype;
-    class DateConstructor;
     class DatePrototype;
     class Debugger;
@@ -44 +41 @@
     class EvalError;
     class EvalErrorPrototype;
-    class FunctionConstructor;
     class FunctionPrototype;
-    struct HashTable;
+    class GlobalEvalFunction;
     class JSGlobalObject;
     class NativeErrorConstructor;
     class NativeErrorPrototype;
-    class NumberConstructor;
     class NumberPrototype;
-    class ObjectConstructor;
     class ObjectPrototype;
     class ProgramCodeBlock;
-    class PrototypeReflexiveFunction;
     class RangeError;
     class RangeErrorPrototype;
@@ -65 +58 @@
     class RuntimeMethod;
     class ScopeChain;
-    class StringConstructor;
     class StringPrototype;
     class SyntaxErrorPrototype;
@@ -72 +64 @@
     class UriError;
     class UriErrorPrototype;
+
     struct ActivationStackNode;
+    struct HashTable;
 
     typedef Vector<ExecState*, 16> ExecStateStack;
@@ -105 +99 @@
             unsigned ticksUntilNextTimeoutCheck;
 
-            ObjectConstructor* objectConstructor;
-            FunctionConstructor* functionConstructor;
-            ArrayConstructor* arrayConstructor;
-            BooleanConstructor* booleanConstructor;
-            StringConstructor* stringConstructor;
-            NumberConstructor* numberConstructor;
-            DateConstructor* dateConstructor;
             RegExpConstructor* regExpConstructor;
             ErrorConstructor* errorConstructor;
@@ -121 +108 @@
             NativeErrorConstructor* URIErrorConstructor;
 
-            PrototypeReflexiveFunction* evalFunction;
+            GlobalEvalFunction* evalFunction;
 
             ObjectPrototype* objectPrototype;
@@ -157 +144 @@
 
     protected:
-        JSGlobalObject(JSValue* proto, JSObject* globalThisValue)
-            : JSVariableObject(proto, new JSGlobalObjectData(this, globalThisValue))
+        JSGlobalObject(JSValue* prototype, JSObject* globalThisValue)
+            : JSVariableObject(prototype, new JSGlobalObjectData(this, globalThisValue))
         {
             init(globalThisValue);
@@ -187 +174 @@
         // replaces the global object's associated property.
 
-        ObjectConstructor* objectConstructor() const { return d()->objectConstructor; }
-        FunctionConstructor* functionConstructor() const { return d()->functionConstructor; }
-        ArrayConstructor* arrayConstructor() const { return d()->arrayConstructor; }
-        BooleanConstructor* booleanConstructor() const { return d()->booleanConstructor; }
-        StringConstructor* stringConstructor() const{ return d()->stringConstructor; }
-        NumberConstructor* numberConstructor() const{ return d()->numberConstructor; }
-        DateConstructor* dateConstructor() const{ return d()->dateConstructor; }
         RegExpConstructor* regExpConstructor() const { return d()->regExpConstructor; }
+
         ErrorConstructor* errorConstructor() const { return d()->errorConstructor; }
         NativeErrorConstructor* evalErrorConstructor() const { return d()->evalErrorConstructor; }
@@ -203 +184 @@
         NativeErrorConstructor* URIErrorConstructor() const { return d()->URIErrorConstructor; }
 
-        PrototypeReflexiveFunction* evalFunction() const { return d()->evalFunction; }
+        GlobalEvalFunction* evalFunction() const { return d()->evalFunction; }
 
         ObjectPrototype* objectPrototype() const { return d()->objectPrototype; }

trunk/JavaScriptCore/kjs/JSImmediate.cpp

@@ -30 +30 @@
 namespace KJS {
 
-JSObject *JSImmediate::toObject(const JSValue *v, ExecState *exec)
+JSObject* JSImmediate::toObject(const JSValue *v, ExecState *exec)
 {
     ASSERT(isImmediate(v));
     if (v == jsNull())
         return new (exec) JSNotAnObject(throwError(exec, TypeError, "Null value"));
-    else if (v == jsUndefined())
+    if (v == jsUndefined())
         return new (exec) JSNotAnObject(throwError(exec, TypeError, "Undefined value"));
-    else if (isBoolean(v)) {
-        ArgList args;
-        args.append(const_cast<JSValue *>(v));
-        return exec->lexicalGlobalObject()->booleanConstructor()->construct(exec, args);
-    } else {
-        ASSERT(isNumber(v));
-        ArgList args;
-        args.append(const_cast<JSValue *>(v));
-        return exec->lexicalGlobalObject()->numberConstructor()->construct(exec, args);
-    }
+    if (isBoolean(v))
+        return constructBooleanFromImmediateBoolean(exec, const_cast<JSValue*>(v));
+    ASSERT(isNumber(v));
+    return constructNumberFromImmediateNumber(exec, const_cast<JSValue*>(v));
 }
 

trunk/JavaScriptCore/kjs/JSNotAnObject.cpp

@@ -127 +127 @@
 }
 
-JSValue* JSNotAnObject::defaultValue(ExecState* exec, JSType) const
-{
-    UNUSED_PARAM(exec);
-    ASSERT(exec->hadException() && exec->exception() == m_exception);
-    return m_exception;
-}
-
-JSObject* JSNotAnObject::construct(ExecState* exec, const ArgList&)
-{
-    UNUSED_PARAM(exec);
-    ASSERT(exec->hadException() && exec->exception() == m_exception);
-    return m_exception;
-}
-
-JSObject* JSNotAnObject::construct(ExecState* exec, const ArgList&, const Identifier&, const UString&, int)
-{
-    UNUSED_PARAM(exec);
-    ASSERT(exec->hadException() && exec->exception() == m_exception);
-    return m_exception;
-}
-
-JSValue* JSNotAnObject::callAsFunction(ExecState* exec, JSObject*, const ArgList&)
-{
-    UNUSED_PARAM(exec);
-    ASSERT(exec->hadException() && exec->exception() == m_exception);
-    return m_exception;
-}
-
 void JSNotAnObject::getPropertyNames(ExecState* exec, PropertyNameArray&)
 {

trunk/JavaScriptCore/kjs/JSNotAnObject.h

@@ -44 +44 @@
         }
 
-        // JSValue methods
+     private:
+       // JSValue methods
         virtual JSValue* toPrimitive(ExecState*, JSType preferredType = UnspecifiedType) const;
         virtual bool getPrimitiveNumber(ExecState*, double& number, JSValue*&);
@@ -65 +66 @@
         virtual bool deleteProperty(ExecState*, unsigned propertyName);
 
-        virtual JSValue* defaultValue(ExecState*, JSType hint) const;
-
-        virtual JSObject* construct(ExecState*, const ArgList&);
-        virtual JSObject* construct(ExecState*, const ArgList&, const Identifier& functionName, const UString& sourceURL, int lineNumber);
-
-        virtual JSValue* callAsFunction(ExecState*, JSObject* thisObj, const ArgList&);
-
         virtual void getPropertyNames(ExecState*, PropertyNameArray&);
 
-    private:
         JSObject* m_exception;
     };

trunk/JavaScriptCore/kjs/JSObject.cpp

@@ -70 +70 @@
 }
 
-const ClassInfo *JSObject::classInfo() const
-{
-  return 0;
-}
-
 UString JSObject::className() const
 {
@@ -94 +89 @@
 
 // ECMA 8.6.2.2
-void JSObject::put(ExecState* exec, const Identifier &propertyName, JSValue *value)
+void JSObject::put(ExecState* exec, const Identifier& propertyName, JSValue* value)
 {
   ASSERT(value);
@@ -102 +97 @@
     JSObject* proto = value->getObject();
 
-    // Setting __proto__ to a non-object, non-null value is silently ignored to match Mozilla
+    // Setting __proto__ to a non-object, non-null value is silently ignored to match Mozilla.
     if (!proto && value != jsNull())
       return;
@@ -113 +108 @@
       proto = proto->prototype() ? proto->prototype()->getObject() : 0;
     }
-    
+
     setPrototype(value);
     return;
@@ -119 +114 @@
 
   // Check if there are any setters or getters in the prototype chain
-  JSObject *obj = this;
-  bool hasGettersOrSetters = false;
-  while (true) {
-    if (obj->_prop.hasGetterSetterProperties()) {
-      hasGettersOrSetters = true;
+  JSObject* obj;
+  JSValue* prototype;
+  for (obj = this; !obj->_prop.hasGetterSetterProperties(); obj = static_cast<JSObject*>(prototype)) {
+    prototype = obj->_proto;
+    if (prototype == jsNull()) {
+      _prop.put(propertyName, value, 0, true);
+      return;
+    }
+  }
+
+  unsigned attributes;
+  if (_prop.get(propertyName, attributes) && attributes & ReadOnly)
+    return;
+
+  for (; ; obj = static_cast<JSObject*>(prototype)) {
+    if (JSValue* gs = obj->_prop.get(propertyName, attributes)) {
+      if (attributes & IsGetterSetter) {
+        JSObject* setterFunc = static_cast<GetterSetter*>(gs)->setter();        
+        if (!setterFunc) {
+          throwSetterError(exec);
+          return;
+        }
+
+        CallData callData;
+        CallType callType = setterFunc->getCallData(callData);
+        ArgList args;
+        args.append(value);
+        call(exec, setterFunc, callType, callData, this, args);
+        return;
+      }
+
+      // If there's an existing property on the object or one of its 
+      // prototypes it should be replaced, so break here.
       break;
     }
-      
-    if (obj->_proto == jsNull())
+
+    prototype = obj->_proto;
+    if (prototype == jsNull())
       break;
-      
-    obj = static_cast<JSObject *>(obj->_proto);
   }
-  
-  if (hasGettersOrSetters) {
-    unsigned attributes;
-    if (_prop.get(propertyName, attributes) && attributes & ReadOnly)
-        return;
-
-    obj = this;
-    while (true) {
-      if (JSValue *gs = obj->_prop.get(propertyName, attributes)) {
-        if (attributes & IsGetterSetter) {
-          JSObject *setterFunc = static_cast<GetterSetter *>(gs)->getSetter();
-        
-          if (!setterFunc) {
-            throwSetterError(exec);
-            return;
-          }
-            
-          ArgList args;
-          args.append(value);
-        
-          setterFunc->callAsFunction(exec, this->toThisObject(exec), args);
-          return;
-        } else {
-          // If there's an existing property on the object or one of its 
-          // prototype it should be replaced, so we just break here.
-          break;
-        }
-      }
-     
-      if (!obj->_proto->isObject())
-        break;
-        
-      obj = static_cast<JSObject *>(obj->_proto);
-    }
-  }
-  
+
   _prop.put(propertyName, value, 0, true);
 }
@@ -231 +218 @@
 }
 
-static ALWAYS_INLINE JSValue *tryGetAndCallProperty(ExecState *exec, const JSObject *object, const Identifier &propertyName) {
-  JSValue* v = object->get(exec, propertyName);
-  if (v->isObject()) {
-      JSObject* o = static_cast<JSObject*>(v);
-      CallData data;
-      CallType callType = o->getCallData(data);
-      // spec says "not primitive type" but ...
-      if (callType != CallTypeNone) {
-          JSObject* thisObj = const_cast<JSObject*>(object);
-          JSValue* def = o->callAsFunction(exec, thisObj->toThisObject(exec), exec->emptyList());
-          JSType defType = def->type();
-          ASSERT(defType != GetterSetterType);
-          if (defType != ObjectType)
-              return def;
-    }
-  }
-  return NULL;
+static ALWAYS_INLINE JSValue* callDefaultValueFunction(ExecState* exec, const JSObject* object, const Identifier& propertyName)
+{
+    JSValue* function = object->get(exec, propertyName);
+    CallData callData;
+    CallType callType = function->getCallData(callData);
+    if (callType == CallTypeNone)
+        return 0;
+    JSValue* result = call(exec, function, callType, callData, const_cast<JSObject*>(object), exec->emptyList());
+    ASSERT(result->type() != GetterSetterType);
+    if (exec->hadException())
+        return exec->exception();
+    if (result->isObject())
+        return 0;
+    return result;
 }
 
@@ -260 +244 @@
 JSValue* JSObject::defaultValue(ExecState* exec, JSType hint) const
 {
-  // We need this check to guard against the case where this object is rhs of
-  // a binary expression where lhs threw an exception in its conversion to
-  // primitive
-  if (exec->hadException())
-    return exec->exception();
-  /* Prefer String for Date objects */
-  if ((hint == StringType) || (hint != NumberType && _proto == exec->lexicalGlobalObject()->datePrototype())) {
-    if (JSValue* v = tryGetAndCallProperty(exec, this, exec->propertyNames().toString))
-      return v;
-    if (JSValue* v = tryGetAndCallProperty(exec, this, exec->propertyNames().valueOf))
-      return v;
-  } else {
-    if (JSValue* v = tryGetAndCallProperty(exec, this, exec->propertyNames().valueOf))
-      return v;
-    if (JSValue* v = tryGetAndCallProperty(exec, this, exec->propertyNames().toString))
-      return v;
-  }
-
-  if (exec->hadException())
-    return exec->exception();
-
-  return throwError(exec, TypeError, "No default value");
+    // We need this check to guard against the case where this object is rhs of
+    // a binary expression where lhs threw an exception in its conversion to
+    // primitive.
+    if (exec->hadException())
+        return exec->exception();
+
+    // Must call toString first for Date objects.
+    if ((hint == StringType) || (hint != NumberType && _proto == exec->lexicalGlobalObject()->datePrototype())) {
+        if (JSValue* value = callDefaultValueFunction(exec, this, exec->propertyNames().toString))
+            return value;
+        if (JSValue* value = callDefaultValueFunction(exec, this, exec->propertyNames().valueOf))
+            return value;
+    } else {
+        if (JSValue* value = callDefaultValueFunction(exec, this, exec->propertyNames().valueOf))
+            return value;
+        if (JSValue* value = callDefaultValueFunction(exec, this, exec->propertyNames().toString))
+            return value;
+    }
+
+    ASSERT(!exec->hadException());
+
+    return throwError(exec, TypeError, "No default value");
 }
 
@@ -335 +319 @@
             if (v->type() != GetterSetterType)
                 return jsUndefined();
-            JSObject* funcObj = static_cast<GetterSetter*>(v)->getGetter();
+            JSObject* funcObj = static_cast<GetterSetter*>(v)->getter();
             if (!funcObj)
                 return jsUndefined();
@@ -355 +339 @@
             if (v->type() != GetterSetterType)
                 return jsUndefined();
-            JSObject* funcObj = static_cast<GetterSetter*>(v)->getSetter();
+            JSObject* funcObj = static_cast<GetterSetter*>(v)->setter();
             if (!funcObj)
                 return jsUndefined();
@@ -367 +351 @@
 }
 
-JSObject* JSObject::construct(ExecState*, const ArgList& /*args*/)
-{
-  ASSERT(false);
-  return NULL;
-}
-
-JSObject* JSObject::construct(ExecState* exec, const ArgList& args, const Identifier& /*functionName*/, const UString& /*sourceURL*/, int /*lineNumber*/)
-{
-  return construct(exec, args);
-}
-
-bool JSObject::implementsCall()
-{
-    CallData callData;
-    return getCallData(callData) != CallTypeNone;
-}
-
-JSValue *JSObject::callAsFunction(ExecState* /*exec*/, JSObject* /*thisObj*/, const ArgList &/*args*/)
-{
-  ASSERT(false);
-  return NULL;
-}
-
 bool JSObject::implementsHasInstance() const
 {
@@ -399 +360 @@
     JSValue* proto = get(exec, exec->propertyNames().prototype);
     if (!proto->isObject()) {
-        throwError(exec, TypeError, "intanceof called on an object with an invalid prototype property.");
+        throwError(exec, TypeError, "instanceof called on an object with an invalid prototype property.");
         return false;
     }
@@ -508 +469 @@
 }
 
-void JSObject::fillGetterPropertySlot(PropertySlot& slot, JSValue **location)
-{
-    GetterSetter *gs = static_cast<GetterSetter *>(*location);
-    JSObject *getterFunc = gs->getGetter();
-    if (getterFunc)
+void JSObject::fillGetterPropertySlot(PropertySlot& slot, JSValue** location)
+{
+    if (JSObject* getterFunc = static_cast<GetterSetter*>(*location)->getter())
         slot.setGetterSlot(getterFunc);
     else
@@ -561 +520 @@
   else
     args.append(jsString(exec, message));
-  JSObject *err = static_cast<JSObject *>(cons->construct(exec,args));
+  ConstructData constructData;
+  ConstructType constructType = cons->getConstructData(constructData);
+  JSObject* err = construct(exec, cons, constructType, constructData, args);
 
   if (lineno != -1)
@@ -607 +568 @@
 }
 
+JSObject* constructEmptyObject(ExecState* exec)
+{
+    return new (exec) JSObject(exec->lexicalGlobalObject()->objectPrototype());
+}
+
 } // namespace KJS

trunk/JavaScriptCore/kjs/JSObject.h

@@ -85 +85 @@
     JSType type() const { return GetterSetterType; }
       
-    GetterSetter() : getter(0), setter(0) { }
-      
-    virtual JSValue* toPrimitive(ExecState*, JSType preferred = UnspecifiedType) const;
-    virtual bool getPrimitiveNumber(ExecState*, double& number, JSValue*& value);
-    virtual bool toBoolean(ExecState *exec) const;
-    virtual double toNumber(ExecState *exec) const;
-    virtual UString toString(ExecState *exec) const;
-    virtual JSObject *toObject(ExecState *exec) const;
+    GetterSetter() : m_getter(0), m_setter(0) { }
       
     virtual void mark();
       
-    JSObject *getGetter() { return getter; }
-    void setGetter(JSObject *g) { getter = g; }
-    JSObject *getSetter() { return setter; }
-    void setSetter(JSObject *s) { setter = s; }
+    JSObject* getter() const { return m_getter; }
+    void setGetter(JSObject* getter) { m_getter = getter; }
+    JSObject* setter() const { return m_setter; }
+    void setSetter(JSObject* setter) { m_setter = setter; }
       
   private:
-    // Object operations, with the toObject operation included.
-    virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&);
-    virtual bool getOwnPropertySlot(ExecState*, unsigned index, PropertySlot&);
-    virtual void put(ExecState*, const Identifier& propertyName, JSValue*);
-    virtual void put(ExecState*, unsigned propertyName, JSValue*);
-    virtual JSObject* toThisObject(ExecState*) const;
-
-    JSObject *getter;
-    JSObject *setter;  
+    virtual JSValue* toPrimitive(ExecState*, JSType preferred) const;
+    virtual bool getPrimitiveNumber(ExecState*, double& number, JSValue*& value);
+    virtual bool toBoolean(ExecState*) const;
+    virtual double toNumber(ExecState*) const;
+    virtual UString toString(ExecState*) const;
+    virtual JSObject* toObject(ExecState*) const;
+
+    JSObject* m_getter;
+    JSObject* m_setter;  
   };
   
@@ -168 +161 @@
      * @see inherits()
      */
-    virtual const ClassInfo *classInfo() const;
 
     /**
@@ -196 +188 @@
      * ClassInfo pointer specified in cinfo
      */
-    bool inherits(const ClassInfo *cinfo) const;
+    bool inherits(const ClassInfo* classInfo) const { return isObject(classInfo); } // FIXME: Merge with isObject.
 
     // internal properties (ECMA 262-3 8.6.2)
@@ -231 +223 @@
     /**
      * Retrieves the specified property from the object. If neither the object
-     * or any other object in it's prototype chain have the property, this
+     * or any other object in its prototype chain have the property, this
      * function will return Undefined.
      *
@@ -277 +269 @@
 
     /**
-     * Checks to see whether the object (or any object in it's prototype chain)
+     * Checks to see whether the object (or any object in its prototype chain)
      * has a property with the specified name.
      *
@@ -320 +312 @@
      * all Objects)
      */
-    virtual JSValue *defaultValue(ExecState *exec, JSType hint) const;
-
-    /**
-     * Creates a new object based on this object. Typically this means the
-     * following:
-     * 1. A new object is created
-     * 2. The prototype of the new object is set to the value of this object's
-     *    "prototype" property
-     * 3. The call() method of this object is called, with the new object
-     *    passed as the this value
-     * 4. The new object is returned
-     *
-     * In some cases, Host objects may differ from these semantics, although
-     * this is discouraged.
-     *
-     * If an error occurs during construction, the execution state's exception
-     * will be set. This can be tested for with ExecState::hadException().
-     * Under some circumstances, the exception object may also be returned.
-     *
-     * Note: This function should not be called if getConstructData() returns
-     * ConstructTypeNone, in which case it will result in an assertion failure.
-     *
-     * @param exec The current execution state
-     * @param args The arguments to be passed to call() once the new object has
-     * been created
-     * @return The newly created & initialized object
-     */
-    /**
-     * Implementation of the [[Construct]] internal property
-     */
-    virtual JSObject* construct(ExecState* exec, const ArgList& args);
-    virtual JSObject* construct(ExecState* exec, const ArgList& args, const Identifier& functionName, const UString& sourceURL, int lineNumber);
-
-    /**
-     * Calls this object as if it is a function.
-     *
-     * Note: This function should not be called if implementsCall() returns
-     * false, in which case it will result in an assertion failure.
-     *
-     * See ECMA 8.6.2.3
-     *
-     * @param exec The current execution state
-     * @param thisObj The obj to be used as "this" within function execution.
-     * Note that in most cases this will be different from the C++ "this"
-     * object. For example, if the ECMAScript code "window.location->toString()"
-     * is executed, call() will be invoked on the C++ object which implements
-     * the toString method, with the thisObj being window.location
-     * @param args ArgList of arguments to be passed to the function
-     * @return The return value from the function
-     */
-    bool implementsCall();
-    virtual JSValue *callAsFunction(ExecState *exec, JSObject *thisObj, const ArgList &args);
+    virtual JSValue* defaultValue(ExecState*, JSType hint) const;
 
     /**
@@ -447 +388 @@
   };
 
+    JSObject* constructEmptyObject(ExecState*);
+
   /**
    * Types of Native Errors available. For custom errors, GeneralError
@@ -506 +449 @@
 }
 
-inline bool JSObject::inherits(const ClassInfo *info) const
-{
-    for (const ClassInfo *ci = classInfo(); ci; ci = ci->parentClass)
+inline bool JSCell::isObject(const ClassInfo* info) const
+{
+    for (const ClassInfo* ci = classInfo(); ci; ci = ci->parentClass) {
         if (ci == info)
             return true;
+    }
     return false;
 }
 
-// this method is here to be after the inline declaration of JSObject::inherits
-inline bool JSCell::isObject(const ClassInfo *info) const
-{
-    return isObject() && static_cast<const JSObject *>(this)->inherits(info);
-}
-
 // this method is here to be after the inline declaration of JSCell::isObject
-inline bool JSValue::isObject(const ClassInfo *c) const
-{
-    return !JSImmediate::isImmediate(this) && asCell()->isObject(c);
+inline bool JSValue::isObject(const ClassInfo* classInfo) const
+{
+    return !JSImmediate::isImmediate(this) && asCell()->isObject(classInfo);
 }
 

trunk/JavaScriptCore/kjs/JSValue.cpp

@@ -256 +256 @@
 }
 
+bool JSCell::deleteProperty(ExecState* exec, const Identifier& identifier)
+{
+    return toObject(exec)->deleteProperty(exec, identifier);
+}
+
+bool JSCell::deleteProperty(ExecState* exec, unsigned identifier)
+{
+    return toObject(exec)->deleteProperty(exec, identifier);
+}
+
 JSObject* JSCell::toThisObject(ExecState* exec) const
 {
@@ -261 +271 @@
 }
 
+const ClassInfo* JSCell::classInfo() const
+{
+    return 0;
+}
+
 JSCell* jsString(ExecState* exec, const char* s)
 {
@@ -276 +291 @@
 }
 
+JSValue* call(ExecState* exec, JSValue* functionObject, CallType callType, const CallData& callData, JSValue* thisValue, const ArgList& args)
+{
+    if (callType == CallTypeNative)
+        return callData.native.function(exec, static_cast<JSObject*>(functionObject), thisValue, args);
+    ASSERT(callType == CallTypeJS);
+    // FIXME: This can be done more efficiently using the callData.
+    return static_cast<JSFunction*>(functionObject)->call(exec, thisValue, args);
+}
+
+JSObject* construct(ExecState* exec, JSValue* object, ConstructType constructType, const ConstructData& constructData, const ArgList& args)
+{
+    if (constructType == ConstructTypeNative)
+        return constructData.native.function(exec, static_cast<JSObject*>(object), args);
+    ASSERT(constructType == ConstructTypeJS);
+    // FIXME: This can be done more efficiently using the constructData.
+    return static_cast<JSFunction*>(object)->construct(exec, args);
+}
+
 } // namespace KJS

trunk/JavaScriptCore/kjs/JSValue.h

@@ -68 +68 @@
     bool isString() const;
     bool isObject() const;
-    bool isObject(const ClassInfo*) const;
+    bool isObject(const ClassInfo*) const; // FIXME: Merge with inherits.
 
     // Extracting the value.
@@ -129 +129 @@
     void put(ExecState*, const Identifier& propertyName, JSValue*);
     void put(ExecState*, unsigned propertyName, JSValue*);
+    bool deleteProperty(ExecState*, const Identifier& propertyName);
+    bool deleteProperty(ExecState*, unsigned propertyName);
     JSObject* toThisObject(ExecState*) const;
 
@@ -160 +162 @@
     bool isString() const;
     bool isObject() const;
-    bool isObject(const ClassInfo*) const;
+    bool isObject(const ClassInfo*) const; // FIXME: Merge with inherits.
 
     // Extracting the value.
@@ -192 +194 @@
 
     // Object operations, with the toObject operation included.
+    virtual const ClassInfo* classInfo() const;
     virtual void put(ExecState*, const Identifier& propertyName, JSValue*);
     virtual void put(ExecState*, unsigned propertyName, JSValue*);
+    virtual bool deleteProperty(ExecState*, const Identifier& propertyName);
+    virtual bool deleteProperty(ExecState*, unsigned propertyName);
     virtual JSObject* toThisObject(ExecState*) const;
 

trunk/JavaScriptCore/kjs/MathObject.cpp

@@ -21 +21 @@
 #include "config.h"
 #include "MathObject.h"
-#include "MathObject.lut.h"
 
 #include "operations.h"
@@ -30 +29 @@
 namespace KJS {
 
+static JSValue* mathProtoFuncAbs(ExecState*, JSObject*, JSValue*, const ArgList&);
+static JSValue* mathProtoFuncACos(ExecState*, JSObject*, JSValue*, const ArgList&);
+static JSValue* mathProtoFuncASin(ExecState*, JSObject*, JSValue*, const ArgList&);
+static JSValue* mathProtoFuncATan(ExecState*, JSObject*, JSValue*, const ArgList&);
+static JSValue* mathProtoFuncATan2(ExecState*, JSObject*, JSValue*, const ArgList&);
+static JSValue* mathProtoFuncCeil(ExecState*, JSObject*, JSValue*, const ArgList&);
+static JSValue* mathProtoFuncCos(ExecState*, JSObject*, JSValue*, const ArgList&);
+static JSValue* mathProtoFuncExp(ExecState*, JSObject*, JSValue*, const ArgList&);
+static JSValue* mathProtoFuncFloor(ExecState*, JSObject*, JSValue*, const ArgList&);
+static JSValue* mathProtoFuncLog(ExecState*, JSObject*, JSValue*, const ArgList&);
+static JSValue* mathProtoFuncMax(ExecState*, JSObject*, JSValue*, const ArgList&);
+static JSValue* mathProtoFuncMin(ExecState*, JSObject*, JSValue*, const ArgList&);
+static JSValue* mathProtoFuncPow(ExecState*, JSObject*, JSValue*, const ArgList&);
+static JSValue* mathProtoFuncRandom(ExecState*, JSObject*, JSValue*, const ArgList&);
+static JSValue* mathProtoFuncRound(ExecState*, JSObject*, JSValue*, const ArgList&);
+static JSValue* mathProtoFuncSin(ExecState*, JSObject*, JSValue*, const ArgList&);
+static JSValue* mathProtoFuncSqrt(ExecState*, JSObject*, JSValue*, const ArgList&);
+static JSValue* mathProtoFuncTan(ExecState*, JSObject*, JSValue*, const ArgList&);
+
+}
+
+#include "MathObject.lut.h"
+
+namespace KJS {
+
 // ------------------------------ MathObject --------------------------------
 
@@ -35 +59 @@
 
 /* Source for MathObject.lut.h
-@begin mathTable 21
+@begin mathTable
   E             MathObject::Euler           DontEnum|DontDelete|ReadOnly
   LN2           MathObject::Ln2             DontEnum|DontDelete|ReadOnly
@@ -104 +128 @@
 // ------------------------------ Functions --------------------------------
 
-JSValue* mathProtoFuncAbs(ExecState* exec, JSObject*, const ArgList& args)
+JSValue* mathProtoFuncAbs(ExecState* exec, JSObject*, JSValue*, const ArgList& args)
 {
     double arg = args[0]->toNumber(exec);
@@ -110 +134 @@
 }
 
-JSValue* mathProtoFuncACos(ExecState* exec, JSObject*, const ArgList& args)
+JSValue* mathProtoFuncACos(ExecState* exec, JSObject*, JSValue*, const ArgList& args)
 {
     return jsNumber(exec, acos(args[0]->toNumber(exec)));
 }
 
-JSValue* mathProtoFuncASin(ExecState* exec, JSObject*, const ArgList& args)
+JSValue* mathProtoFuncASin(ExecState* exec, JSObject*, JSValue*, const ArgList& args)
 {
     return jsNumber(exec, asin(args[0]->toNumber(exec)));
 }
 
-JSValue* mathProtoFuncATan(ExecState* exec, JSObject*, const ArgList& args)
+JSValue* mathProtoFuncATan(ExecState* exec, JSObject*, JSValue*, const ArgList& args)
 {
     return jsNumber(exec, atan(args[0]->toNumber(exec)));
 }
 
-JSValue* mathProtoFuncATan2(ExecState* exec, JSObject*, const ArgList& args)
+JSValue* mathProtoFuncATan2(ExecState* exec, JSObject*, JSValue*, const ArgList& args)
 {
     return jsNumber(exec, atan2(args[0]->toNumber(exec), args[1]->toNumber(exec)));
 }
 
-JSValue* mathProtoFuncCeil(ExecState* exec, JSObject*, const ArgList& args)
+JSValue* mathProtoFuncCeil(ExecState* exec, JSObject*, JSValue*, const ArgList& args)
 {
     double arg = args[0]->toNumber(exec);
@@ -138 +162 @@
 }
 
-JSValue* mathProtoFuncCos(ExecState* exec, JSObject*, const ArgList& args)
+JSValue* mathProtoFuncCos(ExecState* exec, JSObject*, JSValue*, const ArgList& args)
 {
     return jsNumber(exec, cos(args[0]->toNumber(exec)));
 }
 
-JSValue* mathProtoFuncExp(ExecState* exec, JSObject*, const ArgList& args)
+JSValue* mathProtoFuncExp(ExecState* exec, JSObject*, JSValue*, const ArgList& args)
 {
     return jsNumber(exec, exp(args[0]->toNumber(exec)));
 }
 
-JSValue* mathProtoFuncFloor(ExecState* exec, JSObject*, const ArgList& args)
+JSValue* mathProtoFuncFloor(ExecState* exec, JSObject*, JSValue*, const ArgList& args)
 {
     double arg = args[0]->toNumber(exec);
@@ -156 +180 @@
 }
 
-JSValue* mathProtoFuncLog(ExecState* exec, JSObject*, const ArgList& args)
+JSValue* mathProtoFuncLog(ExecState* exec, JSObject*, JSValue*, const ArgList& args)
 {
     return jsNumber(exec, log(args[0]->toNumber(exec)));
 }
 
-JSValue* mathProtoFuncMax(ExecState* exec, JSObject*, const ArgList& args)
+JSValue* mathProtoFuncMax(ExecState* exec, JSObject*, JSValue*, const ArgList& args)
 {
     unsigned argsCount = args.size();
@@ -177 +201 @@
 }
 
-JSValue* mathProtoFuncMin(ExecState* exec, JSObject*, const ArgList& args)
+JSValue* mathProtoFuncMin(ExecState* exec, JSObject*, JSValue*, const ArgList& args)
 {
     unsigned argsCount = args.size();
@@ -193 +217 @@
 }
 
-JSValue* mathProtoFuncPow(ExecState* exec, JSObject*, const ArgList& args)
+JSValue* mathProtoFuncPow(ExecState* exec, JSObject*, JSValue*, const ArgList& args)
 {
     // ECMA 15.8.2.1.13
@@ -207 +231 @@
 }
 
-JSValue* mathProtoFuncRandom(ExecState* exec, JSObject*, const ArgList&)
+JSValue* mathProtoFuncRandom(ExecState* exec, JSObject*, JSValue*, const ArgList&)
 {
 #if !USE(MULTIPLE_THREADS)
@@ -220 +244 @@
 }
 
-JSValue* mathProtoFuncRound(ExecState* exec, JSObject*, const ArgList& args)
+JSValue* mathProtoFuncRound(ExecState* exec, JSObject*, JSValue*, const ArgList& args)
 {
     double arg = args[0]->toNumber(exec);
@@ -228 +252 @@
 }
 
-JSValue* mathProtoFuncSin(ExecState* exec, JSObject*, const ArgList& args)
+JSValue* mathProtoFuncSin(ExecState* exec, JSObject*, JSValue*, const ArgList& args)
 {
     return jsNumber(exec, sin(args[0]->toNumber(exec)));
 }
 
-JSValue* mathProtoFuncSqrt(ExecState* exec, JSObject*, const ArgList& args)
+JSValue* mathProtoFuncSqrt(ExecState* exec, JSObject*, JSValue*, const ArgList& args)
 {
     return jsNumber(exec, sqrt(args[0]->toNumber(exec)));
 }
 
-JSValue* mathProtoFuncTan(ExecState* exec, JSObject*, const ArgList& args)
+JSValue* mathProtoFuncTan(ExecState* exec, JSObject*, JSValue*, const ArgList& args)
 {
     return jsNumber(exec, tan(args[0]->toNumber(exec)));

trunk/JavaScriptCore/kjs/MathObject.h

@@ -1 @@
-// -*- c-basic-offset: 2 -*-
 /*
- *  This file is part of the KDE libraries
  *  Copyright (C) 1999-2000 Harri Porten ([email protected])
  *
@@ -41 +39 @@
     };
 
-    // Functions
-    JSValue* mathProtoFuncAbs(ExecState*, JSObject*, const ArgList&);
-    JSValue* mathProtoFuncACos(ExecState*, JSObject*, const ArgList&);
-    JSValue* mathProtoFuncASin(ExecState*, JSObject*, const ArgList&);
-    JSValue* mathProtoFuncATan(ExecState*, JSObject*, const ArgList&);
-    JSValue* mathProtoFuncATan2(ExecState*, JSObject*, const ArgList&);
-    JSValue* mathProtoFuncCeil(ExecState*, JSObject*, const ArgList&);
-    JSValue* mathProtoFuncCos(ExecState*, JSObject*, const ArgList&);
-    JSValue* mathProtoFuncExp(ExecState*, JSObject*, const ArgList&);
-    JSValue* mathProtoFuncFloor(ExecState*, JSObject*, const ArgList&);
-    JSValue* mathProtoFuncLog(ExecState*, JSObject*, const ArgList&);
-    JSValue* mathProtoFuncMax(ExecState*, JSObject*, const ArgList&);
-    JSValue* mathProtoFuncMin(ExecState*, JSObject*, const ArgList&);
-    JSValue* mathProtoFuncPow(ExecState*, JSObject*, const ArgList&);
-    JSValue* mathProtoFuncRandom(ExecState*, JSObject*, const ArgList&);
-    JSValue* mathProtoFuncRound(ExecState*, JSObject*, const ArgList&);
-    JSValue* mathProtoFuncSin(ExecState*, JSObject*, const ArgList&);
-    JSValue* mathProtoFuncSqrt(ExecState*, JSObject*, const ArgList&);
-    JSValue* mathProtoFuncTan(ExecState*, JSObject*, const ArgList&);
-
 } // namespace KJS
 

trunk/JavaScriptCore/kjs/NumberObject.cpp

@@ -44 +44 @@
 // ------------------------------ NumberPrototype ---------------------------
 
-static JSValue* numberProtoFuncToString(ExecState*, JSObject*, const ArgList&);
-static JSValue* numberProtoFuncToLocaleString(ExecState*, JSObject*, const ArgList&);
-static JSValue* numberProtoFuncValueOf(ExecState*, JSObject*, const ArgList&);
-static JSValue* numberProtoFuncToFixed(ExecState*, JSObject*, const ArgList&);
-static JSValue* numberProtoFuncToExponential(ExecState*, JSObject*, const ArgList&);
-static JSValue* numberProtoFuncToPrecision(ExecState*, JSObject*, const ArgList&);
+static JSValue* numberProtoFuncToString(ExecState*, JSObject*, JSValue*, const ArgList&);
+static JSValue* numberProtoFuncToLocaleString(ExecState*, JSObject*, JSValue*, const ArgList&);
+static JSValue* numberProtoFuncValueOf(ExecState*, JSObject*, JSValue*, const ArgList&);
+static JSValue* numberProtoFuncToFixed(ExecState*, JSObject*, JSValue*, const ArgList&);
+static JSValue* numberProtoFuncToExponential(ExecState*, JSObject*, JSValue*, const ArgList&);
+static JSValue* numberProtoFuncToPrecision(ExecState*, JSObject*, JSValue*, const ArgList&);
 
 // ECMA 15.7.4
@@ -143 +143 @@
 
 
-JSValue* numberProtoFuncToString(ExecState* exec, JSObject* thisObj, const ArgList& args)
-{
-    if (!thisObj->inherits(&NumberObject::info))
+JSValue* numberProtoFuncToString(ExecState* exec, JSObject*, JSValue* thisValue, const ArgList& args)
+{
+    if (!thisValue->isObject(&NumberObject::info))
         return throwError(exec, TypeError);
 
-    JSValue* v = static_cast<NumberObject*>(thisObj)->internalValue();
+    JSValue* v = static_cast<NumberObject*>(thisValue)->internalValue();
 
     double radixAsDouble = args[0]->toInteger(exec); // nan -> 0
@@ -164 +164 @@
     char s[2048 + 3];
     const char* lastCharInString = s + sizeof(s) - 1;
-    double x = v->toNumber(exec);
+    double x = v->uncheckedGetNumber();
     if (isnan(x) || isinf(x))
         return jsString(exec, UString::from(x));
@@ -208 +208 @@
 }
 
-JSValue* numberProtoFuncToLocaleString(ExecState* exec, JSObject* thisObj, const ArgList&)
-{
-    if (!thisObj->inherits(&NumberObject::info))
+JSValue* numberProtoFuncToLocaleString(ExecState* exec, JSObject*, JSValue* thisValue, const ArgList&)
+{
+    if (!thisValue->isObject(&NumberObject::info))
         return throwError(exec, TypeError);
 
     // TODO
-    return jsString(exec, static_cast<NumberObject*>(thisObj)->internalValue()->toString(exec));
-}
-
-JSValue* numberProtoFuncValueOf(ExecState* exec, JSObject* thisObj, const ArgList&)
-{
-    if (!thisObj->inherits(&NumberObject::info))
+    return jsString(exec, static_cast<NumberObject*>(thisValue)->internalValue()->toString(exec));
+}
+
+JSValue* numberProtoFuncValueOf(ExecState* exec, JSObject*, JSValue* thisValue, const ArgList&)
+{
+    if (!thisValue->isObject(&NumberObject::info))
         return throwError(exec, TypeError);
 
-    return static_cast<NumberObject*>(thisObj)->internalValue()->toJSNumber(exec);
-}
-
-JSValue* numberProtoFuncToFixed(ExecState* exec, JSObject* thisObj, const ArgList& args)
-{
-    if (!thisObj->inherits(&NumberObject::info))
+    return static_cast<NumberObject*>(thisValue)->internalValue();
+}
+
+JSValue* numberProtoFuncToFixed(ExecState* exec, JSObject*, JSValue* thisValue, const ArgList& args)
+{
+    if (!thisValue->isObject(&NumberObject::info))
         return throwError(exec, TypeError);
 
-    JSValue* v = static_cast<NumberObject*>(thisObj)->internalValue();
+    JSValue* v = static_cast<NumberObject*>(thisValue)->internalValue();
 
     JSValue* fractionDigits = args[0];
@@ -238 +238 @@
     int f = (int)df;
 
-    double x = v->toNumber(exec);
+    double x = v->uncheckedGetNumber();
     if (isnan(x))
         return jsString(exec, "NaN");
@@ -311 +311 @@
 }
 
-JSValue* numberProtoFuncToExponential(ExecState* exec, JSObject* thisObj, const ArgList& args)
-{
-    if (!thisObj->inherits(&NumberObject::info))
+JSValue* numberProtoFuncToExponential(ExecState* exec, JSObject*, JSValue* thisValue, const ArgList& args)
+{
+    if (!thisValue->isObject(&NumberObject::info))
         return throwError(exec, TypeError);
 
-    JSValue* v = static_cast<NumberObject*>(thisObj)->internalValue();
-
-    double x = v->toNumber(exec);
+    double x = static_cast<NumberObject*>(thisValue)->internalValue()->uncheckedGetNumber();
 
     if (isnan(x) || isinf(x))
@@ -382 +380 @@
 }
 
-JSValue* numberProtoFuncToPrecision(ExecState* exec, JSObject* thisObj, const ArgList& args)
-{
-    if (!thisObj->inherits(&NumberObject::info))
+JSValue* numberProtoFuncToPrecision(ExecState* exec, JSObject*, JSValue* thisValue, const ArgList& args)
+{
+    if (!thisValue->isObject(&NumberObject::info))
         return throwError(exec, TypeError);
 
-    JSValue* v = static_cast<NumberObject*>(thisObj)->internalValue();
+    JSValue* v = static_cast<NumberObject*>(thisValue)->internalValue();
 
     double doublePrecision = args[0]->toIntegerPreserveNaN(exec);
-    double x = v->toNumber(exec);
+    double x = v->uncheckedGetNumber();
     if (args[0]->isUndefined() || isnan(x) || isinf(x))
         return jsString(exec, v->toString(exec));
@@ -454 +452 @@
 
 /* Source for NumberObject.lut.h
-@begin numberTable 5
+@begin numberTable
   NaN                   NumberConstructor::NaNValue       DontEnum|DontDelete|ReadOnly
   NEGATIVE_INFINITY     NumberConstructor::NegInfinity    DontEnum|DontDelete|ReadOnly
@@ -463 +461 @@
 */
 NumberConstructor::NumberConstructor(ExecState* exec, FunctionPrototype* funcProto, NumberPrototype* numberProto)
-    : InternalFunction(funcProto, Identifier(exec, numberProto->classInfo()->className))
+    : InternalFunction(funcProto, Identifier(exec, numberProto->info.className))
 {
     // Number.Prototype
@@ -469 +467 @@
 
     // no. of arguments for constructor
-    putDirect(exec->propertyNames().length, jsNumber(exec, 1), ReadOnly|DontDelete|DontEnum);
+    putDirect(exec->propertyNames().length, jsNumber(exec, 1), ReadOnly | DontEnum | DontDelete);
 }
 
@@ -496 +494 @@
 }
 
-ConstructType NumberConstructor::getConstructData(ConstructData&)
-{
-    return ConstructTypeNative;
-}
-
 // ECMA 15.7.1
-JSObject* NumberConstructor::construct(ExecState* exec, const ArgList& args)
-{
-    JSObject* proto = exec->lexicalGlobalObject()->numberPrototype();
-    NumberObject* obj = new (exec) NumberObject(proto);
-
-    // FIXME: Check args[0]->isUndefined() instead of args.isEmpty()?
+static JSObject* constructWithNumberConstructor(ExecState* exec, JSObject*, const ArgList& args)
+{
+    NumberObject* obj = new (exec) NumberObject(exec->lexicalGlobalObject()->numberPrototype());
     double n = args.isEmpty() ? 0 : args[0]->toNumber(exec);
     obj->setInternalValue(jsNumber(exec, n));
@@ -513 +503 @@
 }
 
+ConstructType NumberConstructor::getConstructData(ConstructData& constructData)
+{
+    constructData.native.function = constructWithNumberConstructor;
+    return ConstructTypeNative;
+}
+
 // ECMA 15.7.2
-JSValue* NumberConstructor::callAsFunction(ExecState* exec, JSObject*, const ArgList& args)
-{
-    // FIXME: Check args[0]->isUndefined() instead of args.isEmpty()?
+static JSValue* callNumberConstructor(ExecState* exec, JSObject*, JSValue*, const ArgList& args)
+{
     return jsNumber(exec, args.isEmpty() ? 0 : args[0]->toNumber(exec));
 }
 
+CallType NumberConstructor::getCallData(CallData& callData)
+{
+    callData.native.function = callNumberConstructor;
+    return CallTypeNative;
+}
+
+NumberObject* constructNumber(ExecState* exec, JSNumberCell* number)
+{
+    NumberObject* obj = new (exec) NumberObject(exec->lexicalGlobalObject()->numberPrototype());
+    obj->setInternalValue(number);
+    return obj;
+}
+
+NumberObject* constructNumberFromImmediateNumber(ExecState* exec, JSValue* value)
+{
+    NumberObject* obj = new (exec) NumberObject(exec->lexicalGlobalObject()->numberPrototype());
+    obj->setInternalValue(value);
+    return obj;
+}
+
 } // namespace KJS

trunk/JavaScriptCore/kjs/NumberObject.h

@@ -28 +28 @@
 namespace KJS {
 
+    class JSNumberCell;
+
     class NumberObject : public JSWrapperObject {
     public:
         NumberObject(JSObject* prototype);
+        static const ClassInfo info;
 
+    private:
         virtual const ClassInfo* classInfo() const { return &info; }
-        static const ClassInfo info;
     };
+
+    NumberObject* constructNumber(ExecState*, JSNumberCell*);
+    NumberObject* constructNumberFromImmediateNumber(ExecState*, JSValue*);
 
     /**
@@ -56 +62 @@
         NumberConstructor(ExecState*, FunctionPrototype*, NumberPrototype*);
 
-        virtual ConstructType getConstructData(ConstructData&);
-        virtual JSObject* construct(ExecState*, const ArgList&);
-
-        virtual JSValue* callAsFunction(ExecState*, JSObject*, const ArgList&);
-
         bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&);
         JSValue* getValueProperty(ExecState*, int token) const;
 
-        virtual const ClassInfo* classInfo() const { return &info; }
         static const ClassInfo info;
 
         enum { NaNValue, NegInfinity, PosInfinity, MaxValue, MinValue };
 
-        JSObject* construct(const ArgList&);
+    private:
+        virtual ConstructType getConstructData(ConstructData&);
+        virtual CallType getCallData(CallData&);
+        virtual const ClassInfo* classInfo() const { return &info; }
     };
 

trunk/JavaScriptCore/kjs/PropertySlot.cpp

@@ -37 +37 @@
 JSValue* PropertySlot::functionGetter(ExecState* exec, const Identifier&, const PropertySlot& slot)
 {
-    CallData data;
-    CallType callType = slot.m_data.getterFunc->getCallData(data);
+    CallData callData;
+    CallType callType = slot.m_data.getterFunc->getCallData(callData);
     if (callType == CallTypeNative)
-        return slot.m_data.getterFunc->callAsFunction(exec, static_cast<JSObject*>(slot.slotBase()), exec->emptyList());
+        return callData.native.function(exec, slot.m_data.getterFunc, slot.slotBase(), exec->emptyList());
     ASSERT(callType == CallTypeJS);
     RegisterFileStack* stack = &exec->dynamicGlobalObject()->registerFileStack();
     stack->pushFunctionRegisterFile();
-    JSValue* result = slot.m_data.getterFunc->callAsFunction(exec, static_cast<JSObject*>(slot.slotBase()), exec->emptyList());
+    // FIXME: This can be done more efficiently using the callData.
+    JSValue* result = static_cast<JSFunction*>(slot.m_data.getterFunc)->call(exec, slot.slotBase(), exec->emptyList());
     stack->popFunctionRegisterFile();
-    return result;    
+    return result;
 }
 

trunk/JavaScriptCore/kjs/RegExpObject.cpp

@@ -39 +39 @@
 // ------------------------------ RegExpPrototype ---------------------------
 
-static JSValue* regExpProtoFuncTest(ExecState*, JSObject*, const ArgList&);
-static JSValue* regExpProtoFuncExec(ExecState*, JSObject*, const ArgList&);
-static JSValue* regExpProtoFuncCompile(ExecState*, JSObject*, const ArgList&);
-static JSValue* regExpProtoFuncToString(ExecState*, JSObject*, const ArgList&);
+static JSValue* regExpProtoFuncTest(ExecState*, JSObject*, JSValue*, const ArgList&);
+static JSValue* regExpProtoFuncExec(ExecState*, JSObject*, JSValue*, const ArgList&);
+static JSValue* regExpProtoFuncCompile(ExecState*, JSObject*, JSValue*, const ArgList&);
+static JSValue* regExpProtoFuncToString(ExecState*, JSObject*, JSValue*, const ArgList&);
 
 // ECMA 15.10.5
@@ -59 +59 @@
 // ------------------------------ Functions ---------------------------
     
-JSValue* regExpProtoFuncTest(ExecState* exec, JSObject* thisObj, const ArgList& args)
-{
-    if (!thisObj->inherits(&RegExpObject::info))
+JSValue* regExpProtoFuncTest(ExecState* exec, JSObject*, JSValue* thisValue, const ArgList& args)
+{
+    if (!thisValue->isObject(&RegExpObject::info))
         return throwError(exec, TypeError);
-
-    return static_cast<RegExpObject*>(thisObj)->test(exec, args);
-}
-
-JSValue* regExpProtoFuncExec(ExecState* exec, JSObject* thisObj, const ArgList& args)
-{
-    if (!thisObj->inherits(&RegExpObject::info))
+    return static_cast<RegExpObject*>(thisValue)->test(exec, args);
+}
+
+JSValue* regExpProtoFuncExec(ExecState* exec, JSObject*, JSValue* thisValue, const ArgList& args)
+{
+    if (!thisValue->isObject(&RegExpObject::info))
         return throwError(exec, TypeError);
-
-    return static_cast<RegExpObject*>(thisObj)->exec(exec, args);
-}
-
-JSValue* regExpProtoFuncCompile(ExecState* exec, JSObject* thisObj, const ArgList& args)
-{
-    if (!thisObj->inherits(&RegExpObject::info))
+    return static_cast<RegExpObject*>(thisValue)->exec(exec, args);
+}
+
+JSValue* regExpProtoFuncCompile(ExecState* exec, JSObject*, JSValue* thisValue, const ArgList& args)
+{
+    if (!thisValue->isObject(&RegExpObject::info))
         return throwError(exec, TypeError);
 
@@ -97 +95 @@
         return throwError(exec, SyntaxError, UString("Invalid regular expression: ").append(regExp->errorMessage()));
 
-    static_cast<RegExpObject*>(thisObj)->setRegExp(regExp.release());
-    static_cast<RegExpObject*>(thisObj)->setLastIndex(0);
+    static_cast<RegExpObject*>(thisValue)->setRegExp(regExp.release());
+    static_cast<RegExpObject*>(thisValue)->setLastIndex(0);
     return jsUndefined();
 }
 
-JSValue* regExpProtoFuncToString(ExecState* exec, JSObject* thisObj, const ArgList&)
-{
-    if (!thisObj->inherits(&RegExpObject::info)) {
-        if (thisObj->inherits(&RegExpPrototype::info))
+JSValue* regExpProtoFuncToString(ExecState* exec, JSObject*, JSValue* thisValue, const ArgList&)
+{
+    if (!thisValue->isObject(&RegExpObject::info)) {
+        if (thisValue->isObject(&RegExpPrototype::info))
             return jsString(exec, "//");
         return throwError(exec, TypeError);
     }
 
-    UString result = "/" + thisObj->get(exec, exec->propertyNames().source)->toString(exec) + "/";
-    if (thisObj->get(exec, exec->propertyNames().global)->toBoolean(exec))
+    UString result = "/" + static_cast<RegExpObject*>(thisValue)->get(exec, exec->propertyNames().source)->toString(exec) + "/";
+    if (static_cast<RegExpObject*>(thisValue)->get(exec, exec->propertyNames().global)->toBoolean(exec))
         result += "g";
-    if (thisObj->get(exec, exec->propertyNames().ignoreCase)->toBoolean(exec))
+    if (static_cast<RegExpObject*>(thisValue)->get(exec, exec->propertyNames().ignoreCase)->toBoolean(exec))
         result += "i";
-    if (thisObj->get(exec, exec->propertyNames().multiline)->toBoolean(exec))
+    if (static_cast<RegExpObject*>(thisValue)->get(exec, exec->propertyNames().multiline)->toBoolean(exec))
         result += "m";
     return jsString(exec, result);
@@ -125 +123 @@
 
 /* Source for RegExpObject.lut.h
-@begin regExpTable 5
+@begin regExpTable
     global        RegExpObject::Global       DontDelete|ReadOnly|DontEnum
     ignoreCase    RegExpObject::IgnoreCase   DontDelete|ReadOnly|DontEnum
@@ -230 +228 @@
 }
 
-CallType RegExpObject::getCallData(CallData&)
-{
+static JSValue* callRegExpObject(ExecState* exec, JSObject* function, JSValue*, const ArgList& args)
+{
+    return static_cast<RegExpObject*>(function)->exec(exec, args);
+}
+
+CallType RegExpObject::getCallData(CallData& callData)
+{
+    callData.native.function = callRegExpObject;
     return CallTypeNative;
 }
 
-JSValue* RegExpObject::callAsFunction(ExecState* exec, JSObject*, const ArgList& args)
-{
-    return RegExpObject::exec(exec, args);
-}
-
 // ------------------------------ RegExpConstructor ------------------------------
 
@@ -245 +244 @@
 
 /* Source for RegExpObject.lut.h
-@begin regExpConstructorTable 21
+@begin regExpConstructorTable
   input           RegExpConstructor::Input          None
   $_              RegExpConstructor::Input          DontEnum
@@ -317 +316 @@
 public:
     RegExpMatchesArray(ExecState*, RegExpConstructorPrivate*);
-
     virtual ~RegExpMatchesArray();
 
+private:
     virtual bool getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) { if (lazyCreationData()) fillArrayInstance(exec); return JSArray::getOwnPropertySlot(exec, propertyName, slot); }
     virtual bool getOwnPropertySlot(ExecState* exec, unsigned propertyName, PropertySlot& slot) { if (lazyCreationData()) fillArrayInstance(exec); return JSArray::getOwnPropertySlot(exec, propertyName, slot); }
@@ -328 +327 @@
     virtual void getPropertyNames(ExecState* exec, PropertyNameArray& arr) { if (lazyCreationData()) fillArrayInstance(exec); JSArray::getPropertyNames(exec, arr); }
 
-private:
     void fillArrayInstance(ExecState*);
 };
@@ -472 +470 @@
 }
   
-ConstructType RegExpConstructor::getConstructData(ConstructData&)
-{
-    return ConstructTypeNative;
-}
-
 // ECMA 15.10.4
-JSObject *RegExpConstructor::construct(ExecState *exec, const ArgList &args)
+static JSObject* constructRegExp(ExecState* exec, const ArgList& args)
 {
   JSValue* arg0 = args[0];
@@ -498 +491 @@
 }
 
+static JSObject* constructWithRegExpConstructor(ExecState* exec, JSObject*, const ArgList& args)
+{
+    return constructRegExp(exec, args);
+}
+
+ConstructType RegExpConstructor::getConstructData(ConstructData& constructData)
+{
+    constructData.native.function = constructWithRegExpConstructor;
+    return ConstructTypeNative;
+}
+
 // ECMA 15.10.3
-JSValue *RegExpConstructor::callAsFunction(ExecState *exec, JSObject * /*thisObj*/, const ArgList &args)
-{
-  return construct(exec, args);
+static JSValue* callRegExpConstructor(ExecState* exec, JSObject*, JSValue*, const ArgList& args)
+{
+    return constructRegExp(exec, args);
+}
+
+CallType RegExpConstructor::getCallData(CallData& callData)
+{
+    callData.native.function = callRegExpConstructor;
+    return CallTypeNative;
 }
 

trunk/JavaScriptCore/kjs/RegExpObject.h

@@ -47 +47 @@
         RegExp* regExp() const { return m_regExp.get(); }
 
-        JSValue* test(ExecState*, const ArgList& args);
-        JSValue* exec(ExecState*, const ArgList& args);
-
-        virtual CallType getCallData(CallData&);
-        virtual JSValue* callAsFunction(ExecState*, JSObject*, const ArgList&);
+        JSValue* test(ExecState*, const ArgList&);
+        JSValue* exec(ExecState*, const ArgList&);
 
         bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&);
@@ -64 +61 @@
 
     private:
-        bool match(ExecState*, const ArgList& args);
+        bool match(ExecState*, const ArgList&);
+
+        virtual CallType getCallData(CallData&);
 
         RefPtr<RegExp> m_regExp;
@@ -77 +76 @@
         RegExpConstructor(ExecState*, FunctionPrototype*, RegExpPrototype*);
 
-        virtual ConstructType getConstructData(ConstructData&);
-        virtual JSObject* construct(ExecState*, const ArgList&);
-
-        virtual JSValue* callAsFunction(ExecState*, JSObject*, const ArgList&);
-
         virtual void put(ExecState*, const Identifier&, JSValue*);
         void putValueProperty(ExecState*, int token, JSValue*);
@@ -87 +81 @@
         JSValue* getValueProperty(ExecState*, int token) const;
 
-        virtual const ClassInfo* classInfo() const { return &info; }
         static const ClassInfo info;
 
@@ -95 +88 @@
 
     private:
+        virtual ConstructType getConstructData(ConstructData&);
+        virtual CallType getCallData(CallData&);
+        virtual const ClassInfo* classInfo() const { return &info; }
+
         JSValue* getBackref(ExecState*, unsigned) const;
         JSValue* getLastParen(ExecState*) const;

trunk/JavaScriptCore/kjs/Shell.cpp

@@ -73 +73 @@
 static bool fillBufferWithContentsOfFile(const UString& fileName, Vector<char>& buffer);
 
-static JSValue* functionPrint(ExecState*, JSObject*, const ArgList&);
-static JSValue* functionDebug(ExecState*, JSObject*, const ArgList&);
-static JSValue* functionGC(ExecState*, JSObject*, const ArgList&);
-static JSValue* functionVersion(ExecState*, JSObject*, const ArgList&);
-static JSValue* functionRun(ExecState*, JSObject*, const ArgList&);
-static JSValue* functionLoad(ExecState*, JSObject*, const ArgList&);
-static JSValue* functionReadline(ExecState*, JSObject*, const ArgList&);
-static JSValue* functionQuit(ExecState*, JSObject*, const ArgList&);
+static JSValue* functionPrint(ExecState*, JSObject*, JSValue*, const ArgList&);
+static JSValue* functionDebug(ExecState*, JSObject*, JSValue*, const ArgList&);
+static JSValue* functionGC(ExecState*, JSObject*, JSValue*, const ArgList&);
+static JSValue* functionVersion(ExecState*, JSObject*, JSValue*, const ArgList&);
+static JSValue* functionRun(ExecState*, JSObject*, JSValue*, const ArgList&);
+static JSValue* functionLoad(ExecState*, JSObject*, JSValue*, const ArgList&);
+static JSValue* functionReadline(ExecState*, JSObject*, JSValue*, const ArgList&);
+static JSValue* functionQuit(ExecState*, JSObject*, JSValue*, const ArgList&);
 
 struct Options {
@@ -174 +174 @@
     putDirectFunction(new (globalExec()) PrototypeFunction(globalExec(), functionPrototype(), 0, Identifier(globalExec(), "readline"), functionReadline));
 
-    JSObject* array = arrayConstructor()->construct(globalExec(), globalExec()->emptyList());
+    JSObject* array = constructEmptyArray(globalExec());
     for (size_t i = 0; i < arguments.size(); ++i)
         array->put(globalExec(), i, jsString(globalExec(), arguments[i]));
@@ -182 +182 @@
 }
 
-JSValue* functionPrint(ExecState* exec, JSObject*, const ArgList& args)
+JSValue* functionPrint(ExecState* exec, JSObject*, JSValue*, const ArgList& args)
 {
     for (unsigned i = 0; i < args.size(); ++i) {
@@ -196 +196 @@
 }
 
-JSValue* functionDebug(ExecState* exec, JSObject*, const ArgList& args)
+JSValue* functionDebug(ExecState* exec, JSObject*, JSValue*, const ArgList& args)
 {
     fprintf(stderr, "--> %s\n", args[0]->toString(exec).UTF8String().c_str());
@@ -202 +202 @@
 }
 
-JSValue* functionGC(ExecState* exec, JSObject*, const ArgList&)
+JSValue* functionGC(ExecState* exec, JSObject*, JSValue*, const ArgList&)
 {
     JSLock lock;
@@ -209 +209 @@
 }
 
-JSValue* functionVersion(ExecState*, JSObject*, const ArgList&)
+JSValue* functionVersion(ExecState*, JSObject*, JSValue*, const ArgList&)
 {
     // We need this function for compatibility with the Mozilla JS tests but for now
@@ -216 +216 @@
 }
 
-JSValue* functionRun(ExecState* exec, JSObject*, const ArgList& args)
+JSValue* functionRun(ExecState* exec, JSObject*, JSValue*, const ArgList& args)
 {
     StopWatch stopWatch;
@@ -233 +233 @@
 }
 
-JSValue* functionLoad(ExecState* exec, JSObject*, const ArgList& args)
+JSValue* functionLoad(ExecState* exec, JSObject*, JSValue*, const ArgList& args)
 {
     UString fileName = args[0]->toString(exec);
@@ -246 +246 @@
 }
 
-JSValue* functionReadline(ExecState* exec, JSObject*, const ArgList&)
+JSValue* functionReadline(ExecState* exec, JSObject*, JSValue*, const ArgList&)
 {
     Vector<char, 256> line;
@@ -260 +260 @@
 }
 
-JSValue* functionQuit(ExecState*, JSObject*, const ArgList&)
+JSValue* functionQuit(ExecState*, JSObject*, JSValue*, const ArgList&)
 {
     exit(0);

trunk/JavaScriptCore/kjs/date_object.cpp

@@ -22 +22 @@
 #include "config.h"
 #include "date_object.h"
-#include "date_object.lut.h"
+
+#include "DateMath.h"
 #include "JSString.h"
-
-#if HAVE(ERRNO_H)
-#include <errno.h>
-#endif
-
-#if HAVE(SYS_PARAM_H)
-#include <sys/param.h>
-#endif
-
-#if HAVE(SYS_TIME_H)
-#include <sys/time.h>
-#endif
-
-#if HAVE(SYS_TIMEB_H)
-#include <sys/timeb.h>
-#endif
-
+#include "error_object.h"
+#include "operations.h"
 #include <float.h>
 #include <limits.h>
@@ -49 +35 @@
 #include <string.h>
 #include <time.h>
-
-#include "error_object.h"
-#include "operations.h"
-#include "DateMath.h"
-
 #include <wtf/ASCIICType.h>
 #include <wtf/Assertions.h>
@@ -60 +41 @@
 #include <wtf/UnusedParam.h>
 
+#if HAVE(ERRNO_H)
+#include <errno.h>
+#endif
+
+#if HAVE(SYS_PARAM_H)
+#include <sys/param.h>
+#endif
+
+#if HAVE(SYS_TIME_H)
+#include <sys/time.h>
+#endif
+
+#if HAVE(SYS_TIMEB_H)
+#include <sys/timeb.h>
+#endif
+
 #if PLATFORM(MAC)
-    #include <CoreFoundation/CoreFoundation.h>
+#include <CoreFoundation/CoreFoundation.h>
 #endif
 
 using namespace WTF;
+
+namespace KJS {
+
+static JSValue* dateProtoFuncGetDate(ExecState*, JSObject*, JSValue*, const ArgList&);
+static JSValue* dateProtoFuncGetDay(ExecState*, JSObject*, JSValue*, const ArgList&);
+static JSValue* dateProtoFuncGetFullYear(ExecState*, JSObject*, JSValue*, const ArgList&);
+static JSValue* dateProtoFuncGetHours(ExecState*, JSObject*, JSValue*, const ArgList&);
+static JSValue* dateProtoFuncGetMilliSeconds(ExecState*, JSObject*, JSValue*, const ArgList&);
+static JSValue* dateProtoFuncGetMinutes(ExecState*, JSObject*, JSValue*, const ArgList&);
+static JSValue* dateProtoFuncGetMonth(ExecState*, JSObject*, JSValue*, const ArgList&);
+static JSValue* dateProtoFuncGetSeconds(ExecState*, JSObject*, JSValue*, const ArgList&);
+static JSValue* dateProtoFuncGetTime(ExecState*, JSObject*, JSValue*, const ArgList&);
+static JSValue* dateProtoFuncGetTimezoneOffset(ExecState*, JSObject*, JSValue*, const ArgList&);
+static JSValue* dateProtoFuncGetUTCDate(ExecState*, JSObject*, JSValue*, const ArgList&);
+static JSValue* dateProtoFuncGetUTCDay(ExecState*, JSObject*, JSValue*, const ArgList&);
+static JSValue* dateProtoFuncGetUTCFullYear(ExecState*, JSObject*, JSValue*, const ArgList&);
+static JSValue* dateProtoFuncGetUTCHours(ExecState*, JSObject*, JSValue*, const ArgList&);
+static JSValue* dateProtoFuncGetUTCMilliseconds(ExecState*, JSObject*, JSValue*, const ArgList&);
+static JSValue* dateProtoFuncGetUTCMinutes(ExecState*, JSObject*, JSValue*, const ArgList&);
+static JSValue* dateProtoFuncGetUTCMonth(ExecState*, JSObject*, JSValue*, const ArgList&);
+static JSValue* dateProtoFuncGetUTCSeconds(ExecState*, JSObject*, JSValue*, const ArgList&);
+static JSValue* dateProtoFuncGetYear(ExecState*, JSObject*, JSValue*, const ArgList&);
+static JSValue* dateProtoFuncSetDate(ExecState*, JSObject*, JSValue*, const ArgList&);
+static JSValue* dateProtoFuncSetFullYear(ExecState*, JSObject*, JSValue*, const ArgList&);
+static JSValue* dateProtoFuncSetHours(ExecState*, JSObject*, JSValue*, const ArgList&);
+static JSValue* dateProtoFuncSetMilliSeconds(ExecState*, JSObject*, JSValue*, const ArgList&);
+static JSValue* dateProtoFuncSetMinutes(ExecState*, JSObject*, JSValue*, const ArgList&);
+static JSValue* dateProtoFuncSetMonth(ExecState*, JSObject*, JSValue*, const ArgList&);
+static JSValue* dateProtoFuncSetSeconds(ExecState*, JSObject*, JSValue*, const ArgList&);
+static JSValue* dateProtoFuncSetTime(ExecState*, JSObject*, JSValue*, const ArgList&);
+static JSValue* dateProtoFuncSetUTCDate(ExecState*, JSObject*, JSValue*, const ArgList&);
+static JSValue* dateProtoFuncSetUTCFullYear(ExecState*, JSObject*, JSValue*, const ArgList&);
+static JSValue* dateProtoFuncSetUTCHours(ExecState*, JSObject*, JSValue*, const ArgList&);
+static JSValue* dateProtoFuncSetUTCMilliseconds(ExecState*, JSObject*, JSValue*, const ArgList&);
+static JSValue* dateProtoFuncSetUTCMinutes(ExecState*, JSObject*, JSValue*, const ArgList&);
+static JSValue* dateProtoFuncSetUTCMonth(ExecState*, JSObject*, JSValue*, const ArgList&);
+static JSValue* dateProtoFuncSetUTCSeconds(ExecState*, JSObject*, JSValue*, const ArgList&);
+static JSValue* dateProtoFuncSetYear(ExecState*, JSObject*, JSValue*, const ArgList&);
+static JSValue* dateProtoFuncToDateString(ExecState*, JSObject*, JSValue*, const ArgList&);
+static JSValue* dateProtoFuncToGMTString(ExecState*, JSObject*, JSValue*, const ArgList&);
+static JSValue* dateProtoFuncToLocaleDateString(ExecState*, JSObject*, JSValue*, const ArgList&);
+static JSValue* dateProtoFuncToLocaleString(ExecState*, JSObject*, JSValue*, const ArgList&);
+static JSValue* dateProtoFuncToLocaleTimeString(ExecState*, JSObject*, JSValue*, const ArgList&);
+static JSValue* dateProtoFuncToString(ExecState*, JSObject*, JSValue*, const ArgList&);
+static JSValue* dateProtoFuncToTimeString(ExecState*, JSObject*, JSValue*, const ArgList&);
+static JSValue* dateProtoFuncToUTCString(ExecState*, JSObject*, JSValue*, const ArgList&);
+static JSValue* dateProtoFuncValueOf(ExecState*, JSObject*, JSValue*, const ArgList&);
+
+}
+
+#include "date_object.lut.h"
 
 namespace KJS {
@@ -71 +119 @@
 static double timeClip(double);
 
-inline int gmtoffset(const GregorianDateTime& t)
+static inline int gmtoffset(const GregorianDateTime& t)
 {
     return t.utcOffset;
 }
-
-
-/**
- * @internal
- *
- * Class to implement all methods that are properties of the
- * Date object
- */
-class DateFunction : public InternalFunction {
-public:
-    DateFunction(ExecState *, FunctionPrototype *, int i, int len, const Identifier& );
-
-    virtual JSValue *callAsFunction(ExecState *, JSObject *thisObj, const ArgList &args);
-
-    enum { Parse, UTC, Now };
-
-private:
-    int id;
-};
 
 struct DateInstance::Cache {
@@ -117 +146 @@
 }
 
-static UString formatLocaleDate(ExecState *exec, double time, bool includeDate, bool includeTime, const ArgList &args)
+static UString formatLocaleDate(ExecState *exec, double time, bool includeDate, bool includeTime, const ArgList& args)
 {
     CFDateFormatterStyle dateStyle = (includeDate ? kCFDateFormatterLongStyle : kCFDateFormatterNoStyle);
@@ -302 +331 @@
 //
 // Format of member function: f([years,] [months,] [days])
-static bool fillStructuresUsingDateArgs(ExecState *exec, const ArgList &args, int maxArgs, double *ms, GregorianDateTime *t)
+static bool fillStructuresUsingDateArgs(ExecState *exec, const ArgList& args, int maxArgs, double *ms, GregorianDateTime *t)
 {
     int idx = 0;
@@ -369 +398 @@
 bool DateInstance::getTime(GregorianDateTime &t, int &offset) const
 {
-    double milli = internalValue()->getNumber();
+    double milli = internalNumber();
     if (isnan(milli))
         return false;
@@ -380 +409 @@
 bool DateInstance::getUTCTime(GregorianDateTime &t) const
 {
-    double milli = internalValue()->getNumber();
+    double milli = internalNumber();
     if (isnan(milli))
         return false;
@@ -390 +419 @@
 bool DateInstance::getTime(double &milli, int &offset) const
 {
-    milli = internalValue()->getNumber();
+    milli = internalNumber();
     if (isnan(milli))
         return false;
@@ -402 +431 @@
 bool DateInstance::getUTCTime(double &milli) const
 {
-    milli = internalValue()->getNumber();
+    milli = internalNumber();
     if (isnan(milli))
         return false;
@@ -420 +449 @@
 
 /* Source for date_object.lut.h
-   FIXMEL We could use templates to simplify the UTC variants.
-@begin dateTable 61
+   FIXME: We could use templates to simplify the UTC variants.
+@begin dateTable
   toString              dateProtoFuncToString                DontEnum|Function       0
   toUTCString           dateProtoFuncToUTCString             DontEnum|Function       0
@@ -486 +515 @@
 // TODO: MakeTime (15.9.11.1) etc. ?
 
+static JSValue* dateParse(ExecState*, JSObject*, JSValue*, const ArgList&);
+static JSValue* dateNow(ExecState*, JSObject*, JSValue*, const ArgList&);
+static JSValue* dateUTC(ExecState*, JSObject*, JSValue*, const ArgList&);
+
 DateConstructor::DateConstructor(ExecState* exec, FunctionPrototype* funcProto, DatePrototype* dateProto)
   : InternalFunction(funcProto, Identifier(exec, dateProto->classInfo()->className))
 {
   putDirect(exec->propertyNames().prototype, dateProto, DontEnum|DontDelete|ReadOnly);
-  putDirectFunction(new (exec) DateFunction(exec, funcProto, DateFunction::Parse, 1, exec->propertyNames().parse), DontEnum);
-  putDirectFunction(new (exec) DateFunction(exec, funcProto, DateFunction::UTC, 7, exec->propertyNames().UTC), DontEnum);
-  putDirectFunction(new (exec) DateFunction(exec, funcProto, DateFunction::Now, 0, exec->propertyNames().now), DontEnum);
-  putDirect(exec, exec->propertyNames().length, 7, ReadOnly|DontDelete|DontEnum);
-}
-
-ConstructType DateConstructor::getConstructData(ConstructData&)
-{
-    return ConstructTypeNative;
+  putDirectFunction(new (exec) PrototypeFunction(exec, funcProto, 1, exec->propertyNames().parse, dateParse), DontEnum);
+  putDirectFunction(new (exec) PrototypeFunction(exec, funcProto, 7, exec->propertyNames().UTC, dateUTC), DontEnum);
+  putDirectFunction(new (exec) PrototypeFunction(exec, funcProto, 0, exec->propertyNames().now, dateNow), DontEnum);
+  putDirect(exec, exec->propertyNames().length, 7, ReadOnly | DontEnum | DontDelete);
 }
 
 // ECMA 15.9.3
-JSObject *DateConstructor::construct(ExecState *exec, const ArgList &args)
+static JSObject* constructDate(ExecState* exec, JSObject*, const ArgList& args)
 {
   int numArgs = args.size();
@@ -512 +540 @@
   } else if (numArgs == 1) {
     if (args[0]->isObject(&DateInstance::info))
-      value = static_cast<DateInstance*>(args[0])->internalValue()->toNumber(exec);
+      value = static_cast<DateInstance*>(args[0])->internalNumber();
     else {
       JSValue* primitive = args[0]->toPrimitive(exec);
@@ -549 +577 @@
 }
 
+ConstructType DateConstructor::getConstructData(ConstructData& constructData)
+{
+    constructData.native.function = constructDate;
+    return ConstructTypeNative;
+}
+
 // ECMA 15.9.2
-JSValue* DateConstructor::callAsFunction(ExecState* exec, JSObject * /*thisObj*/, const ArgList &/*args*/)
+static JSValue* callDate(ExecState* exec, JSObject*, JSValue*, const ArgList&)
 {
     time_t localTime = time(0);
@@ -559 +593 @@
 }
 
-// ------------------------------ DateFunction ----------------------------
-
-DateFunction::DateFunction(ExecState* exec, FunctionPrototype* funcProto, int i, int len, const Identifier& name)
-    : InternalFunction(funcProto, name), id(i)
-{
-    putDirect(exec, exec->propertyNames().length, len, DontDelete|ReadOnly|DontEnum);
-}
-
-// ECMA 15.9.4.2 - 3
-JSValue *DateFunction::callAsFunction(ExecState* exec, JSObject*, const ArgList& args)
-{
-  if (id == Parse)
+CallType DateConstructor::getCallData(CallData& callData)
+{
+    callData.native.function = callDate;
+    return CallTypeNative;
+}
+
+static JSValue* dateParse(ExecState* exec, JSObject*, JSValue*, const ArgList& args)
+{
     return jsNumber(exec, parseDate(args[0]->toString(exec)));
-  else if (id == Now)
+}
+
+static JSValue* dateNow(ExecState* exec, JSObject*, JSValue*, const ArgList&)
+{
     return jsNumber(exec, getCurrentUTCTime());
-  else { // UTC
+}
+
+static JSValue* dateUTC(ExecState* exec, JSObject*, JSValue*, const ArgList& args)
+{
     int n = args.size();
     if (isnan(args[0]->toNumber(exec))
-        || isnan(args[1]->toNumber(exec))
-        || (n >= 3 && isnan(args[2]->toNumber(exec)))
-        || (n >= 4 && isnan(args[3]->toNumber(exec)))
-        || (n >= 5 && isnan(args[4]->toNumber(exec)))
-        || (n >= 6 && isnan(args[5]->toNumber(exec)))
-        || (n >= 7 && isnan(args[6]->toNumber(exec)))) {
-      return jsNaN(exec);
+            || isnan(args[1]->toNumber(exec))
+            || (n >= 3 && isnan(args[2]->toNumber(exec)))
+            || (n >= 4 && isnan(args[3]->toNumber(exec)))
+            || (n >= 5 && isnan(args[4]->toNumber(exec)))
+            || (n >= 6 && isnan(args[5]->toNumber(exec)))
+            || (n >= 7 && isnan(args[6]->toNumber(exec)))) {
+        return jsNaN(exec);
     }
 
@@ -596 +632 @@
     double ms = (n >= 7) ? args[6]->toNumber(exec) : 0;
     return jsNumber(exec, gregorianDateTimeToMS(t, ms, true));
-  }
 }
 
@@ -979 +1014 @@
 // Functions
 
-JSValue* dateProtoFuncToString(ExecState* exec, JSObject* thisObj, const ArgList&)
-{
-    if (!thisObj->inherits(&DateInstance::info))
+JSValue* dateProtoFuncToString(ExecState* exec, JSObject*, JSValue* thisValue, const ArgList&)
+{
+    if (!thisValue->isObject(&DateInstance::info))
         return throwError(exec, TypeError);
 
     const bool utc = false;
 
-    DateInstance* thisDateObj = static_cast<DateInstance*>(thisObj); 
-    JSValue* v = thisDateObj->internalValue();
-    double milli = v->toNumber(exec);
+    DateInstance* thisDateObj = static_cast<DateInstance*>(thisValue); 
+    double milli = thisDateObj->internalNumber();
     if (isnan(milli))
         return jsString(exec, "Invalid Date");
@@ -997 +1031 @@
 }
 
-JSValue* dateProtoFuncToUTCString(ExecState* exec, JSObject* thisObj, const ArgList&)
-{
-    if (!thisObj->inherits(&DateInstance::info))
+JSValue* dateProtoFuncToUTCString(ExecState* exec, JSObject*, JSValue* thisValue, const ArgList&)
+{
+    if (!thisValue->isObject(&DateInstance::info))
         return throwError(exec, TypeError);
 
     const bool utc = true;
 
-    DateInstance* thisDateObj = static_cast<DateInstance*>(thisObj); 
-    JSValue* v = thisDateObj->internalValue();
-    double milli = v->toNumber(exec);
+    DateInstance* thisDateObj = static_cast<DateInstance*>(thisValue); 
+    double milli = thisDateObj->internalNumber();
     if (isnan(milli))
         return jsString(exec, "Invalid Date");
@@ -1015 +1048 @@
 }
 
-JSValue* dateProtoFuncToDateString(ExecState* exec, JSObject* thisObj, const ArgList&)
-{
-    if (!thisObj->inherits(&DateInstance::info))
+JSValue* dateProtoFuncToDateString(ExecState* exec, JSObject*, JSValue* thisValue, const ArgList&)
+{
+    if (!thisValue->isObject(&DateInstance::info))
         return throwError(exec, TypeError);
 
     const bool utc = false;
 
-    DateInstance* thisDateObj = static_cast<DateInstance*>(thisObj); 
-    JSValue* v = thisDateObj->internalValue();
-    double milli = v->toNumber(exec);
+    DateInstance* thisDateObj = static_cast<DateInstance*>(thisValue); 
+    double milli = thisDateObj->internalNumber();
     if (isnan(milli))
         return jsString(exec, "Invalid Date");
@@ -1033 +1065 @@
 }
 
-JSValue* dateProtoFuncToTimeString(ExecState* exec, JSObject* thisObj, const ArgList&)
-{
-    if (!thisObj->inherits(&DateInstance::info))
+JSValue* dateProtoFuncToTimeString(ExecState* exec, JSObject*, JSValue* thisValue, const ArgList&)
+{
+    if (!thisValue->isObject(&DateInstance::info))
         return throwError(exec, TypeError);
 
     const bool utc = false;
 
-    DateInstance* thisDateObj = static_cast<DateInstance*>(thisObj); 
-    JSValue* v = thisDateObj->internalValue();
-    double milli = v->toNumber(exec);
+    DateInstance* thisDateObj = static_cast<DateInstance*>(thisValue); 
+    double milli = thisDateObj->internalNumber();
     if (isnan(milli))
         return jsString(exec, "Invalid Date");
@@ -1051 +1082 @@
 }
 
-JSValue* dateProtoFuncToLocaleString(ExecState* exec, JSObject* thisObj, const ArgList& args)
-{
-    if (!thisObj->inherits(&DateInstance::info))
-        return throwError(exec, TypeError);
-
-    DateInstance* thisDateObj = static_cast<DateInstance*>(thisObj); 
-    JSValue* v = thisDateObj->internalValue();
-    double milli = v->toNumber(exec);
+JSValue* dateProtoFuncToLocaleString(ExecState* exec, JSObject*, JSValue* thisValue, const ArgList& args)
+{
+    if (!thisValue->isObject(&DateInstance::info))
+        return throwError(exec, TypeError);
+
+    DateInstance* thisDateObj = static_cast<DateInstance*>(thisValue); 
+    double milli = thisDateObj->internalNumber();
     if (isnan(milli))
         return jsString(exec, "Invalid Date");
@@ -1076 +1106 @@
 }
 
-JSValue* dateProtoFuncToLocaleDateString(ExecState* exec, JSObject* thisObj, const ArgList& args)
-{
-    if (!thisObj->inherits(&DateInstance::info))
-        return throwError(exec, TypeError);
-
-    DateInstance* thisDateObj = static_cast<DateInstance*>(thisObj); 
-    JSValue* v = thisDateObj->internalValue();
-    double milli = v->toNumber(exec);
+JSValue* dateProtoFuncToLocaleDateString(ExecState* exec, JSObject*, JSValue* thisValue, const ArgList& args)
+{
+    if (!thisValue->isObject(&DateInstance::info))
+        return throwError(exec, TypeError);
+
+    DateInstance* thisDateObj = static_cast<DateInstance*>(thisValue); 
+    double milli = thisDateObj->internalNumber();
     if (isnan(milli))
         return jsString(exec, "Invalid Date");
@@ -1101 +1130 @@
 }
 
-JSValue* dateProtoFuncToLocaleTimeString(ExecState* exec, JSObject* thisObj, const ArgList& args)
-{
-    if (!thisObj->inherits(&DateInstance::info))
-        return throwError(exec, TypeError);
-
-    DateInstance* thisDateObj = static_cast<DateInstance*>(thisObj); 
-    JSValue* v = thisDateObj->internalValue();
-    double milli = v->toNumber(exec);
+JSValue* dateProtoFuncToLocaleTimeString(ExecState* exec, JSObject*, JSValue* thisValue, const ArgList& args)
+{
+    if (!thisValue->isObject(&DateInstance::info))
+        return throwError(exec, TypeError);
+
+    DateInstance* thisDateObj = static_cast<DateInstance*>(thisValue); 
+    double milli = thisDateObj->internalNumber();
     if (isnan(milli))
         return jsString(exec, "Invalid Date");
@@ -1126 +1154 @@
 }
 
-JSValue* dateProtoFuncValueOf(ExecState* exec, JSObject* thisObj, const ArgList&)
-{
-    if (!thisObj->inherits(&DateInstance::info))
-        return throwError(exec, TypeError);
-
-    DateInstance* thisDateObj = static_cast<DateInstance*>(thisObj); 
-    JSValue* v = thisDateObj->internalValue();
-    double milli = v->toNumber(exec);
+JSValue* dateProtoFuncValueOf(ExecState* exec, JSObject*, JSValue* thisValue, const ArgList&)
+{
+    if (!thisValue->isObject(&DateInstance::info))
+        return throwError(exec, TypeError);
+
+    DateInstance* thisDateObj = static_cast<DateInstance*>(thisValue); 
+    double milli = thisDateObj->internalNumber();
     if (isnan(milli))
         return jsNaN(exec);
@@ -1140 +1167 @@
 }
 
-JSValue* dateProtoFuncGetTime(ExecState* exec, JSObject* thisObj, const ArgList&)
-{
-    if (!thisObj->inherits(&DateInstance::info))
-        return throwError(exec, TypeError);
-
-    DateInstance* thisDateObj = static_cast<DateInstance*>(thisObj); 
-    JSValue* v = thisDateObj->internalValue();
-    double milli = v->toNumber(exec);
+JSValue* dateProtoFuncGetTime(ExecState* exec, JSObject*, JSValue* thisValue, const ArgList&)
+{
+    if (!thisValue->isObject(&DateInstance::info))
+        return throwError(exec, TypeError);
+
+    DateInstance* thisDateObj = static_cast<DateInstance*>(thisValue); 
+    double milli = thisDateObj->internalNumber();
     if (isnan(milli))
         return jsNaN(exec);
@@ -1154 +1180 @@
 }
 
-JSValue* dateProtoFuncGetFullYear(ExecState* exec, JSObject* thisObj, const ArgList&)
-{
-    if (!thisObj->inherits(&DateInstance::info))
+JSValue* dateProtoFuncGetFullYear(ExecState* exec, JSObject*, JSValue* thisValue, const ArgList&)
+{
+    if (!thisValue->isObject(&DateInstance::info))
         return throwError(exec, TypeError);
 
     const bool utc = false;
 
-    DateInstance* thisDateObj = static_cast<DateInstance*>(thisObj); 
-    JSValue* v = thisDateObj->internalValue();
-    double milli = v->toNumber(exec);
+    DateInstance* thisDateObj = static_cast<DateInstance*>(thisValue); 
+    double milli = thisDateObj->internalNumber();
     if (isnan(milli))
         return jsNaN(exec);
@@ -1172 +1197 @@
 }
 
-JSValue* dateProtoFuncGetUTCFullYear(ExecState* exec, JSObject* thisObj, const ArgList&)
-{
-    if (!thisObj->inherits(&DateInstance::info))
+JSValue* dateProtoFuncGetUTCFullYear(ExecState* exec, JSObject*, JSValue* thisValue, const ArgList&)
+{
+    if (!thisValue->isObject(&DateInstance::info))
         return throwError(exec, TypeError);
 
     const bool utc = true;
 
-    DateInstance* thisDateObj = static_cast<DateInstance*>(thisObj); 
-    JSValue* v = thisDateObj->internalValue();
-    double milli = v->toNumber(exec);
+    DateInstance* thisDateObj = static_cast<DateInstance*>(thisValue); 
+    double milli = thisDateObj->internalNumber();
     if (isnan(milli))
         return jsNaN(exec);
@@ -1190 +1214 @@
 }
 
-JSValue* dateProtoFuncToGMTString(ExecState* exec, JSObject* thisObj, const ArgList&)
-{
-    if (!thisObj->inherits(&DateInstance::info))
+JSValue* dateProtoFuncToGMTString(ExecState* exec, JSObject*, JSValue* thisValue, const ArgList&)
+{
+    if (!thisValue->isObject(&DateInstance::info))
         return throwError(exec, TypeError);
 
     const bool utc = true;
 
-    DateInstance* thisDateObj = static_cast<DateInstance*>(thisObj); 
-    JSValue* v = thisDateObj->internalValue();
-    double milli = v->toNumber(exec);
+    DateInstance* thisDateObj = static_cast<DateInstance*>(thisValue); 
+    double milli = thisDateObj->internalNumber();
     if (isnan(milli))
         return jsString(exec, "Invalid Date");
@@ -1208 +1231 @@
 }
 
-JSValue* dateProtoFuncGetMonth(ExecState* exec, JSObject* thisObj, const ArgList&)
-{
-    if (!thisObj->inherits(&DateInstance::info))
+JSValue* dateProtoFuncGetMonth(ExecState* exec, JSObject*, JSValue* thisValue, const ArgList&)
+{
+    if (!thisValue->isObject(&DateInstance::info))
         return throwError(exec, TypeError);
 
     const bool utc = false;
 
-    DateInstance* thisDateObj = static_cast<DateInstance*>(thisObj); 
-    JSValue* v = thisDateObj->internalValue();
-    double milli = v->toNumber(exec);
+    DateInstance* thisDateObj = static_cast<DateInstance*>(thisValue); 
+    double milli = thisDateObj->internalNumber();
     if (isnan(milli))
         return jsNaN(exec);
@@ -1226 +1248 @@
 }
 
-JSValue* dateProtoFuncGetUTCMonth(ExecState* exec, JSObject* thisObj, const ArgList&)
-{
-    if (!thisObj->inherits(&DateInstance::info))
+JSValue* dateProtoFuncGetUTCMonth(ExecState* exec, JSObject*, JSValue* thisValue, const ArgList&)
+{
+    if (!thisValue->isObject(&DateInstance::info))
         return throwError(exec, TypeError);
 
     const bool utc = true;
 
-    DateInstance* thisDateObj = static_cast<DateInstance*>(thisObj); 
-    JSValue* v = thisDateObj->internalValue();
-    double milli = v->toNumber(exec);
+    DateInstance* thisDateObj = static_cast<DateInstance*>(thisValue); 
+    double milli = thisDateObj->internalNumber();
     if (isnan(milli))
         return jsNaN(exec);
@@ -1244 +1265 @@
 }
 
-JSValue* dateProtoFuncGetDate(ExecState* exec, JSObject* thisObj, const ArgList&)
-{
-    if (!thisObj->inherits(&DateInstance::info))
+JSValue* dateProtoFuncGetDate(ExecState* exec, JSObject*, JSValue* thisValue, const ArgList&)
+{
+    if (!thisValue->isObject(&DateInstance::info))
         return throwError(exec, TypeError);
 
     const bool utc = false;
 
-    DateInstance* thisDateObj = static_cast<DateInstance*>(thisObj); 
-    JSValue* v = thisDateObj->internalValue();
-    double milli = v->toNumber(exec);
+    DateInstance* thisDateObj = static_cast<DateInstance*>(thisValue); 
+    double milli = thisDateObj->internalNumber();
     if (isnan(milli))
         return jsNaN(exec);
@@ -1262 +1282 @@
 }
 
-JSValue* dateProtoFuncGetUTCDate(ExecState* exec, JSObject* thisObj, const ArgList&)
-{
-    if (!thisObj->inherits(&DateInstance::info))
+JSValue* dateProtoFuncGetUTCDate(ExecState* exec, JSObject*, JSValue* thisValue, const ArgList&)
+{
+    if (!thisValue->isObject(&DateInstance::info))
         return throwError(exec, TypeError);
 
     const bool utc = true;
 
-    DateInstance* thisDateObj = static_cast<DateInstance*>(thisObj); 
-    JSValue* v = thisDateObj->internalValue();
-    double milli = v->toNumber(exec);
+    DateInstance* thisDateObj = static_cast<DateInstance*>(thisValue); 
+    double milli = thisDateObj->internalNumber();
     if (isnan(milli))
         return jsNaN(exec);
@@ -1280 +1299 @@
 }
 
-JSValue* dateProtoFuncGetDay(ExecState* exec, JSObject* thisObj, const ArgList&)
-{
-    if (!thisObj->inherits(&DateInstance::info))
+JSValue* dateProtoFuncGetDay(ExecState* exec, JSObject*, JSValue* thisValue, const ArgList&)
+{
+    if (!thisValue->isObject(&DateInstance::info))
         return throwError(exec, TypeError);
 
     const bool utc = false;
 
-    DateInstance* thisDateObj = static_cast<DateInstance*>(thisObj); 
-    JSValue* v = thisDateObj->internalValue();
-    double milli = v->toNumber(exec);
+    DateInstance* thisDateObj = static_cast<DateInstance*>(thisValue); 
+    double milli = thisDateObj->internalNumber();
     if (isnan(milli))
         return jsNaN(exec);
@@ -1298 +1316 @@
 }
 
-JSValue* dateProtoFuncGetUTCDay(ExecState* exec, JSObject* thisObj, const ArgList&)
-{
-    if (!thisObj->inherits(&DateInstance::info))
+JSValue* dateProtoFuncGetUTCDay(ExecState* exec, JSObject*, JSValue* thisValue, const ArgList&)
+{
+    if (!thisValue->isObject(&DateInstance::info))
         return throwError(exec, TypeError);
 
     const bool utc = true;
 
-    DateInstance* thisDateObj = static_cast<DateInstance*>(thisObj); 
-    JSValue* v = thisDateObj->internalValue();
-    double milli = v->toNumber(exec);
+    DateInstance* thisDateObj = static_cast<DateInstance*>(thisValue); 
+    double milli = thisDateObj->internalNumber();
     if (isnan(milli))
         return jsNaN(exec);
@@ -1316 +1333 @@
 }
 
-JSValue* dateProtoFuncGetHours(ExecState* exec, JSObject* thisObj, const ArgList&)
-{
-    if (!thisObj->inherits(&DateInstance::info))
+JSValue* dateProtoFuncGetHours(ExecState* exec, JSObject*, JSValue* thisValue, const ArgList&)
+{
+    if (!thisValue->isObject(&DateInstance::info))
         return throwError(exec, TypeError);
 
     const bool utc = false;
 
-    DateInstance* thisDateObj = static_cast<DateInstance*>(thisObj); 
-    JSValue* v = thisDateObj->internalValue();
-    double milli = v->toNumber(exec);
+    DateInstance* thisDateObj = static_cast<DateInstance*>(thisValue); 
+    double milli = thisDateObj->internalNumber();
     if (isnan(milli))
         return jsNaN(exec);
@@ -1334 +1350 @@
 }
 
-JSValue* dateProtoFuncGetUTCHours(ExecState* exec, JSObject* thisObj, const ArgList&)
-{
-    if (!thisObj->inherits(&DateInstance::info))
+JSValue* dateProtoFuncGetUTCHours(ExecState* exec, JSObject*, JSValue* thisValue, const ArgList&)
+{
+    if (!thisValue->isObject(&DateInstance::info))
         return throwError(exec, TypeError);
 
     const bool utc = true;
 
-    DateInstance* thisDateObj = static_cast<DateInstance*>(thisObj); 
-    JSValue* v = thisDateObj->internalValue();
-    double milli = v->toNumber(exec);
+    DateInstance* thisDateObj = static_cast<DateInstance*>(thisValue); 
+    double milli = thisDateObj->internalNumber();
     if (isnan(milli))
         return jsNaN(exec);
@@ -1352 +1367 @@
 }
 
-JSValue* dateProtoFuncGetMinutes(ExecState* exec, JSObject* thisObj, const ArgList&)
-{
-    if (!thisObj->inherits(&DateInstance::info))
+JSValue* dateProtoFuncGetMinutes(ExecState* exec, JSObject*, JSValue* thisValue, const ArgList&)
+{
+    if (!thisValue->isObject(&DateInstance::info))
         return throwError(exec, TypeError);
 
     const bool utc = false;
 
-    DateInstance* thisDateObj = static_cast<DateInstance*>(thisObj); 
-    JSValue* v = thisDateObj->internalValue();
-    double milli = v->toNumber(exec);
+    DateInstance* thisDateObj = static_cast<DateInstance*>(thisValue); 
+    double milli = thisDateObj->internalNumber();
     if (isnan(milli))
         return jsNaN(exec);
@@ -1370 +1384 @@
 }
 
-JSValue* dateProtoFuncGetUTCMinutes(ExecState* exec, JSObject* thisObj, const ArgList&)
-{
-    if (!thisObj->inherits(&DateInstance::info))
+JSValue* dateProtoFuncGetUTCMinutes(ExecState* exec, JSObject*, JSValue* thisValue, const ArgList&)
+{
+    if (!thisValue->isObject(&DateInstance::info))
         return throwError(exec, TypeError);
 
     const bool utc = true;
 
-    DateInstance* thisDateObj = static_cast<DateInstance*>(thisObj); 
-    JSValue* v = thisDateObj->internalValue();
-    double milli = v->toNumber(exec);
+    DateInstance* thisDateObj = static_cast<DateInstance*>(thisValue); 
+    double milli = thisDateObj->internalNumber();
     if (isnan(milli))
         return jsNaN(exec);
@@ -1388 +1401 @@
 }
 
-JSValue* dateProtoFuncGetSeconds(ExecState* exec, JSObject* thisObj, const ArgList&)
-{
-    if (!thisObj->inherits(&DateInstance::info))
+JSValue* dateProtoFuncGetSeconds(ExecState* exec, JSObject*, JSValue* thisValue, const ArgList&)
+{
+    if (!thisValue->isObject(&DateInstance::info))
         return throwError(exec, TypeError);
 
     const bool utc = false;
 
-    DateInstance* thisDateObj = static_cast<DateInstance*>(thisObj); 
-    JSValue* v = thisDateObj->internalValue();
-    double milli = v->toNumber(exec);
+    DateInstance* thisDateObj = static_cast<DateInstance*>(thisValue); 
+    double milli = thisDateObj->internalNumber();
     if (isnan(milli))
         return jsNaN(exec);
@@ -1406 +1418 @@
 }
 
-JSValue* dateProtoFuncGetUTCSeconds(ExecState* exec, JSObject* thisObj, const ArgList&)
-{
-    if (!thisObj->inherits(&DateInstance::info))
+JSValue* dateProtoFuncGetUTCSeconds(ExecState* exec, JSObject*, JSValue* thisValue, const ArgList&)
+{
+    if (!thisValue->isObject(&DateInstance::info))
         return throwError(exec, TypeError);
 
     const bool utc = true;
 
-    DateInstance* thisDateObj = static_cast<DateInstance*>(thisObj); 
-    JSValue* v = thisDateObj->internalValue();
-    double milli = v->toNumber(exec);
+    DateInstance* thisDateObj = static_cast<DateInstance*>(thisValue); 
+    double milli = thisDateObj->internalNumber();
     if (isnan(milli))
         return jsNaN(exec);
@@ -1424 +1435 @@
 }
 
-JSValue* dateProtoFuncGetMilliSeconds(ExecState* exec, JSObject* thisObj, const ArgList&)
-{
-    if (!thisObj->inherits(&DateInstance::info))
-        return throwError(exec, TypeError);
-
-    DateInstance* thisDateObj = static_cast<DateInstance*>(thisObj); 
-    JSValue* v = thisDateObj->internalValue();
-    double milli = v->toNumber(exec);
+JSValue* dateProtoFuncGetMilliSeconds(ExecState* exec, JSObject*, JSValue* thisValue, const ArgList&)
+{
+    if (!thisValue->isObject(&DateInstance::info))
+        return throwError(exec, TypeError);
+
+    DateInstance* thisDateObj = static_cast<DateInstance*>(thisValue); 
+    double milli = thisDateObj->internalNumber();
     if (isnan(milli))
         return jsNaN(exec);
@@ -1440 +1450 @@
 }
 
-JSValue* dateProtoFuncGetUTCMilliseconds(ExecState* exec, JSObject* thisObj, const ArgList&)
-{
-    if (!thisObj->inherits(&DateInstance::info))
-        return throwError(exec, TypeError);
-
-    DateInstance* thisDateObj = static_cast<DateInstance*>(thisObj); 
-    JSValue* v = thisDateObj->internalValue();
-    double milli = v->toNumber(exec);
+JSValue* dateProtoFuncGetUTCMilliseconds(ExecState* exec, JSObject*, JSValue* thisValue, const ArgList&)
+{
+    if (!thisValue->isObject(&DateInstance::info))
+        return throwError(exec, TypeError);
+
+    DateInstance* thisDateObj = static_cast<DateInstance*>(thisValue); 
+    double milli = thisDateObj->internalNumber();
     if (isnan(milli))
         return jsNaN(exec);
@@ -1456 +1465 @@
 }
 
-JSValue* dateProtoFuncGetTimezoneOffset(ExecState* exec, JSObject* thisObj, const ArgList&)
-{
-    if (!thisObj->inherits(&DateInstance::info))
+JSValue* dateProtoFuncGetTimezoneOffset(ExecState* exec, JSObject*, JSValue* thisValue, const ArgList&)
+{
+    if (!thisValue->isObject(&DateInstance::info))
         return throwError(exec, TypeError);
 
     const bool utc = false;
 
-    DateInstance* thisDateObj = static_cast<DateInstance*>(thisObj); 
-    JSValue* v = thisDateObj->internalValue();
-    double milli = v->toNumber(exec);
+    DateInstance* thisDateObj = static_cast<DateInstance*>(thisValue); 
+    double milli = thisDateObj->internalNumber();
     if (isnan(milli))
         return jsNaN(exec);
@@ -1474 +1482 @@
 }
 
-JSValue* dateProtoFuncSetTime(ExecState* exec, JSObject* thisObj, const ArgList& args)
-{
-    if (!thisObj->inherits(&DateInstance::info))
-        return throwError(exec, TypeError);
-
-    DateInstance* thisDateObj = static_cast<DateInstance*>(thisObj); 
+JSValue* dateProtoFuncSetTime(ExecState* exec, JSObject*, JSValue* thisValue, const ArgList& args)
+{
+    if (!thisValue->isObject(&DateInstance::info))
+        return throwError(exec, TypeError);
+
+    DateInstance* thisDateObj = static_cast<DateInstance*>(thisValue); 
 
     double milli = timeClip(args[0]->toNumber(exec));
@@ -1487 +1495 @@
 }
 
-static JSValue* setNewValueFromTimeArgs(ExecState* exec, JSObject* thisObj, const ArgList& args, int numArgsToUse, bool inputIsUTC)
-{
-    if (!thisObj->inherits(&DateInstance::info))
-        return throwError(exec, TypeError);
-
-    DateInstance* thisDateObj = static_cast<DateInstance*>(thisObj);
-    JSValue* v = thisDateObj->internalValue();
-    double milli = v->toNumber(exec);
+static JSValue* setNewValueFromTimeArgs(ExecState* exec, JSValue* thisValue, const ArgList& args, int numArgsToUse, bool inputIsUTC)
+{
+    if (!thisValue->isObject(&DateInstance::info))
+        return throwError(exec, TypeError);
+
+    DateInstance* thisDateObj = static_cast<DateInstance*>(thisValue);
+    double milli = thisDateObj->internalNumber();
     
     if (args.isEmpty() || isnan(milli)) {
@@ -1519 +1526 @@
 }
 
-static JSValue* setNewValueFromDateArgs(ExecState* exec, JSObject* thisObj, const ArgList& args, int numArgsToUse, bool inputIsUTC)
-{
-    if (!thisObj->inherits(&DateInstance::info))
-        return throwError(exec, TypeError);
-
-    DateInstance* thisDateObj = static_cast<DateInstance*>(thisObj);
+static JSValue* setNewValueFromDateArgs(ExecState* exec, JSValue* thisValue, const ArgList& args, int numArgsToUse, bool inputIsUTC)
+{
+    if (!thisValue->isObject(&DateInstance::info))
+        return throwError(exec, TypeError);
+
+    DateInstance* thisDateObj = static_cast<DateInstance*>(thisValue);
     if (args.isEmpty()) {
         JSValue* result = jsNaN(exec);
@@ -1531 +1538 @@
     }      
     
-    JSValue* v = thisDateObj->internalValue();
-    double milli = v->toNumber(exec);
+    double milli = thisDateObj->internalNumber();
     double ms = 0;
 
@@ -1557 +1563 @@
 }
 
-JSValue* dateProtoFuncSetMilliSeconds(ExecState* exec, JSObject* thisObj, const ArgList& args)
+JSValue* dateProtoFuncSetMilliSeconds(ExecState* exec, JSObject*, JSValue* thisValue, const ArgList& args)
 {
     const bool inputIsUTC = false;
-    return setNewValueFromTimeArgs(exec, thisObj, args, 1, inputIsUTC);
-}
-
-JSValue* dateProtoFuncSetUTCMilliseconds(ExecState* exec, JSObject* thisObj, const ArgList& args)
+    return setNewValueFromTimeArgs(exec, thisValue, args, 1, inputIsUTC);
+}
+
+JSValue* dateProtoFuncSetUTCMilliseconds(ExecState* exec, JSObject*, JSValue* thisValue, const ArgList& args)
 {
     const bool inputIsUTC = true;
-    return setNewValueFromTimeArgs(exec, thisObj, args, 1, inputIsUTC);
-}
-
-JSValue* dateProtoFuncSetSeconds(ExecState* exec, JSObject* thisObj, const ArgList& args)
+    return setNewValueFromTimeArgs(exec, thisValue, args, 1, inputIsUTC);
+}
+
+JSValue* dateProtoFuncSetSeconds(ExecState* exec, JSObject*, JSValue* thisValue, const ArgList& args)
 {
     const bool inputIsUTC = false;
-    return setNewValueFromTimeArgs(exec, thisObj, args, 2, inputIsUTC);
-}
-
-JSValue* dateProtoFuncSetUTCSeconds(ExecState* exec, JSObject* thisObj, const ArgList& args)
+    return setNewValueFromTimeArgs(exec, thisValue, args, 2, inputIsUTC);
+}
+
+JSValue* dateProtoFuncSetUTCSeconds(ExecState* exec, JSObject*, JSValue* thisValue, const ArgList& args)
 {
     const bool inputIsUTC = true;
-    return setNewValueFromTimeArgs(exec, thisObj, args, 2, inputIsUTC);
-}
-
-JSValue* dateProtoFuncSetMinutes(ExecState* exec, JSObject* thisObj, const ArgList& args)
+    return setNewValueFromTimeArgs(exec, thisValue, args, 2, inputIsUTC);
+}
+
+JSValue* dateProtoFuncSetMinutes(ExecState* exec, JSObject*, JSValue* thisValue, const ArgList& args)
 {
     const bool inputIsUTC = false;
-    return setNewValueFromTimeArgs(exec, thisObj, args, 3, inputIsUTC);
-}
-
-JSValue* dateProtoFuncSetUTCMinutes(ExecState* exec, JSObject* thisObj, const ArgList& args)
+    return setNewValueFromTimeArgs(exec, thisValue, args, 3, inputIsUTC);
+}
+
+JSValue* dateProtoFuncSetUTCMinutes(ExecState* exec, JSObject*, JSValue* thisValue, const ArgList& args)
 {
     const bool inputIsUTC = true;
-    return setNewValueFromTimeArgs(exec, thisObj, args, 3, inputIsUTC);
-}
-
-JSValue* dateProtoFuncSetHours(ExecState* exec, JSObject* thisObj, const ArgList& args)
+    return setNewValueFromTimeArgs(exec, thisValue, args, 3, inputIsUTC);
+}
+
+JSValue* dateProtoFuncSetHours(ExecState* exec, JSObject*, JSValue* thisValue, const ArgList& args)
 {
     const bool inputIsUTC = false;
-    return setNewValueFromTimeArgs(exec, thisObj, args, 4, inputIsUTC);
-}
-
-JSValue* dateProtoFuncSetUTCHours(ExecState* exec, JSObject* thisObj, const ArgList& args)
+    return setNewValueFromTimeArgs(exec, thisValue, args, 4, inputIsUTC);
+}
+
+JSValue* dateProtoFuncSetUTCHours(ExecState* exec, JSObject*, JSValue* thisValue, const ArgList& args)
 {
     const bool inputIsUTC = true;
-    return setNewValueFromTimeArgs(exec, thisObj, args, 4, inputIsUTC);
-}
-
-JSValue* dateProtoFuncSetDate(ExecState* exec, JSObject* thisObj, const ArgList& args)
+    return setNewValueFromTimeArgs(exec, thisValue, args, 4, inputIsUTC);
+}
+
+JSValue* dateProtoFuncSetDate(ExecState* exec, JSObject*, JSValue* thisValue, const ArgList& args)
 {
     const bool inputIsUTC = false;
-    return setNewValueFromDateArgs(exec, thisObj, args, 1, inputIsUTC);
-}
-
-JSValue* dateProtoFuncSetUTCDate(ExecState* exec, JSObject* thisObj, const ArgList& args)
+    return setNewValueFromDateArgs(exec, thisValue, args, 1, inputIsUTC);
+}
+
+JSValue* dateProtoFuncSetUTCDate(ExecState* exec, JSObject*, JSValue* thisValue, const ArgList& args)
 {
     const bool inputIsUTC = true;
-    return setNewValueFromDateArgs(exec, thisObj, args, 1, inputIsUTC);
-}
-
-JSValue* dateProtoFuncSetMonth(ExecState* exec, JSObject* thisObj, const ArgList& args)
+    return setNewValueFromDateArgs(exec, thisValue, args, 1, inputIsUTC);
+}
+
+JSValue* dateProtoFuncSetMonth(ExecState* exec, JSObject*, JSValue* thisValue, const ArgList& args)
 {
     const bool inputIsUTC = false;
-    return setNewValueFromDateArgs(exec, thisObj, args, 2, inputIsUTC);
-}
-
-JSValue* dateProtoFuncSetUTCMonth(ExecState* exec, JSObject* thisObj, const ArgList& args)
+    return setNewValueFromDateArgs(exec, thisValue, args, 2, inputIsUTC);
+}
+
+JSValue* dateProtoFuncSetUTCMonth(ExecState* exec, JSObject*, JSValue* thisValue, const ArgList& args)
 {
     const bool inputIsUTC = true;
-    return setNewValueFromDateArgs(exec, thisObj, args, 2, inputIsUTC);
-}
-
-JSValue* dateProtoFuncSetFullYear(ExecState* exec, JSObject* thisObj, const ArgList& args)
+    return setNewValueFromDateArgs(exec, thisValue, args, 2, inputIsUTC);
+}
+
+JSValue* dateProtoFuncSetFullYear(ExecState* exec, JSObject*, JSValue* thisValue, const ArgList& args)
 {
     const bool inputIsUTC = false;
-    return setNewValueFromDateArgs(exec, thisObj, args, 3, inputIsUTC);
-}
-
-JSValue* dateProtoFuncSetUTCFullYear(ExecState* exec, JSObject* thisObj, const ArgList& args)
+    return setNewValueFromDateArgs(exec, thisValue, args, 3, inputIsUTC);
+}
+
+JSValue* dateProtoFuncSetUTCFullYear(ExecState* exec, JSObject*, JSValue* thisValue, const ArgList& args)
 {
     const bool inputIsUTC = true;
-    return setNewValueFromDateArgs(exec, thisObj, args, 3, inputIsUTC);
-}
-
-JSValue* dateProtoFuncSetYear(ExecState* exec, JSObject* thisObj, const ArgList& args)
-{
-    if (!thisObj->inherits(&DateInstance::info))
+    return setNewValueFromDateArgs(exec, thisValue, args, 3, inputIsUTC);
+}
+
+JSValue* dateProtoFuncSetYear(ExecState* exec, JSObject*, JSValue* thisValue, const ArgList& args)
+{
+    if (!thisValue->isObject(&DateInstance::info))
         return throwError(exec, TypeError);
 
     const bool utc = false;
 
-    DateInstance* thisDateObj = static_cast<DateInstance*>(thisObj);     
+    DateInstance* thisDateObj = static_cast<DateInstance*>(thisValue);     
     if (args.isEmpty()) { 
         JSValue* result = jsNaN(exec);
@@ -1655 +1661 @@
     }
     
-    JSValue* v = thisDateObj->internalValue();
-    double milli = v->toNumber(exec);
+    double milli = thisDateObj->internalNumber();
     double ms = 0;
 
@@ -1684 +1689 @@
 }
 
-JSValue* dateProtoFuncGetYear(ExecState* exec, JSObject* thisObj, const ArgList&)
-{
-    if (!thisObj->inherits(&DateInstance::info))
+JSValue* dateProtoFuncGetYear(ExecState* exec, JSObject*, JSValue* thisValue, const ArgList&)
+{
+    if (!thisValue->isObject(&DateInstance::info))
         return throwError(exec, TypeError);
 
     const bool utc = false;
 
-    DateInstance* thisDateObj = static_cast<DateInstance*>(thisObj); 
-    JSValue* v = thisDateObj->internalValue();
-    double milli = v->toNumber(exec);
+    DateInstance* thisDateObj = static_cast<DateInstance*>(thisValue); 
+    double milli = thisDateObj->internalNumber();
     if (isnan(milli))
         return jsNaN(exec);

trunk/JavaScriptCore/kjs/date_object.h

@@ -34 +34 @@
     class DateInstance : public JSWrapperObject {
     public:
-        DateInstance(JSObject *proto);
+        DateInstance(JSObject* prototype);
         virtual ~DateInstance();
-        
+
+        double internalNumber() const { return internalValue()->uncheckedGetNumber(); }
+
         bool getTime(GregorianDateTime&, int& offset) const;
         bool getUTCTime(GregorianDateTime&) const;
-        bool getTime(double& milli, int& offset) const;
-        bool getUTCTime(double& milli) const;
+        bool getTime(double& milliseconds, int& offset) const;
+        bool getUTCTime(double& milliseconds) const;
         
-        virtual const ClassInfo *classInfo() const { return &info; }
         static const ClassInfo info;
 
@@ -48 +49 @@
 
     private:
+        virtual const ClassInfo* classInfo() const { return &info; }
+
+        using JSWrapperObject::internalValue;
+
         struct Cache;
         mutable Cache* m_cache;
@@ -69 +74 @@
      * @internal
      *
-     * Functions to implement all methods that are properties of the
-     * Date.prototype object
-     */
-    
-    // Non-normative properties (Appendix B)
-    // GetYear, SetYear, ToGMTString
-
-    JSValue* dateProtoFuncToString(ExecState*, JSObject*, const ArgList&);
-    JSValue* dateProtoFuncToUTCString(ExecState*, JSObject*, const ArgList&);
-    JSValue* dateProtoFuncToDateString(ExecState*, JSObject*, const ArgList&);
-    JSValue* dateProtoFuncToTimeString(ExecState*, JSObject*, const ArgList&);
-    JSValue* dateProtoFuncToLocaleString(ExecState*, JSObject*, const ArgList&);
-    JSValue* dateProtoFuncToLocaleDateString(ExecState*, JSObject*, const ArgList&);
-    JSValue* dateProtoFuncToLocaleTimeString(ExecState*, JSObject*, const ArgList&);
-    JSValue* dateProtoFuncValueOf(ExecState*, JSObject*, const ArgList&);
-    JSValue* dateProtoFuncGetTime(ExecState*, JSObject*, const ArgList&);
-    JSValue* dateProtoFuncGetFullYear(ExecState*, JSObject*, const ArgList&);
-    JSValue* dateProtoFuncGetUTCFullYear(ExecState*, JSObject*, const ArgList&);
-    JSValue* dateProtoFuncToGMTString(ExecState*, JSObject*, const ArgList&);
-    JSValue* dateProtoFuncGetMonth(ExecState*, JSObject*, const ArgList&);
-    JSValue* dateProtoFuncGetUTCMonth(ExecState*, JSObject*, const ArgList&);
-    JSValue* dateProtoFuncGetDate(ExecState*, JSObject*, const ArgList&);
-    JSValue* dateProtoFuncGetUTCDate(ExecState*, JSObject*, const ArgList&);
-    JSValue* dateProtoFuncGetDay(ExecState*, JSObject*, const ArgList&);
-    JSValue* dateProtoFuncGetUTCDay(ExecState*, JSObject*, const ArgList&);
-    JSValue* dateProtoFuncGetHours(ExecState*, JSObject*, const ArgList&);
-    JSValue* dateProtoFuncGetUTCHours(ExecState*, JSObject*, const ArgList&);
-    JSValue* dateProtoFuncGetMinutes(ExecState*, JSObject*, const ArgList&);
-    JSValue* dateProtoFuncGetUTCMinutes(ExecState*, JSObject*, const ArgList&);
-    JSValue* dateProtoFuncGetSeconds(ExecState*, JSObject*, const ArgList&);
-    JSValue* dateProtoFuncGetUTCSeconds(ExecState*, JSObject*, const ArgList&);
-    JSValue* dateProtoFuncGetMilliSeconds(ExecState*, JSObject*, const ArgList&);
-    JSValue* dateProtoFuncGetUTCMilliseconds(ExecState*, JSObject*, const ArgList&);
-    JSValue* dateProtoFuncGetTimezoneOffset(ExecState*, JSObject*, const ArgList&);
-    JSValue* dateProtoFuncSetTime(ExecState*, JSObject*, const ArgList&);
-    JSValue* dateProtoFuncSetMilliSeconds(ExecState*, JSObject*, const ArgList&);
-    JSValue* dateProtoFuncSetUTCMilliseconds(ExecState*, JSObject*, const ArgList&);
-    JSValue* dateProtoFuncSetSeconds(ExecState*, JSObject*, const ArgList&);
-    JSValue* dateProtoFuncSetUTCSeconds(ExecState*, JSObject*, const ArgList&);
-    JSValue* dateProtoFuncSetMinutes(ExecState*, JSObject*, const ArgList&);
-    JSValue* dateProtoFuncSetUTCMinutes(ExecState*, JSObject*, const ArgList&);
-    JSValue* dateProtoFuncSetHours(ExecState*, JSObject*, const ArgList&);
-    JSValue* dateProtoFuncSetUTCHours(ExecState*, JSObject*, const ArgList&);
-    JSValue* dateProtoFuncSetDate(ExecState*, JSObject*, const ArgList&);
-    JSValue* dateProtoFuncSetUTCDate(ExecState*, JSObject*, const ArgList&);
-    JSValue* dateProtoFuncSetMonth(ExecState*, JSObject*, const ArgList&);
-    JSValue* dateProtoFuncSetUTCMonth(ExecState*, JSObject*, const ArgList&);
-    JSValue* dateProtoFuncSetFullYear(ExecState*, JSObject*, const ArgList&);
-    JSValue* dateProtoFuncSetUTCFullYear(ExecState*, JSObject*, const ArgList&);
-    JSValue* dateProtoFuncSetYear(ExecState*, JSObject*, const ArgList&);
-    JSValue* dateProtoFuncGetYear(ExecState*, JSObject*, const ArgList&);
-
-    /**
-     * @internal
-     *
      * The initial value of the the global variable's "Date" property
      */
@@ -129 +79 @@
     public:
         DateConstructor(ExecState*, FunctionPrototype*, DatePrototype*);
-
+    private:
         virtual ConstructType getConstructData(ConstructData&);
-        virtual JSObject* construct(ExecState*, const ArgList& args);
-
-        virtual JSValue* callAsFunction(ExecState*, JSObject* thisObj, const ArgList& args);
-
-        JSObject* construct(const ArgList&);
+        virtual CallType getCallData(CallData&);
     };
 

trunk/JavaScriptCore/kjs/error_object.cpp

@@ -40 +40 @@
 // ------------------------------ ErrorPrototype ----------------------------
 
+static JSValue* errorProtoFuncToString(ExecState*, JSObject*, JSValue*, const ArgList&);
+
 // ECMA 15.9.4
 ErrorPrototype::ErrorPrototype(ExecState* exec, ObjectPrototype* objectPrototype, FunctionPrototype* functionPrototype)
@@ -52 +54 @@
 }
 
-JSValue* errorProtoFuncToString(ExecState* exec, JSObject* thisObj, const ArgList&)
+JSValue* errorProtoFuncToString(ExecState* exec, JSObject*, JSValue* thisValue, const ArgList&)
 {
+    JSObject* thisObj = thisValue->toThisObject(exec);
+
     UString s = "Error";
 
@@ -61 +65 @@
 
     v = thisObj->get(exec, exec->propertyNames().message);
-    if (!v->isUndefined())
-        // Mozilla compatible format
-        s += ": " + v->toString(exec);
+    if (!v->isUndefined()) {
+        // Mozilla-compatible format.
+        s += ": ";
+        s += v->toString(exec);
+    }
 
     return jsString(exec, s);
@@ -78 +84 @@
 }
 
-ConstructType ErrorConstructor::getConstructData(ConstructData&)
+// ECMA 15.9.3
+static ErrorInstance* constructError(ExecState* exec, const ArgList& args)
 {
+    ErrorInstance* obj = new (exec) ErrorInstance(exec->lexicalGlobalObject()->errorPrototype());
+    if (!args[0]->isUndefined())
+        obj->putDirect(exec->propertyNames().message, jsString(exec, args[0]->toString(exec)));
+    return obj;
+}
+
+static JSObject* constructWithErrorConstructor(ExecState* exec, JSObject*, const ArgList& args)
+{
+    return constructError(exec, args);
+}
+
+ConstructType ErrorConstructor::getConstructData(ConstructData& constructData)
+{
+    constructData.native.function = constructWithErrorConstructor;
     return ConstructTypeNative;
 }
 
-// ECMA 15.9.3
-JSObject* ErrorConstructor::construct(ExecState* exec, const ArgList& args)
+// ECMA 15.9.2
+static JSValue* callErrorConstructor(ExecState* exec, JSObject*, JSValue*, const ArgList& args)
 {
-    JSObject* proto = static_cast<JSObject*>(exec->lexicalGlobalObject()->errorPrototype());
-    JSObject* imp = new (exec) ErrorInstance(proto);
-    JSObject* obj(imp);
-
-    if (!args[0]->isUndefined())
-        imp->putDirect(exec->propertyNames().message, jsString(exec, args[0]->toString(exec)));
-
-    return obj;
+    // "Error()" gives the sames result as "new Error()"
+    return constructError(exec, args);
 }
 
-// ECMA 15.9.2
-JSValue* ErrorConstructor::callAsFunction(ExecState* exec, JSObject* /*thisObj*/, const ArgList& args)
+CallType ErrorConstructor::getCallData(CallData& callData)
 {
-    // "Error()" gives the sames result as "new Error()"
-    return construct(exec, args);
+    callData.native.function = callErrorConstructor;
+    return CallTypeNative;
 }
 
@@ -124 +138 @@
 }
 
-ConstructType NativeErrorConstructor::getConstructData(ConstructData&)
+ErrorInstance* NativeErrorConstructor::construct(ExecState* exec, const ArgList& args)
 {
+    ErrorInstance* object = new (exec) ErrorInstance(proto);
+    if (!args[0]->isUndefined())
+        object->putDirect(exec->propertyNames().message, jsString(exec, args[0]->toString(exec)));
+    return object;
+}
+
+static JSObject* constructWithNativeErrorConstructor(ExecState* exec, JSObject* constructor, const ArgList& args)
+{
+    return static_cast<NativeErrorConstructor*>(constructor)->construct(exec, args);
+}
+
+ConstructType NativeErrorConstructor::getConstructData(ConstructData& constructData)
+{
+    constructData.native.function = constructWithNativeErrorConstructor;
     return ConstructTypeNative;
 }
 
-JSObject* NativeErrorConstructor::construct(ExecState* exec, const ArgList& args)
+static JSValue* callNativeErrorConstructor(ExecState* exec, JSObject* constructor, JSValue*, const ArgList& args)
 {
-    JSObject* imp = new (exec) ErrorInstance(proto);
-    JSObject* obj(imp);
-    if (!args[0]->isUndefined())
-        imp->putDirect(exec->propertyNames().message, jsString(exec, args[0]->toString(exec)));
-    return obj;
+    return static_cast<NativeErrorConstructor*>(constructor)->construct(exec, args);
 }
 
-JSValue* NativeErrorConstructor::callAsFunction(ExecState* exec, JSObject*, const ArgList& args)
+CallType NativeErrorConstructor::getCallData(CallData& callData)
 {
-    return construct(exec, args);
+    callData.native.function = callNativeErrorConstructor;
+    return CallTypeNative;
 }
 

trunk/JavaScriptCore/kjs/error_object.h

@@ -39 +39 @@
     };
 
-    JSValue* errorProtoFuncToString(ExecState*, JSObject*, const ArgList&);
-
     class ErrorConstructor : public InternalFunction {
     public:
         ErrorConstructor(ExecState*, FunctionPrototype*, ErrorPrototype*);
 
+    private:
         virtual ConstructType getConstructData(ConstructData&);
-        virtual JSObject* construct(ExecState*, const ArgList&);
-
-        virtual JSValue* callAsFunction(ExecState*, JSObject*, const ArgList&);
+        virtual CallType getCallData(CallData&);
     };
 
@@ -59 +56 @@
     public:
         NativeErrorConstructor(ExecState*, FunctionPrototype*, NativeErrorPrototype*);
-
-        virtual ConstructType getConstructData(ConstructData&);
-        virtual JSObject* construct(ExecState*, const ArgList&);
-
-        virtual JSValue* callAsFunction(ExecState*, JSObject*, const ArgList&);
-
         virtual void mark();
-
-        virtual const ClassInfo* classInfo() const { return &info; }
         static const ClassInfo info;
+        ErrorInstance* construct(ExecState*, const ArgList&);
 
     private:
-        JSObject* proto;
+        virtual const ClassInfo* classInfo() const { return &info; }
+        virtual ConstructType getConstructData(ConstructData&);
+        virtual CallType getCallData(CallData&);
+
+        NativeErrorPrototype* proto;
     };
 

trunk/JavaScriptCore/kjs/internal.cpp

@@ -176 +176 @@
 }
 
-JSObject *JSNumberCell::toObject(ExecState *exec) const
-{
-  ArgList args;
-  args.append(const_cast<JSNumberCell*>(this));
-  return static_cast<JSObject *>(exec->lexicalGlobalObject()->numberConstructor()->construct(exec,args));
+JSObject* JSNumberCell::toObject(ExecState* exec) const
+{
+    return constructNumber(exec, const_cast<JSNumberCell*>(this));
 }
 
 JSObject* JSNumberCell::toThisObject(ExecState* exec) const
 {
-    ArgList args;
-    args.append(const_cast<JSNumberCell*>(this));
-    return static_cast<JSObject*>(exec->lexicalGlobalObject()->numberConstructor()->construct(exec, args));
+    return constructNumber(exec, const_cast<JSNumberCell*>(this));
 }
 
@@ -213 +209 @@
 
 // --------------------------- GetterSetter ---------------------------------
+
 void GetterSetter::mark()
 {
     JSCell::mark();
-    
-    if (getter && !getter->marked())
-        getter->mark();
-    if (setter && !setter->marked())
-        setter->mark();
+
+    if (m_getter && !m_getter->marked())
+        m_getter->mark();
+    if (m_setter && !m_setter->marked())
+        m_setter->mark();
 }
 
 JSValue* GetterSetter::toPrimitive(ExecState*, JSType) const
 {
-    ASSERT(false);
+    ASSERT_NOT_REACHED();
     return jsNull();
 }
@@ -239 +236 @@
 bool GetterSetter::toBoolean(ExecState*) const
 {
-    ASSERT(false);
+    ASSERT_NOT_REACHED();
     return false;
 }
 
-double GetterSetter::toNumber(ExecState *) const
-{
-    ASSERT(false);
+double GetterSetter::toNumber(ExecState*) const
+{
+    ASSERT_NOT_REACHED();
     return 0.0;
 }
 
-UString GetterSetter::toString(ExecState *) const
-{
-    ASSERT(false);
+UString GetterSetter::toString(ExecState*) const
+{
+    ASSERT_NOT_REACHED();
     return UString::null();
 }
 
-JSObject *GetterSetter::toObject(ExecState *exec) const
-{
-    ASSERT(false);
+JSObject* GetterSetter::toObject(ExecState* exec) const
+{
+    ASSERT_NOT_REACHED();
     return jsNull()->toObject(exec);
-}
-
-bool GetterSetter::getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&)
-{
-    ASSERT_NOT_REACHED();
-    return false;
-}
-
-bool GetterSetter::getOwnPropertySlot(ExecState*, unsigned, PropertySlot&)
-{
-    ASSERT_NOT_REACHED();
-    return false;
-}
-
-void GetterSetter::put(ExecState*, const Identifier&, JSValue*)
-{
-    ASSERT_NOT_REACHED();
-}
-
-void GetterSetter::put(ExecState*, unsigned, JSValue*)
-{
-    ASSERT_NOT_REACHED();
-}
-
-JSObject* GetterSetter::toThisObject(ExecState*) const
-{
-    ASSERT_NOT_REACHED();
-    return 0;
 }
 
@@ -323 +292 @@
 }
 
-InternalFunction::InternalFunction(FunctionPrototype* funcProto, const Identifier& name)
-  : JSObject(funcProto)
-  , m_name(name)
-{
-}
-
-CallType InternalFunction::getCallData(CallData&)
-{
-    return CallTypeNative;
+InternalFunction::InternalFunction(FunctionPrototype* prototype, const Identifier& name)
+    : JSObject(prototype)
+    , m_name(name)
+{
 }
 
 bool InternalFunction::implementsHasInstance() const
 {
-  return true;
-}
-
-}
+    return true;
+}
+
+}

trunk/JavaScriptCore/kjs/lookup.h

@@ -46 +46 @@
         union {
             intptr_t integerValue;
-            PrototypeFunction::JSMemberFunction functionValue;
+            NativeFunction functionValue;
         };
         unsigned char attributes; // JSObject attributes

trunk/JavaScriptCore/kjs/nodes.cpp

@@ -1683 +1683 @@
     JSFunction* func = new (exec) JSFunction(exec, m_ident, m_body.get(), scopeChain);
 
-    JSObject* proto = exec->lexicalGlobalObject()->objectConstructor()->construct(exec, exec->emptyList());
+    JSObject* proto = constructEmptyObject(exec);
     proto->putDirect(exec->propertyNames().constructor, func, DontEnum);
     func->putDirect(exec->propertyNames().prototype, proto, DontDelete);
@@ -1705 +1705 @@
 {
     JSFunction* func = new (exec) JSFunction(exec, m_ident, m_body.get(), scopeChain);
-    JSObject* proto = exec->lexicalGlobalObject()->objectConstructor()->construct(exec, exec->emptyList());
+    JSObject* proto = constructEmptyObject(exec);
     proto->putDirect(exec->propertyNames().constructor, func, DontEnum);
     func->putDirect(exec->propertyNames().prototype, proto, DontDelete);

trunk/JavaScriptCore/kjs/object_object.cpp

@@ -31 +31 @@
 // ------------------------------ ObjectPrototype --------------------------------
 
-static JSValue* objectProtoFuncValueOf(ExecState*, JSObject*, const ArgList&);
-static JSValue* objectProtoFuncHasOwnProperty(ExecState*, JSObject*, const ArgList&);
-static JSValue* objectProtoFuncIsPrototypeOf(ExecState*, JSObject*, const ArgList&);
-static JSValue* objectProtoFuncDefineGetter(ExecState*, JSObject*, const ArgList&);
-static JSValue* objectProtoFuncDefineSetter(ExecState*, JSObject*, const ArgList&);
-static JSValue* objectProtoFuncLookupGetter(ExecState*, JSObject*, const ArgList&);
-static JSValue* objectProtoFuncLookupSetter(ExecState*, JSObject*, const ArgList&);
-static JSValue* objectProtoFuncPropertyIsEnumerable(ExecState*, JSObject*, const ArgList&);
-static JSValue* objectProtoFuncToLocaleString(ExecState*, JSObject*, const ArgList&);
+static JSValue* objectProtoFuncValueOf(ExecState*, JSObject*, JSValue*, const ArgList&);
+static JSValue* objectProtoFuncHasOwnProperty(ExecState*, JSObject*, JSValue*, const ArgList&);
+static JSValue* objectProtoFuncIsPrototypeOf(ExecState*, JSObject*, JSValue*, const ArgList&);
+static JSValue* objectProtoFuncDefineGetter(ExecState*, JSObject*, JSValue*, const ArgList&);
+static JSValue* objectProtoFuncDefineSetter(ExecState*, JSObject*, JSValue*, const ArgList&);
+static JSValue* objectProtoFuncLookupGetter(ExecState*, JSObject*, JSValue*, const ArgList&);
+static JSValue* objectProtoFuncLookupSetter(ExecState*, JSObject*, JSValue*, const ArgList&);
+static JSValue* objectProtoFuncPropertyIsEnumerable(ExecState*, JSObject*, JSValue*, const ArgList&);
+static JSValue* objectProtoFuncToLocaleString(ExecState*, JSObject*, JSValue*, const ArgList&);
 
 ObjectPrototype::ObjectPrototype(ExecState* exec, FunctionPrototype* functionPrototype)
@@ -63 +63 @@
 // ECMA 15.2.4.2, 15.2.4.4, 15.2.4.5, 15.2.4.7
 
-JSValue* objectProtoFuncValueOf(ExecState*, JSObject* thisObj, const ArgList&)
+JSValue* objectProtoFuncValueOf(ExecState* exec, JSObject*, JSValue* thisValue, const ArgList&)
 {
-    return thisObj;
+    return thisValue->toThisObject(exec);
 }
 
-JSValue* objectProtoFuncHasOwnProperty(ExecState* exec, JSObject* thisObj, const ArgList& args)
+JSValue* objectProtoFuncHasOwnProperty(ExecState* exec, JSObject*, JSValue* thisValue, const ArgList& args)
 {
-    return jsBoolean(thisObj->hasOwnProperty(exec, Identifier(exec, args[0]->toString(exec))));
+    return jsBoolean(thisValue->toThisObject(exec)->hasOwnProperty(exec, Identifier(exec, args[0]->toString(exec))));
 }
 
-JSValue* objectProtoFuncIsPrototypeOf(ExecState*, JSObject* thisObj, const ArgList& args)
+JSValue* objectProtoFuncIsPrototypeOf(ExecState* exec, JSObject*, JSValue* thisValue, const ArgList& args)
 {
+    JSObject* thisObj = thisValue->toThisObject(exec);
+
     if (!args[0]->isObject())
         return jsBoolean(false);
@@ -83 +85 @@
         if (!v->isObject())
             return jsBoolean(false);
-        if (thisObj == static_cast<JSObject*>(v))
+        if (thisObj == v)
 
             return jsBoolean(true);
@@ -90 +92 @@
 }
 
-JSValue* objectProtoFuncDefineGetter(ExecState* exec, JSObject* thisObj, const ArgList& args)
+JSValue* objectProtoFuncDefineGetter(ExecState* exec, JSObject*, JSValue* thisValue, const ArgList& args)
 {
-    if (!args[1]->isObject() || !static_cast<JSObject*>(args[1])->implementsCall())
+    CallData callData;
+    if (args[1]->getCallData(callData) == CallTypeNone)
         return throwError(exec, SyntaxError, "invalid getter usage");
-
-    thisObj->defineGetter(exec, Identifier(exec, args[0]->toString(exec)), static_cast<JSObject *>(args[1]));
+    thisValue->toThisObject(exec)->defineGetter(exec, Identifier(exec, args[0]->toString(exec)), static_cast<JSObject*>(args[1]));
     return jsUndefined();
 }
 
-JSValue* objectProtoFuncDefineSetter(ExecState* exec, JSObject* thisObj, const ArgList& args)
+JSValue* objectProtoFuncDefineSetter(ExecState* exec, JSObject*, JSValue* thisValue, const ArgList& args)
 {
-    if (!args[1]->isObject() || !static_cast<JSObject*>(args[1])->implementsCall())
+    CallData callData;
+    if (args[1]->getCallData(callData) == CallTypeNone)
         return throwError(exec, SyntaxError, "invalid setter usage");
-
-    thisObj->defineSetter(exec, Identifier(exec, args[0]->toString(exec)), static_cast<JSObject *>(args[1]));
+    thisValue->toThisObject(exec)->defineSetter(exec, Identifier(exec, args[0]->toString(exec)), static_cast<JSObject*>(args[1]));
     return jsUndefined();
 }
 
-JSValue* objectProtoFuncLookupGetter(ExecState* exec, JSObject* thisObj, const ArgList& args)
+JSValue* objectProtoFuncLookupGetter(ExecState* exec, JSObject*, JSValue* thisValue, const ArgList& args)
 {
-    return thisObj->lookupGetter(exec, Identifier(exec, args[0]->toString(exec)));
+    return thisValue->toThisObject(exec)->lookupGetter(exec, Identifier(exec, args[0]->toString(exec)));
 }
 
-JSValue* objectProtoFuncLookupSetter(ExecState* exec, JSObject* thisObj, const ArgList& args)
+JSValue* objectProtoFuncLookupSetter(ExecState* exec, JSObject*, JSValue* thisValue, const ArgList& args)
 {
-    return thisObj->lookupSetter(exec, Identifier(exec, args[0]->toString(exec)));
+    return thisValue->toThisObject(exec)->lookupSetter(exec, Identifier(exec, args[0]->toString(exec)));
 }
 
-JSValue* objectProtoFuncPropertyIsEnumerable(ExecState* exec, JSObject* thisObj, const ArgList& args)
+JSValue* objectProtoFuncPropertyIsEnumerable(ExecState* exec, JSObject*, JSValue* thisValue, const ArgList& args)
 {
-    return jsBoolean(thisObj->propertyIsEnumerable(exec, Identifier(exec, args[0]->toString(exec))));
+    return jsBoolean(thisValue->toThisObject(exec)->propertyIsEnumerable(exec, Identifier(exec, args[0]->toString(exec))));
 }
 
-JSValue* objectProtoFuncToLocaleString(ExecState* exec, JSObject* thisObj, const ArgList&)
+JSValue* objectProtoFuncToLocaleString(ExecState* exec, JSObject*, JSValue* thisValue, const ArgList&)
 {
-    return jsString(exec, thisObj->toString(exec));
+    return jsString(exec, thisValue->toThisObject(exec)->toString(exec));
 }
 
-JSValue* objectProtoFuncToString(ExecState* exec, JSObject* thisObj, const ArgList&)
+JSValue* objectProtoFuncToString(ExecState* exec, JSObject*, JSValue* thisValue, const ArgList&)
 {
-    return jsString(exec, "[object " + thisObj->className() + "]");
+    return jsString(exec, "[object " + thisValue->toThisObject(exec)->className() + "]");
 }
 
@@ -142 +144 @@
 
   // no. of arguments for constructor
-  putDirect(exec->propertyNames().length, jsNumber(exec, 1), ReadOnly|DontDelete|DontEnum);
+  putDirect(exec->propertyNames().length, jsNumber(exec, 1), ReadOnly | DontEnum | DontDelete);
 }
 
-ConstructType ObjectConstructor::getConstructData(ConstructData&)
+// ECMA 15.2.2
+static ALWAYS_INLINE JSObject* constructObject(ExecState* exec, const ArgList& args)
 {
+    JSValue* arg = args[0];
+    if (arg->isUndefinedOrNull())
+        return new (exec) JSObject(exec->lexicalGlobalObject()->objectPrototype());
+    return arg->toObject(exec);
+}
+
+static JSObject* constructWithObjectConstructor(ExecState* exec, JSObject*, const ArgList& args)
+{
+    return constructObject(exec, args);
+}
+
+ConstructType ObjectConstructor::getConstructData(ConstructData& constructData)
+{
+    constructData.native.function = constructWithObjectConstructor;
     return ConstructTypeNative;
 }
 
-// ECMA 15.2.2
-JSObject* ObjectConstructor::construct(ExecState* exec, const ArgList& args)
+static JSValue* callObjectConstructor(ExecState* exec, JSObject*, JSValue*, const ArgList& args)
 {
-  JSValue* arg = args[0];
-  switch (arg->type()) {
-  case StringType:
-  case BooleanType:
-  case NumberType:
-  case ObjectType:
-      return arg->toObject(exec);
-  case NullType:
-  case UndefinedType:
-      return new (exec) JSObject(exec->lexicalGlobalObject()->objectPrototype());
-  default:
-      ASSERT_NOT_REACHED();
-      return 0;
-  }
+    return constructObject(exec, args);
 }
 
-JSValue* ObjectConstructor::callAsFunction(ExecState* exec, JSObject* /*thisObj*/, const ArgList &args)
+CallType ObjectConstructor::getCallData(CallData& callData)
 {
-    return construct(exec, args);
+    callData.native.function = callObjectConstructor;
+    return CallTypeNative;
 }
 

trunk/JavaScriptCore/kjs/object_object.h

@@ -37 +37 @@
     };
 
-    JSValue* objectProtoFuncToString(ExecState*, JSObject*, const ArgList&);
+    JSValue* objectProtoFuncToString(ExecState*, JSObject*, JSValue*, const ArgList&);
 
     /**
@@ -47 +47 @@
     public:
         ObjectConstructor(ExecState*, ObjectPrototype*, FunctionPrototype*);
-
+    private:
         virtual ConstructType getConstructData(ConstructData&);
-        virtual JSObject* construct(ExecState*, const ArgList&);
-
-        virtual JSValue* callAsFunction(ExecState*, JSObject*, const ArgList&);
+        virtual CallType getCallData(CallData&);
     };
 

trunk/JavaScriptCore/kjs/string_object.cpp

@@ -22 +22 @@
 #include "config.h"
 #include "string_object.h"
-#include "string_object.lut.h"
 
 #include "JSWrapperObject.h"
@@ -37 +36 @@
 namespace KJS {
 
+static JSValue* stringProtoFuncToString(ExecState*, JSObject*, JSValue*, const ArgList&);
+static JSValue* stringProtoFuncValueOf(ExecState*, JSObject*, JSValue*, const ArgList&);
+static JSValue* stringProtoFuncCharAt(ExecState*, JSObject*, JSValue*, const ArgList&);
+static JSValue* stringProtoFuncCharCodeAt(ExecState*, JSObject*, JSValue*, const ArgList&);
+static JSValue* stringProtoFuncConcat(ExecState*, JSObject*, JSValue*, const ArgList&);
+static JSValue* stringProtoFuncIndexOf(ExecState*, JSObject*, JSValue*, const ArgList&);
+static JSValue* stringProtoFuncLastIndexOf(ExecState*, JSObject*, JSValue*, const ArgList&);
+static JSValue* stringProtoFuncMatch(ExecState*, JSObject*, JSValue*, const ArgList&);
+static JSValue* stringProtoFuncReplace(ExecState*, JSObject*, JSValue*, const ArgList&);
+static JSValue* stringProtoFuncSearch(ExecState*, JSObject*, JSValue*, const ArgList&);
+static JSValue* stringProtoFuncSlice(ExecState*, JSObject*, JSValue*, const ArgList&);
+static JSValue* stringProtoFuncSplit(ExecState*, JSObject*, JSValue*, const ArgList&);
+static JSValue* stringProtoFuncSubstr(ExecState*, JSObject*, JSValue*, const ArgList&);
+static JSValue* stringProtoFuncSubstring(ExecState*, JSObject*, JSValue*, const ArgList&);
+static JSValue* stringProtoFuncToLowerCase(ExecState*, JSObject*, JSValue*, const ArgList&);
+static JSValue* stringProtoFuncToUpperCase(ExecState*, JSObject*, JSValue*, const ArgList&);
+static JSValue* stringProtoFuncToLocaleLowerCase(ExecState*, JSObject*, JSValue*, const ArgList&);
+static JSValue* stringProtoFuncToLocaleUpperCase(ExecState*, JSObject*, JSValue*, const ArgList&);
+static JSValue* stringProtoFuncLocaleCompare(ExecState*, JSObject*, JSValue*, const ArgList&);
+
+static JSValue* stringProtoFuncBig(ExecState*, JSObject*, JSValue*, const ArgList&);
+static JSValue* stringProtoFuncSmall(ExecState*, JSObject*, JSValue*, const ArgList&);
+static JSValue* stringProtoFuncBlink(ExecState*, JSObject*, JSValue*, const ArgList&);
+static JSValue* stringProtoFuncBold(ExecState*, JSObject*, JSValue*, const ArgList&);
+static JSValue* stringProtoFuncFixed(ExecState*, JSObject*, JSValue*, const ArgList&);
+static JSValue* stringProtoFuncItalics(ExecState*, JSObject*, JSValue*, const ArgList&);
+static JSValue* stringProtoFuncStrike(ExecState*, JSObject*, JSValue*, const ArgList&);
+static JSValue* stringProtoFuncSub(ExecState*, JSObject*, JSValue*, const ArgList&);
+static JSValue* stringProtoFuncSup(ExecState*, JSObject*, JSValue*, const ArgList&);
+static JSValue* stringProtoFuncFontcolor(ExecState*, JSObject*, JSValue*, const ArgList&);
+static JSValue* stringProtoFuncFontsize(ExecState*, JSObject*, JSValue*, const ArgList&);
+static JSValue* stringProtoFuncAnchor(ExecState*, JSObject*, JSValue*, const ArgList&);
+static JSValue* stringProtoFuncLink(ExecState*, JSObject*, JSValue*, const ArgList&);
+
+}
+
+#include "string_object.lut.h"
+
+namespace KJS {
+
 // ------------------------------ StringObject ----------------------------
 
@@ -99 +138 @@
 /* Source for string_object.lut.h
 @begin stringTable 26
-  toString              &stringProtoFuncToString          DontEnum|Function       0
-  valueOf               &stringProtoFuncValueOf           DontEnum|Function       0
-  charAt                &stringProtoFuncCharAt            DontEnum|Function       1
-  charCodeAt            &stringProtoFuncCharCodeAt        DontEnum|Function       1
-  concat                &stringProtoFuncConcat            DontEnum|Function       1
-  indexOf               &stringProtoFuncIndexOf           DontEnum|Function       1
-  lastIndexOf           &stringProtoFuncLastIndexOf       DontEnum|Function       1
-  match                 &stringProtoFuncMatch             DontEnum|Function       1
-  replace               &stringProtoFuncReplace           DontEnum|Function       2
-  search                &stringProtoFuncSearch            DontEnum|Function       1
-  slice                 &stringProtoFuncSlice             DontEnum|Function       2
-  split                 &stringProtoFuncSplit             DontEnum|Function       2
-  substr                &stringProtoFuncSubstr            DontEnum|Function       2
-  substring             &stringProtoFuncSubstring         DontEnum|Function       2
-  toLowerCase           &stringProtoFuncToLowerCase       DontEnum|Function       0
-  toUpperCase           &stringProtoFuncToUpperCase       DontEnum|Function       0
-  toLocaleLowerCase     &stringProtoFuncToLocaleLowerCase DontEnum|Function       0
-  toLocaleUpperCase     &stringProtoFuncToLocaleUpperCase DontEnum|Function       0
-  localeCompare         &stringProtoFuncLocaleCompare     DontEnum|Function       1
-
-  big                   &stringProtoFuncBig               DontEnum|Function       0
-  small                 &stringProtoFuncSmall             DontEnum|Function       0
-  blink                 &stringProtoFuncBlink             DontEnum|Function       0
-  bold                  &stringProtoFuncBold              DontEnum|Function       0
-  fixed                 &stringProtoFuncFixed             DontEnum|Function       0
-  italics               &stringProtoFuncItalics           DontEnum|Function       0
-  strike                &stringProtoFuncStrike            DontEnum|Function       0
-  sub                   &stringProtoFuncSub               DontEnum|Function       0
-  sup                   &stringProtoFuncSup               DontEnum|Function       0
-  fontcolor             &stringProtoFuncFontcolor         DontEnum|Function       1
-  fontsize              &stringProtoFuncFontsize          DontEnum|Function       1
-  anchor                &stringProtoFuncAnchor            DontEnum|Function       1
-  link                  &stringProtoFuncLink              DontEnum|Function       1
+  toString              stringProtoFuncToString          DontEnum|Function       0
+  valueOf               stringProtoFuncValueOf           DontEnum|Function       0
+  charAt                stringProtoFuncCharAt            DontEnum|Function       1
+  charCodeAt            stringProtoFuncCharCodeAt        DontEnum|Function       1
+  concat                stringProtoFuncConcat            DontEnum|Function       1
+  indexOf               stringProtoFuncIndexOf           DontEnum|Function       1
+  lastIndexOf           stringProtoFuncLastIndexOf       DontEnum|Function       1
+  match                 stringProtoFuncMatch             DontEnum|Function       1
+  replace               stringProtoFuncReplace           DontEnum|Function       2
+  search                stringProtoFuncSearch            DontEnum|Function       1
+  slice                 stringProtoFuncSlice             DontEnum|Function       2
+  split                 stringProtoFuncSplit             DontEnum|Function       2
+  substr                stringProtoFuncSubstr            DontEnum|Function       2
+  substring             stringProtoFuncSubstring         DontEnum|Function       2
+  toLowerCase           stringProtoFuncToLowerCase       DontEnum|Function       0
+  toUpperCase           stringProtoFuncToUpperCase       DontEnum|Function       0
+  toLocaleLowerCase     stringProtoFuncToLocaleLowerCase DontEnum|Function       0
+  toLocaleUpperCase     stringProtoFuncToLocaleUpperCase DontEnum|Function       0
+  localeCompare         stringProtoFuncLocaleCompare     DontEnum|Function       1
+
+  big                   stringProtoFuncBig               DontEnum|Function       0
+  small                 stringProtoFuncSmall             DontEnum|Function       0
+  blink                 stringProtoFuncBlink             DontEnum|Function       0
+  bold                  stringProtoFuncBold              DontEnum|Function       0
+  fixed                 stringProtoFuncFixed             DontEnum|Function       0
+  italics               stringProtoFuncItalics           DontEnum|Function       0
+  strike                stringProtoFuncStrike            DontEnum|Function       0
+  sub                   stringProtoFuncSub               DontEnum|Function       0
+  sup                   stringProtoFuncSup               DontEnum|Function       0
+  fontcolor             stringProtoFuncFontcolor         DontEnum|Function       1
+  fontsize              stringProtoFuncFontsize          DontEnum|Function       1
+  anchor                stringProtoFuncAnchor            DontEnum|Function       1
+  link                  stringProtoFuncLink              DontEnum|Function       1
 @end
 */
@@ -268 +307 @@
 {
   UString source = sourceVal->value();
-  JSObject *replacementFunction = 0;
+  CallData callData;
   UString replacementString;
 
-  if (replacement->isObject() && replacement->toObject(exec)->implementsCall())
-    replacementFunction = replacement->toObject(exec);
-  else
+  CallType callType = replacement->getCallData(callData);
+  if (callType == CallTypeNone)
     replacementString = replacement->toString(exec);
 
@@ -304 +342 @@
 
       UString substitutedReplacement;
-      if (replacementFunction) {
+      if (callType != CallTypeNone) {
           int completeMatchStart = ovector[0];
           ArgList args;
@@ -321 +359 @@
           args.append(sourceVal);
 
-          substitutedReplacement = replacementFunction->callAsFunction(exec, exec->globalThisValue(), args)->toString(exec);
+          substitutedReplacement = call(exec, replacement, callType, callData, exec->globalThisValue(), args)->toString(exec);
       } else
           substitutedReplacement = substituteBackreferences(replacementString, source, ovector, reg);
@@ -363 +401 @@
     return sourceVal;
   
-  if (replacementFunction) {
+  if (callType != CallTypeNone) {
       ArgList args;
       
@@ -370 +408 @@
       args.append(sourceVal);
       
-      replacementString = replacementFunction->callAsFunction(exec, exec->globalThisValue(), args)->toString(exec);
+      replacementString = call(exec, replacement, callType, callData, exec->globalThisValue(), args)->toString(exec);
   }
 
@@ -376 +414 @@
 }
 
-JSValue* stringProtoFuncToString(ExecState* exec, JSObject* thisObj, const ArgList&)
-{
-    if (!thisObj->inherits(&StringObject::info))
+JSValue* stringProtoFuncToString(ExecState* exec, JSObject*, JSValue* thisValue, const ArgList&)
+{
+    if (!thisValue->isObject(&StringObject::info))
         return throwError(exec, TypeError);
 
-    return static_cast<StringObject*>(thisObj)->internalValue();
-}
-
-JSValue* stringProtoFuncValueOf(ExecState* exec, JSObject* thisObj, const ArgList&)
-{
-    if (!thisObj->inherits(&StringObject::info))
+    return static_cast<StringObject*>(thisValue)->internalValue();
+}
+
+JSValue* stringProtoFuncValueOf(ExecState* exec, JSObject*, JSValue* thisValue, const ArgList&)
+{
+    if (!thisValue->isObject(&StringObject::info))
         return throwError(exec, TypeError);
 
-    return static_cast<StringObject*>(thisObj)->internalValue();
-}
-
-JSValue* stringProtoFuncCharAt(ExecState* exec, JSObject* thisObj, const ArgList& args)
-{
-    // This optimizes the common case that thisObj is a StringObject
-    UString s = thisObj->inherits(&StringObject::info) ? static_cast<StringObject*>(thisObj)->internalValue()->value() : thisObj->toString(exec);
+    return static_cast<StringObject*>(thisValue)->internalValue();
+}
+
+JSValue* stringProtoFuncCharAt(ExecState* exec, JSObject*, JSValue* thisValue, const ArgList& args)
+{
+    // This optimizes the common case that thisObj is a StringObject
+    UString s = thisValue->isObject(&StringObject::info) ? static_cast<StringObject*>(thisValue)->internalValue()->value() : thisValue->toThisObject(exec)->toString(exec);
     int len = s.size();
 
@@ -408 +446 @@
 }
 
-JSValue* stringProtoFuncCharCodeAt(ExecState* exec, JSObject* thisObj, const ArgList& args)
-{
-    // This optimizes the common case that thisObj is a StringObject
-    UString s = thisObj->inherits(&StringObject::info) ? static_cast<StringObject*>(thisObj)->internalValue()->value() : thisObj->toString(exec);
+JSValue* stringProtoFuncCharCodeAt(ExecState* exec, JSObject*, JSValue* thisValue, const ArgList& args)
+{
+    // This optimizes the common case that thisObj is a StringObject
+    UString s = thisValue->isObject(&StringObject::info) ? static_cast<StringObject*>(thisValue)->internalValue()->value() : thisValue->toThisObject(exec)->toString(exec);
     int len = s.size();
 
@@ -425 +463 @@
 }
 
-JSValue* stringProtoFuncConcat(ExecState* exec, JSObject* thisObj, const ArgList& args)
-{
-    // This optimizes the common case that thisObj is a StringObject
-    UString s = thisObj->inherits(&StringObject::info) ? static_cast<StringObject*>(thisObj)->internalValue()->value() : thisObj->toString(exec);
+JSValue* stringProtoFuncConcat(ExecState* exec, JSObject*, JSValue* thisValue, const ArgList& args)
+{
+    // This optimizes the common case that thisObj is a StringObject
+    UString s = thisValue->isObject(&StringObject::info) ? static_cast<StringObject*>(thisValue)->internalValue()->value() : thisValue->toThisObject(exec)->toString(exec);
 
     ArgList::const_iterator end = args.end();
@@ -437 +475 @@
 }
 
-JSValue* stringProtoFuncIndexOf(ExecState* exec, JSObject* thisObj, const ArgList& args)
-{
-    // This optimizes the common case that thisObj is a StringObject
-    UString s = thisObj->inherits(&StringObject::info) ? static_cast<StringObject*>(thisObj)->internalValue()->value() : thisObj->toString(exec);
+JSValue* stringProtoFuncIndexOf(ExecState* exec, JSObject*, JSValue* thisValue, const ArgList& args)
+{
+    // This optimizes the common case that thisObj is a StringObject
+    UString s = thisValue->isObject(&StringObject::info) ? static_cast<StringObject*>(thisValue)->internalValue()->value() : thisValue->toThisObject(exec)->toString(exec);
     int len = s.size();
 
@@ -454 +492 @@
 }
 
-JSValue* stringProtoFuncLastIndexOf(ExecState* exec, JSObject* thisObj, const ArgList& args)
-{
-    // This optimizes the common case that thisObj is a StringObject
-    UString s = thisObj->inherits(&StringObject::info) ? static_cast<StringObject*>(thisObj)->internalValue()->value() : thisObj->toString(exec);
+JSValue* stringProtoFuncLastIndexOf(ExecState* exec, JSObject*, JSValue* thisValue, const ArgList& args)
+{
+    // This optimizes the common case that thisObj is a StringObject
+    UString s = thisValue->isObject(&StringObject::info) ? static_cast<StringObject*>(thisValue)->internalValue()->value() : thisValue->toThisObject(exec)->toString(exec);
     int len = s.size();
 
@@ -472 +510 @@
 }
 
-JSValue* stringProtoFuncMatch(ExecState* exec, JSObject* thisObj, const ArgList& args)
-{
-    // This optimizes the common case that thisObj is a StringObject
-    UString s = thisObj->inherits(&StringObject::info) ? static_cast<StringObject*>(thisObj)->internalValue()->value() : thisObj->toString(exec);
+JSValue* stringProtoFuncMatch(ExecState* exec, JSObject*, JSValue* thisValue, const ArgList& args)
+{
+    // This optimizes the common case that thisObj is a StringObject
+    UString s = thisValue->isObject(&StringObject::info) ? static_cast<StringObject*>(thisValue)->internalValue()->value() : thisValue->toThisObject(exec)->toString(exec);
 
     JSValue* a0 = args[0];
@@ -521 +559 @@
         result = jsNull();
       } else {
-        result = exec->lexicalGlobalObject()->arrayConstructor()->construct(exec, list);
+        result = constructArray(exec, list);
       }
     }
@@ -527 +565 @@
 }
 
-JSValue* stringProtoFuncSearch(ExecState* exec, JSObject* thisObj, const ArgList& args)
-{
-    // This optimizes the common case that thisObj is a StringObject
-    UString s = thisObj->inherits(&StringObject::info) ? static_cast<StringObject*>(thisObj)->internalValue()->value() : thisObj->toString(exec);
+JSValue* stringProtoFuncSearch(ExecState* exec, JSObject*, JSValue* thisValue, const ArgList& args)
+{
+    // This optimizes the common case that thisObj is a StringObject
+    UString s = thisValue->isObject(&StringObject::info) ? static_cast<StringObject*>(thisValue)->internalValue()->value() : thisValue->toThisObject(exec)->toString(exec);
 
     JSValue* a0 = args[0];
@@ -553 +591 @@
 }
 
-JSValue* stringProtoFuncReplace(ExecState* exec, JSObject* thisObj, const ArgList& args)
-{
-    // This optimizes the common case that thisObj is a StringObject
-    UString s = thisObj->inherits(&StringObject::info) ? static_cast<StringObject*>(thisObj)->internalValue()->value() : thisObj->toString(exec);
-
-    JSString* sVal = thisObj->inherits(&StringObject::info) ?
-      static_cast<StringObject*>(thisObj)->internalValue() :
+JSValue* stringProtoFuncReplace(ExecState* exec, JSObject*, JSValue* thisValue, const ArgList& args)
+{
+    // This optimizes the common case that thisObj is a StringObject
+    UString s = thisValue->isObject(&StringObject::info) ? static_cast<StringObject*>(thisValue)->internalValue()->value() : thisValue->toThisObject(exec)->toString(exec);
+
+    JSString* sVal = thisValue->isObject(&StringObject::info) ?
+      static_cast<StringObject*>(thisValue)->internalValue() :
       static_cast<JSString*>(jsString(exec, s));
 
@@ -568 +606 @@
 }
 
-JSValue* stringProtoFuncSlice(ExecState* exec, JSObject* thisObj, const ArgList& args)
-{
-    // This optimizes the common case that thisObj is a StringObject
-    UString s = thisObj->inherits(&StringObject::info) ? static_cast<StringObject*>(thisObj)->internalValue()->value() : thisObj->toString(exec);
+JSValue* stringProtoFuncSlice(ExecState* exec, JSObject*, JSValue* thisValue, const ArgList& args)
+{
+    // This optimizes the common case that thisObj is a StringObject
+    UString s = thisValue->isObject(&StringObject::info) ? static_cast<StringObject*>(thisValue)->internalValue()->value() : thisValue->toThisObject(exec)->toString(exec);
     int len = s.size();
 
@@ -593 +631 @@
 }
 
-JSValue* stringProtoFuncSplit(ExecState* exec, JSObject* thisObj, const ArgList& args)
-{
-    // This optimizes the common case that thisObj is a StringObject
-    UString s = thisObj->inherits(&StringObject::info) ? static_cast<StringObject*>(thisObj)->internalValue()->value() : thisObj->toString(exec);
+JSValue* stringProtoFuncSplit(ExecState* exec, JSObject*, JSValue* thisValue, const ArgList& args)
+{
+    // This optimizes the common case that thisObj is a StringObject
+    UString s = thisValue->isObject(&StringObject::info) ? static_cast<StringObject*>(thisValue)->internalValue()->value() : thisValue->toThisObject(exec)->toString(exec);
 
     JSValue* a0 = args[0];
     JSValue* a1 = args[1];
 
-    JSObject *constructor = exec->lexicalGlobalObject()->arrayConstructor();
-    JSObject* res = static_cast<JSObject*>(constructor->construct(exec, exec->emptyList()));
+    JSObject* res = constructEmptyArray(exec);
     JSValue* result = res;
     UString u = s;
@@ -663 +700 @@
 }
 
-JSValue* stringProtoFuncSubstr(ExecState* exec, JSObject* thisObj, const ArgList& args)
-{
-    // This optimizes the common case that thisObj is a StringObject
-    UString s = thisObj->inherits(&StringObject::info) ? static_cast<StringObject*>(thisObj)->internalValue()->value() : thisObj->toString(exec);
+JSValue* stringProtoFuncSubstr(ExecState* exec, JSObject*, JSValue* thisValue, const ArgList& args)
+{
+    // This optimizes the common case that thisObj is a StringObject
+    UString s = thisValue->isObject(&StringObject::info) ? static_cast<StringObject*>(thisValue)->internalValue()->value() : thisValue->toThisObject(exec)->toString(exec);
     int len = s.size();
 
@@ -688 +725 @@
 }
 
-JSValue* stringProtoFuncSubstring(ExecState* exec, JSObject* thisObj, const ArgList& args)
-{
-    // This optimizes the common case that thisObj is a StringObject
-    UString s = thisObj->inherits(&StringObject::info) ? static_cast<StringObject*>(thisObj)->internalValue()->value() : thisObj->toString(exec);
+JSValue* stringProtoFuncSubstring(ExecState* exec, JSObject*, JSValue* thisValue, const ArgList& args)
+{
+    // This optimizes the common case that thisObj is a StringObject
+    UString s = thisValue->isObject(&StringObject::info) ? static_cast<StringObject*>(thisValue)->internalValue()->value() : thisValue->toThisObject(exec)->toString(exec);
     int len = s.size();
 
@@ -721 +758 @@
 }
 
-JSValue* stringProtoFuncToLowerCase(ExecState* exec, JSObject* thisObj, const ArgList&)
-{
-    // This optimizes the common case that thisObj is a StringObject
-    UString s = thisObj->inherits(&StringObject::info) ? static_cast<StringObject*>(thisObj)->internalValue()->value() : thisObj->toString(exec);
+JSValue* stringProtoFuncToLowerCase(ExecState* exec, JSObject*, JSValue* thisValue, const ArgList&)
+{
+    // This optimizes the common case that thisObj is a StringObject
+    UString s = thisValue->isObject(&StringObject::info) ? static_cast<StringObject*>(thisValue)->internalValue()->value() : thisValue->toThisObject(exec)->toString(exec);
     
-    JSString* sVal = thisObj->inherits(&StringObject::info)
-        ? static_cast<StringObject*>(thisObj)->internalValue()
+    JSString* sVal = thisValue->isObject(&StringObject::info)
+        ? static_cast<StringObject*>(thisValue)->internalValue()
         : static_cast<JSString*>(jsString(exec, s));
     int ssize = s.size();
@@ -746 +783 @@
 }
 
-JSValue* stringProtoFuncToUpperCase(ExecState* exec, JSObject* thisObj, const ArgList&)
-{
-    // This optimizes the common case that thisObj is a StringObject
-    UString s = thisObj->inherits(&StringObject::info) ? static_cast<StringObject*>(thisObj)->internalValue()->value() : thisObj->toString(exec);
-
-    JSString* sVal = thisObj->inherits(&StringObject::info)
-        ? static_cast<StringObject*>(thisObj)->internalValue()
+JSValue* stringProtoFuncToUpperCase(ExecState* exec, JSObject*, JSValue* thisValue, const ArgList&)
+{
+    // This optimizes the common case that thisObj is a StringObject
+    UString s = thisValue->isObject(&StringObject::info) ? static_cast<StringObject*>(thisValue)->internalValue()->value() : thisValue->toThisObject(exec)->toString(exec);
+
+    JSString* sVal = thisValue->isObject(&StringObject::info)
+        ? static_cast<StringObject*>(thisValue)->internalValue()
         : static_cast<JSString*>(jsString(exec, s));
     int ssize = s.size();
@@ -771 +808 @@
 }
 
-JSValue* stringProtoFuncToLocaleLowerCase(ExecState* exec, JSObject* thisObj, const ArgList&)
-{
-    // This optimizes the common case that thisObj is a StringObject
-    UString s = thisObj->inherits(&StringObject::info) ? static_cast<StringObject*>(thisObj)->internalValue()->value() : thisObj->toString(exec);
+JSValue* stringProtoFuncToLocaleLowerCase(ExecState* exec, JSObject*, JSValue* thisValue, const ArgList&)
+{
+    // This optimizes the common case that thisObj is a StringObject
+    UString s = thisValue->isObject(&StringObject::info) ? static_cast<StringObject*>(thisValue)->internalValue()->value() : thisValue->toThisObject(exec)->toString(exec);
     
     // FIXME: See http://www.unicode.org/Public/UNIDATA/SpecialCasing.txt for locale-sensitive mappings that aren't implemented.
-    JSString* sVal = thisObj->inherits(&StringObject::info)
-        ? static_cast<StringObject*>(thisObj)->internalValue()
+    JSString* sVal = thisValue->isObject(&StringObject::info)
+        ? static_cast<StringObject*>(thisValue)->internalValue()
         : static_cast<JSString*>(jsString(exec, s));
     int ssize = s.size();
@@ -797 +834 @@
 }
 
-JSValue* stringProtoFuncToLocaleUpperCase(ExecState* exec, JSObject* thisObj, const ArgList&)
-{
-    // This optimizes the common case that thisObj is a StringObject
-    UString s = thisObj->inherits(&StringObject::info) ? static_cast<StringObject*>(thisObj)->internalValue()->value() : thisObj->toString(exec);
-
-    JSString* sVal = thisObj->inherits(&StringObject::info)
-        ? static_cast<StringObject*>(thisObj)->internalValue()
+JSValue* stringProtoFuncToLocaleUpperCase(ExecState* exec, JSObject*, JSValue* thisValue, const ArgList&)
+{
+    // This optimizes the common case that thisObj is a StringObject
+    UString s = thisValue->isObject(&StringObject::info) ? static_cast<StringObject*>(thisValue)->internalValue()->value() : thisValue->toThisObject(exec)->toString(exec);
+
+    JSString* sVal = thisValue->isObject(&StringObject::info)
+        ? static_cast<StringObject*>(thisValue)->internalValue()
         : static_cast<JSString*>(jsString(exec, s));
     int ssize = s.size();
@@ -822 +859 @@
 }
 
-JSValue* stringProtoFuncLocaleCompare(ExecState* exec, JSObject* thisObj, const ArgList& args)
+JSValue* stringProtoFuncLocaleCompare(ExecState* exec, JSObject*, JSValue* thisValue, const ArgList& args)
 {
     if (args.size() < 1)
@@ -828 +865 @@
 
     // This optimizes the common case that thisObj is a StringObject
-    UString s = thisObj->inherits(&StringObject::info) ? static_cast<StringObject*>(thisObj)->internalValue()->value() : thisObj->toString(exec);
+    UString s = thisValue->isObject(&StringObject::info) ? static_cast<StringObject*>(thisValue)->internalValue()->value() : thisValue->toThisObject(exec)->toString(exec);
     JSValue* a0 = args[0];
     return jsNumber(exec, localeCompare(s, a0->toString(exec)));
 }
 
-JSValue* stringProtoFuncBig(ExecState* exec, JSObject* thisObj, const ArgList&)
-{
-    // This optimizes the common case that thisObj is a StringObject
-    UString s = thisObj->inherits(&StringObject::info) ? static_cast<StringObject*>(thisObj)->internalValue()->value() : thisObj->toString(exec);
+JSValue* stringProtoFuncBig(ExecState* exec, JSObject*, JSValue* thisValue, const ArgList&)
+{
+    // This optimizes the common case that thisObj is a StringObject
+    UString s = thisValue->isObject(&StringObject::info) ? static_cast<StringObject*>(thisValue)->internalValue()->value() : thisValue->toThisObject(exec)->toString(exec);
     return jsString(exec, "<big>" + s + "</big>");
 }
 
-JSValue* stringProtoFuncSmall(ExecState* exec, JSObject* thisObj, const ArgList&)
-{
-    // This optimizes the common case that thisObj is a StringObject
-    UString s = thisObj->inherits(&StringObject::info) ? static_cast<StringObject*>(thisObj)->internalValue()->value() : thisObj->toString(exec);
+JSValue* stringProtoFuncSmall(ExecState* exec, JSObject*, JSValue* thisValue, const ArgList&)
+{
+    // This optimizes the common case that thisObj is a StringObject
+    UString s = thisValue->isObject(&StringObject::info) ? static_cast<StringObject*>(thisValue)->internalValue()->value() : thisValue->toThisObject(exec)->toString(exec);
     return jsString(exec, "<small>" + s + "</small>");
 }
 
-JSValue* stringProtoFuncBlink(ExecState* exec, JSObject* thisObj, const ArgList&)
-{
-    // This optimizes the common case that thisObj is a StringObject
-    UString s = thisObj->inherits(&StringObject::info) ? static_cast<StringObject*>(thisObj)->internalValue()->value() : thisObj->toString(exec);
+JSValue* stringProtoFuncBlink(ExecState* exec, JSObject*, JSValue* thisValue, const ArgList&)
+{
+    // This optimizes the common case that thisObj is a StringObject
+    UString s = thisValue->isObject(&StringObject::info) ? static_cast<StringObject*>(thisValue)->internalValue()->value() : thisValue->toThisObject(exec)->toString(exec);
     return jsString(exec, "<blink>" + s + "</blink>");
 }
 
-JSValue* stringProtoFuncBold(ExecState* exec, JSObject* thisObj, const ArgList&)
-{
-    // This optimizes the common case that thisObj is a StringObject
-    UString s = thisObj->inherits(&StringObject::info) ? static_cast<StringObject*>(thisObj)->internalValue()->value() : thisObj->toString(exec);
+JSValue* stringProtoFuncBold(ExecState* exec, JSObject*, JSValue* thisValue, const ArgList&)
+{
+    // This optimizes the common case that thisObj is a StringObject
+    UString s = thisValue->isObject(&StringObject::info) ? static_cast<StringObject*>(thisValue)->internalValue()->value() : thisValue->toThisObject(exec)->toString(exec);
     return jsString(exec, "<b>" + s + "</b>");
 }
 
-JSValue* stringProtoFuncFixed(ExecState* exec, JSObject* thisObj, const ArgList&)
-{
-    // This optimizes the common case that thisObj is a StringObject
-    UString s = thisObj->inherits(&StringObject::info) ? static_cast<StringObject*>(thisObj)->internalValue()->value() : thisObj->toString(exec);
+JSValue* stringProtoFuncFixed(ExecState* exec, JSObject*, JSValue* thisValue, const ArgList&)
+{
+    // This optimizes the common case that thisObj is a StringObject
+    UString s = thisValue->isObject(&StringObject::info) ? static_cast<StringObject*>(thisValue)->internalValue()->value() : thisValue->toThisObject(exec)->toString(exec);
     return jsString(exec, "<tt>" + s + "</tt>");
 }
 
-JSValue* stringProtoFuncItalics(ExecState* exec, JSObject* thisObj, const ArgList&)
-{
-    // This optimizes the common case that thisObj is a StringObject
-    UString s = thisObj->inherits(&StringObject::info) ? static_cast<StringObject*>(thisObj)->internalValue()->value() : thisObj->toString(exec);
+JSValue* stringProtoFuncItalics(ExecState* exec, JSObject*, JSValue* thisValue, const ArgList&)
+{
+    // This optimizes the common case that thisObj is a StringObject
+    UString s = thisValue->isObject(&StringObject::info) ? static_cast<StringObject*>(thisValue)->internalValue()->value() : thisValue->toThisObject(exec)->toString(exec);
     return jsString(exec, "<i>" + s + "</i>");
 }
 
-JSValue* stringProtoFuncStrike(ExecState* exec, JSObject* thisObj, const ArgList&)
-{
-    // This optimizes the common case that thisObj is a StringObject
-    UString s = thisObj->inherits(&StringObject::info) ? static_cast<StringObject*>(thisObj)->internalValue()->value() : thisObj->toString(exec);
+JSValue* stringProtoFuncStrike(ExecState* exec, JSObject*, JSValue* thisValue, const ArgList&)
+{
+    // This optimizes the common case that thisObj is a StringObject
+    UString s = thisValue->isObject(&StringObject::info) ? static_cast<StringObject*>(thisValue)->internalValue()->value() : thisValue->toThisObject(exec)->toString(exec);
     return jsString(exec, "<strike>" + s + "</strike>");
 }
 
-JSValue* stringProtoFuncSub(ExecState* exec, JSObject* thisObj, const ArgList&)
-{
-    // This optimizes the common case that thisObj is a StringObject
-    UString s = thisObj->inherits(&StringObject::info) ? static_cast<StringObject*>(thisObj)->internalValue()->value() : thisObj->toString(exec);
+JSValue* stringProtoFuncSub(ExecState* exec, JSObject*, JSValue* thisValue, const ArgList&)
+{
+    // This optimizes the common case that thisObj is a StringObject
+    UString s = thisValue->isObject(&StringObject::info) ? static_cast<StringObject*>(thisValue)->internalValue()->value() : thisValue->toThisObject(exec)->toString(exec);
     return jsString(exec, "<sub>" + s + "</sub>");
 }
 
-JSValue* stringProtoFuncSup(ExecState* exec, JSObject* thisObj, const ArgList&)
-{
-    // This optimizes the common case that thisObj is a StringObject
-    UString s = thisObj->inherits(&StringObject::info) ? static_cast<StringObject*>(thisObj)->internalValue()->value() : thisObj->toString(exec);
+JSValue* stringProtoFuncSup(ExecState* exec, JSObject*, JSValue* thisValue, const ArgList&)
+{
+    // This optimizes the common case that thisObj is a StringObject
+    UString s = thisValue->isObject(&StringObject::info) ? static_cast<StringObject*>(thisValue)->internalValue()->value() : thisValue->toThisObject(exec)->toString(exec);
     return jsString(exec, "<sup>" + s + "</sup>");
 }
 
-JSValue* stringProtoFuncFontcolor(ExecState* exec, JSObject* thisObj, const ArgList& args)
-{
-    // This optimizes the common case that thisObj is a StringObject
-    UString s = thisObj->inherits(&StringObject::info) ? static_cast<StringObject*>(thisObj)->internalValue()->value() : thisObj->toString(exec);
+JSValue* stringProtoFuncFontcolor(ExecState* exec, JSObject*, JSValue* thisValue, const ArgList& args)
+{
+    // This optimizes the common case that thisObj is a StringObject
+    UString s = thisValue->isObject(&StringObject::info) ? static_cast<StringObject*>(thisValue)->internalValue()->value() : thisValue->toThisObject(exec)->toString(exec);
     JSValue* a0 = args[0];
     return jsString(exec, "<font color=\"" + a0->toString(exec) + "\">" + s + "</font>");
 }
 
-JSValue* stringProtoFuncFontsize(ExecState* exec, JSObject* thisObj, const ArgList& args)
-{
-    // This optimizes the common case that thisObj is a StringObject
-    UString s = thisObj->inherits(&StringObject::info) ? static_cast<StringObject*>(thisObj)->internalValue()->value() : thisObj->toString(exec);
+JSValue* stringProtoFuncFontsize(ExecState* exec, JSObject*, JSValue* thisValue, const ArgList& args)
+{
+    // This optimizes the common case that thisObj is a StringObject
+    UString s = thisValue->isObject(&StringObject::info) ? static_cast<StringObject*>(thisValue)->internalValue()->value() : thisValue->toThisObject(exec)->toString(exec);
     JSValue* a0 = args[0];
     return jsString(exec, "<font size=\"" + a0->toString(exec) + "\">" + s + "</font>");
 }
 
-JSValue* stringProtoFuncAnchor(ExecState* exec, JSObject* thisObj, const ArgList& args)
-{
-    // This optimizes the common case that thisObj is a StringObject
-    UString s = thisObj->inherits(&StringObject::info) ? static_cast<StringObject*>(thisObj)->internalValue()->value() : thisObj->toString(exec);
+JSValue* stringProtoFuncAnchor(ExecState* exec, JSObject*, JSValue* thisValue, const ArgList& args)
+{
+    // This optimizes the common case that thisObj is a StringObject
+    UString s = thisValue->isObject(&StringObject::info) ? static_cast<StringObject*>(thisValue)->internalValue()->value() : thisValue->toThisObject(exec)->toString(exec);
     JSValue* a0 = args[0];
     return jsString(exec, "<a name=\"" + a0->toString(exec) + "\">" + s + "</a>");
 }
 
-JSValue* stringProtoFuncLink(ExecState* exec, JSObject* thisObj, const ArgList& args)
-{
-    // This optimizes the common case that thisObj is a StringObject
-    UString s = thisObj->inherits(&StringObject::info) ? static_cast<StringObject*>(thisObj)->internalValue()->value() : thisObj->toString(exec);
+JSValue* stringProtoFuncLink(ExecState* exec, JSObject*, JSValue* thisValue, const ArgList& args)
+{
+    // This optimizes the common case that thisObj is a StringObject
+    UString s = thisValue->isObject(&StringObject::info) ? static_cast<StringObject*>(thisValue)->internalValue()->value() : thisValue->toThisObject(exec)->toString(exec);
     JSValue* a0 = args[0];
     return jsString(exec, "<a href=\"" + a0->toString(exec) + "\">" + s + "</a>");
@@ -929 +966 @@
 
 // ------------------------------ StringConstructor ------------------------------
+
+static JSValue* stringFromCharCode(ExecState* exec, JSObject*, JSValue*, const ArgList& args)
+{
+    UString s;
+    if (args.size()) {
+        UChar* buf = static_cast<UChar*>(fastMalloc(args.size() * sizeof(UChar)));
+        UChar* p = buf;
+        ArgList::const_iterator end = args.end();
+        for (ArgList::const_iterator it = args.begin(); it != end; ++it)
+          *p++ = static_cast<UChar>((*it)->toUInt32(exec));
+        s = UString(buf, args.size(), false);
+    } else
+        s = "";
+
+    return jsString(exec, s);
+}
 
 StringConstructor::StringConstructor(ExecState* exec, FunctionPrototype* funcProto, StringPrototype* stringProto)
@@ -934 +987 @@
 {
   // ECMA 15.5.3.1 String.prototype
-  putDirect(exec->propertyNames().prototype, stringProto, DontEnum|DontDelete|ReadOnly);
-
-  putDirectFunction(new (exec) StringConstructorFunction(exec, funcProto, exec->propertyNames().fromCharCode), DontEnum);
+  putDirect(exec->propertyNames().prototype, stringProto, ReadOnly | DontEnum | DontDelete);
+
+  // ECMA 15.5.3.2 fromCharCode()
+  putDirectFunction(new (exec) PrototypeFunction(exec, funcProto, 1, exec->propertyNames().fromCharCode, stringFromCharCode), DontEnum);
 
   // no. of arguments for constructor
-  putDirect(exec->propertyNames().length, jsNumber(exec, 1), ReadOnly|DontDelete|DontEnum);
-}
-
-
-ConstructType StringConstructor::getConstructData(ConstructData&)
-{
+  putDirect(exec->propertyNames().length, jsNumber(exec, 1), ReadOnly | DontEnum | DontDelete);
+}
+
+// ECMA 15.5.2
+static JSObject* constructWithStringConstructor(ExecState* exec, JSObject*, const ArgList& args)
+{
+    JSObject* prototype = exec->lexicalGlobalObject()->stringPrototype();
+    if (args.isEmpty())
+        return new (exec) StringObject(exec, prototype);
+    return new (exec) StringObject(exec, prototype, args[0]->toString(exec));
+}
+
+ConstructType StringConstructor::getConstructData(ConstructData& constructData)
+{
+    constructData.native.function = constructWithStringConstructor;
     return ConstructTypeNative;
 }
 
-// ECMA 15.5.2
-JSObject* StringConstructor::construct(ExecState* exec, const ArgList& args)
-{
-  JSObject* proto = exec->lexicalGlobalObject()->stringPrototype();
-  if (!args.size())
-    return new (exec) StringObject(exec, proto);
-  return new (exec) StringObject(exec, proto, args[0]->toString(exec));
-}
-
 // ECMA 15.5.1
-JSValue *StringConstructor::callAsFunction(ExecState *exec, JSObject* /*thisObj*/, const ArgList &args)
-{
-  if (args.isEmpty())
-    return jsString(exec, "");
-  else {
-    JSValue *v = args[0];
-    return jsString(exec, v->toString(exec));
-  }
-}
-
-// ------------------------------ StringConstructorFunction --------------------------
-
-// ECMA 15.5.3.2 fromCharCode()
-StringConstructorFunction::StringConstructorFunction(ExecState* exec, FunctionPrototype* funcProto, const Identifier& name)
-  : InternalFunction(funcProto, name)
-{
-  putDirect(exec->propertyNames().length, jsNumber(exec, 1), DontDelete|ReadOnly|DontEnum);
-}
-
-JSValue *StringConstructorFunction::callAsFunction(ExecState *exec, JSObject* /*thisObj*/, const ArgList &args)
-{
-  UString s;
-  if (args.size()) {
-    UChar *buf = static_cast<UChar *>(fastMalloc(args.size() * sizeof(UChar)));
-    UChar *p = buf;
-    ArgList::const_iterator end = args.end();
-    for (ArgList::const_iterator it = args.begin(); it != end; ++it) {
-      unsigned short u = static_cast<unsigned short>((*it)->toUInt32(exec));
-      *p++ = UChar(u);
-    }
-    s = UString(buf, args.size(), false);
-  } else
-    s = "";
-
-  return jsString(exec, s);
+static JSValue* callStringConstructor(ExecState* exec, JSObject*, JSValue*, const ArgList& args)
+{
+    if (args.isEmpty())
+        return jsString(exec, "");
+    return jsString(exec, args[0]->toString(exec));
+}
+
+CallType StringConstructor::getCallData(CallData& callData)
+{
+    callData.native.function = callStringConstructor;
+    return CallTypeNative;
 }
 

trunk/JavaScriptCore/kjs/string_object.h

@@ -80 +80 @@
    * @internal
    *
-   * Functions to implement all methods that are properties of the
-   * String.prototype object
-   */
-
-  JSValue* stringProtoFuncToString(ExecState*, JSObject*, const ArgList&);
-  JSValue* stringProtoFuncValueOf(ExecState*, JSObject*, const ArgList&);
-  JSValue* stringProtoFuncCharAt(ExecState*, JSObject*, const ArgList&);
-  JSValue* stringProtoFuncCharCodeAt(ExecState*, JSObject*, const ArgList&);
-  JSValue* stringProtoFuncConcat(ExecState*, JSObject*, const ArgList&);
-  JSValue* stringProtoFuncIndexOf(ExecState*, JSObject*, const ArgList&);
-  JSValue* stringProtoFuncLastIndexOf(ExecState*, JSObject*, const ArgList&);
-  JSValue* stringProtoFuncMatch(ExecState*, JSObject*, const ArgList&);
-  JSValue* stringProtoFuncReplace(ExecState*, JSObject*, const ArgList&);
-  JSValue* stringProtoFuncSearch(ExecState*, JSObject*, const ArgList&);
-  JSValue* stringProtoFuncSlice(ExecState*, JSObject*, const ArgList&);
-  JSValue* stringProtoFuncSplit(ExecState*, JSObject*, const ArgList&);
-  JSValue* stringProtoFuncSubstr(ExecState*, JSObject*, const ArgList&);
-  JSValue* stringProtoFuncSubstring(ExecState*, JSObject*, const ArgList&);
-  JSValue* stringProtoFuncToLowerCase(ExecState*, JSObject*, const ArgList&);
-  JSValue* stringProtoFuncToUpperCase(ExecState*, JSObject*, const ArgList&);
-  JSValue* stringProtoFuncToLocaleLowerCase(ExecState*, JSObject*, const ArgList&);
-  JSValue* stringProtoFuncToLocaleUpperCase(ExecState*, JSObject*, const ArgList&);
-  JSValue* stringProtoFuncLocaleCompare(ExecState*, JSObject*, const ArgList&);
-
-  JSValue* stringProtoFuncBig(ExecState*, JSObject*, const ArgList&);
-  JSValue* stringProtoFuncSmall(ExecState*, JSObject*, const ArgList&);
-  JSValue* stringProtoFuncBlink(ExecState*, JSObject*, const ArgList&);
-  JSValue* stringProtoFuncBold(ExecState*, JSObject*, const ArgList&);
-  JSValue* stringProtoFuncFixed(ExecState*, JSObject*, const ArgList&);
-  JSValue* stringProtoFuncItalics(ExecState*, JSObject*, const ArgList&);
-  JSValue* stringProtoFuncStrike(ExecState*, JSObject*, const ArgList&);
-  JSValue* stringProtoFuncSub(ExecState*, JSObject*, const ArgList&);
-  JSValue* stringProtoFuncSup(ExecState*, JSObject*, const ArgList&);
-  JSValue* stringProtoFuncFontcolor(ExecState*, JSObject*, const ArgList&);
-  JSValue* stringProtoFuncFontsize(ExecState*, JSObject*, const ArgList&);
-  JSValue* stringProtoFuncAnchor(ExecState*, JSObject*, const ArgList&);
-  JSValue* stringProtoFuncLink(ExecState*, JSObject*, const ArgList&);
-
-  /**
-   * @internal
-   *
    * The initial value of the the global variable's "String" property
    */
@@ -126 +85 @@
   public:
     StringConstructor(ExecState*, FunctionPrototype*, StringPrototype*);
-
     virtual ConstructType getConstructData(ConstructData&);
-    virtual JSObject* construct(ExecState*, const ArgList&);
-
-    virtual JSValue* callAsFunction(ExecState*, JSObject* thisObj, const ArgList& args);
+    virtual CallType getCallData(CallData&);
   };
 
@@ -142 +98 @@
   public:
     StringConstructorFunction(ExecState*, FunctionPrototype*, const Identifier&);
-    virtual JSValue* callAsFunction(ExecState*, JSObject* thisObj, const ArgList& args);
+    virtual CallType getCallData(CallData&);
   };