Changeset 34578 in webkit for trunk/JavaScriptCore/kjs/function.cpp

Timestamp:

Jun 15, 2008, 7:19:08 PM (17 years ago)

Author:

Darin Adler

Message:

JavaScriptCore:

2008-06-15 Darin Adler <Darin Adler>

Rubber stamped by Sam.

• use JS prefix and simpler names for basic JavaScriptCore types, to complement JSValue and JSObject

• JavaScriptCore.exp:
• VM/Machine.cpp: (KJS::jsLess): (KJS::jsLessEq): (KJS::jsAdd): (KJS::callEval): (KJS::Machine::execute): (KJS::Machine::retrieveArguments): (KJS::Machine::retrieveCaller): (KJS::Machine::getCallFrame): (KJS::Machine::getFunctionAndArguments):
• VM/Machine.h:
• VM/Register.h:
• kjs/DebuggerCallFrame.cpp: (KJS::DebuggerCallFrame::functionName):
• kjs/ExecState.h:
• kjs/JSActivation.cpp: (KJS::JSActivation::createArgumentsObject):
• kjs/array_instance.cpp: (KJS::): (KJS::JSArray::checkConsistency): (KJS::JSArray::JSArray): (KJS::JSArray::~JSArray): (KJS::JSArray::getItem): (KJS::JSArray::lengthGetter): (KJS::JSArray::inlineGetOwnPropertySlot): (KJS::JSArray::getOwnPropertySlot): (KJS::JSArray::put): (KJS::JSArray::deleteProperty): (KJS::JSArray::getPropertyNames): (KJS::JSArray::increaseVectorLength): (KJS::JSArray::setLength): (KJS::JSArray::mark): (KJS::JSArray::sort): (KJS::JSArray::compactForSorting): (KJS::JSArray::lazyCreationData): (KJS::JSArray::setLazyCreationData):
• kjs/array_instance.h:
• kjs/array_object.cpp: (KJS::): (KJS::ArrayPrototype::ArrayPrototype): (KJS::ArrayPrototype::getOwnPropertySlot): (KJS::arrayProtoFuncToString): (KJS::arrayProtoFuncToLocaleString): (KJS::arrayProtoFuncConcat): (KJS::arrayProtoFuncSort): (KJS::ArrayObjectImp::construct):
• kjs/array_object.h:
• kjs/completion.h:
• kjs/function.cpp: (KJS::): (KJS::JSFunction::JSFunction): (KJS::JSFunction::mark): (KJS::JSFunction::getCallData): (KJS::JSFunction::callAsFunction): (KJS::JSFunction::argumentsGetter): (KJS::JSFunction::callerGetter): (KJS::JSFunction::lengthGetter): (KJS::JSFunction::getOwnPropertySlot): (KJS::JSFunction::put): (KJS::JSFunction::deleteProperty): (KJS::JSFunction::getParameterName): (KJS::JSFunction::getConstructData): (KJS::JSFunction::construct): (KJS::IndexToNameMap::IndexToNameMap): (KJS::Arguments::Arguments):
• kjs/function.h:
• kjs/function_object.cpp: (KJS::functionProtoFuncToString): (KJS::functionProtoFuncApply): (KJS::FunctionObjectImp::construct):
• kjs/internal.cpp: (KJS::JSString::toPrimitive): (KJS::JSString::getPrimitiveNumber): (KJS::JSString::toBoolean): (KJS::JSString::toNumber): (KJS::JSString::toString): (KJS::StringInstance::create): (KJS::JSString::toObject): (KJS::JSString::toThisObject): (KJS::JSString::lengthGetter): (KJS::JSString::indexGetter): (KJS::JSString::indexNumericPropertyGetter): (KJS::JSString::getOwnPropertySlot): (KJS::JSNumberCell::type): (KJS::JSNumberCell::toPrimitive): (KJS::JSNumberCell::getPrimitiveNumber): (KJS::JSNumberCell::toBoolean): (KJS::JSNumberCell::toNumber): (KJS::JSNumberCell::toString): (KJS::JSNumberCell::toObject): (KJS::JSNumberCell::toThisObject): (KJS::JSNumberCell::getUInt32): (KJS::JSNumberCell::getTruncatedInt32): (KJS::JSNumberCell::getTruncatedUInt32): (KJS::GetterSetter::mark): (KJS::GetterSetter::toPrimitive): (KJS::GetterSetter::getPrimitiveNumber): (KJS::GetterSetter::toBoolean): (KJS::GetterSetter::toNumber): (KJS::GetterSetter::toString): (KJS::GetterSetter::toObject): (KJS::GetterSetter::getOwnPropertySlot): (KJS::GetterSetter::put): (KJS::GetterSetter::toThisObject):
• kjs/internal.h: (KJS::JSString::JSString): (KJS::JSString::getStringPropertySlot):
• kjs/nodes.cpp: (KJS::FuncDeclNode::makeFunction): (KJS::FuncExprNode::makeFunction):
• kjs/nodes.h:
• kjs/object.cpp: (KJS::JSObject::put): (KJS::JSObject::deleteProperty): (KJS::JSObject::defineGetter): (KJS::JSObject::defineSetter): (KJS::JSObject::lookupGetter): (KJS::JSObject::lookupSetter): (KJS::JSObject::fillGetterPropertySlot):
• kjs/object.h: (KJS::): (KJS::GetterSetter::GetterSetter):
• kjs/operations.cpp: (KJS::equal): (KJS::strictEqual):
• kjs/property_map.cpp: (KJS::PropertyMap::containsGettersOrSetters):
• kjs/regexp_object.cpp: (KJS::RegExpMatchesArray::getOwnPropertySlot): (KJS::RegExpMatchesArray::put): (KJS::RegExpMatchesArray::deleteProperty): (KJS::RegExpMatchesArray::getPropertyNames): (KJS::RegExpMatchesArray::RegExpMatchesArray): (KJS::RegExpMatchesArray::fillArrayInstance):
• kjs/string_object.cpp: (KJS::StringInstance::StringInstance): (KJS::replace): (KJS::stringProtoFuncReplace): (KJS::stringProtoFuncToLowerCase): (KJS::stringProtoFuncToUpperCase): (KJS::stringProtoFuncToLocaleLowerCase): (KJS::stringProtoFuncToLocaleUpperCase):
• kjs/string_object.h: (KJS::StringInstance::internalValue):
• kjs/value.cpp: (KJS::JSCell::getNumber): (KJS::JSCell::getString): (KJS::JSCell::getObject): (KJS::jsString): (KJS::jsOwnedString):
• kjs/value.h: (KJS::JSNumberCell::JSNumberCell): (KJS::jsNumberCell): (KJS::JSValue::uncheckedGetNumber):
• profiler/Profiler.cpp: (KJS::createCallIdentifier): (KJS::createCallIdentifierFromFunctionImp):

WebCore:

2008-06-15 Darin Adler <Darin Adler>

Rubber stamped by Sam.

• use JS prefix and simpler names for basic JavaScriptCore types, to complement JSValue and JSObject

• bindings/js/JSNavigatorCustom.cpp: (WebCore::needsYouTubeQuirk):
• bindings/js/kjs_events.cpp: (WebCore::JSLazyEventListener::parseCode):
• bridge/jni/jni_utility.cpp: (KJS::Bindings::convertArrayInstanceToJavaArray): (KJS::Bindings::convertValueToJValue):
• bridge/qt/qt_runtime.cpp: (KJS::Bindings::valueRealType): (KJS::Bindings::convertValueToQVariant): (KJS::Bindings::QtConnectionObject::execute):
• bridge/runtime_array.cpp:

WebKit/mac:

2008-06-15 Darin Adler <Darin Adler>

Rubber stamped by Sam.

• use JS prefix and simpler names for basic JavaScriptCore types, to complement JSValue and JSObject

• WebView/WebView.mm: (aeDescFromJSValue):

WebKit/win:

2008-06-15 Darin Adler <Darin Adler>

Rubber stamped by Sam.

• use JS prefix and simpler names for basic JavaScriptCore types, to complement JSValue and JSObject

• WebScriptCallFrame.cpp: (WebScriptCallFrame::functionName):

WebKitTools:

2008-06-15 Darin Adler <Darin Adler>

• Scripts/do-webcore-rename: Updated for the latest round of renaming.

File:

• trunk/JavaScriptCore/kjs/function.cpp (modified) (12 diffs)

trunk/JavaScriptCore/kjs/function.cpp

@@ -56 +56 @@
 namespace KJS {
 
-// ----------------------------- FunctionImp ----------------------------------
-
-const ClassInfo FunctionImp::info = { "Function", &InternalFunctionImp::info, 0, 0 };
-
-FunctionImp::FunctionImp(ExecState* exec, const Identifier& name, FunctionBodyNode* b, ScopeChainNode* scopeChain)
+// ----------------------------- JSFunction ----------------------------------
+
+const ClassInfo JSFunction::info = { "Function", &InternalFunctionImp::info, 0, 0 };
+
+JSFunction::JSFunction(ExecState* exec, const Identifier& name, FunctionBodyNode* b, ScopeChainNode* scopeChain)
   : InternalFunctionImp(exec->lexicalGlobalObject()->functionPrototype(), name)
   , body(b)
@@ -67 +67 @@
 }
 
-void FunctionImp::mark()
+void JSFunction::mark()
 {
     InternalFunctionImp::mark();
@@ -74 +74 @@
 }
 
-CallType FunctionImp::getCallData(CallData& callData)
+CallType JSFunction::getCallData(CallData& callData)
 {
     callData.js.functionBody = body.get();
@@ -81 +81 @@
 }
 
-JSValue* FunctionImp::callAsFunction(ExecState* exec, JSObject* thisObj, const List& args)
+JSValue* JSFunction::callAsFunction(ExecState* exec, JSObject* thisObj, const List& args)
 {
     JSValue* exception = 0;
@@ -100 +100 @@
 }
 
-JSValue* FunctionImp::argumentsGetter(ExecState* exec, const Identifier&, const PropertySlot& slot)
-{
-    FunctionImp* thisObj = static_cast<FunctionImp*>(slot.slotBase());
+JSValue* JSFunction::argumentsGetter(ExecState* exec, const Identifier&, const PropertySlot& slot)
+{
+    JSFunction* thisObj = static_cast<JSFunction*>(slot.slotBase());
     ASSERT(exec->machine());
     return exec->machine()->retrieveArguments(exec, thisObj);
 }
 
-JSValue* FunctionImp::callerGetter(ExecState* exec, const Identifier&, const PropertySlot& slot)
-{
-    FunctionImp* thisObj = static_cast<FunctionImp*>(slot.slotBase());
+JSValue* JSFunction::callerGetter(ExecState* exec, const Identifier&, const PropertySlot& slot)
+{
+    JSFunction* thisObj = static_cast<JSFunction*>(slot.slotBase());
     ASSERT(exec->machine());
     return exec->machine()->retrieveCaller(exec, thisObj);
 }
 
-JSValue* FunctionImp::lengthGetter(ExecState*, const Identifier&, const PropertySlot& slot)
-{
-    FunctionImp* thisObj = static_cast<FunctionImp*>(slot.slotBase());
+JSValue* JSFunction::lengthGetter(ExecState*, const Identifier&, const PropertySlot& slot)
+{
+    JSFunction* thisObj = static_cast<JSFunction*>(slot.slotBase());
     return jsNumber(thisObj->body->parameters().size());
 }
 
-bool FunctionImp::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot)
+bool JSFunction::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot)
 {
     if (propertyName == exec->propertyNames().arguments) {
@@ -140 +140 @@
 }
 
-void FunctionImp::put(ExecState* exec, const Identifier& propertyName, JSValue* value)
+void JSFunction::put(ExecState* exec, const Identifier& propertyName, JSValue* value)
 {
     if (propertyName == exec->propertyNames().arguments || propertyName == exec->propertyNames().length)
@@ -147 +147 @@
 }
 
-bool FunctionImp::deleteProperty(ExecState* exec, const Identifier& propertyName)
+bool JSFunction::deleteProperty(ExecState* exec, const Identifier& propertyName)
 {
     if (propertyName == exec->propertyNames().arguments || propertyName == exec->propertyNames().length)
@@ -161 +161 @@
  * function f2(x, x): getParameterName(0) --> null
  */
-Identifier FunctionImp::getParameterName(int index)
+Identifier JSFunction::getParameterName(int index)
 {
     Vector<Identifier>& parameters = body->parameters();
@@ -180 +180 @@
 
 // ECMA 13.2.2 [[Construct]]
-ConstructType FunctionImp::getConstructData(ConstructData& constructData)
+ConstructType JSFunction::getConstructData(ConstructData& constructData)
 {
     constructData.js.functionBody = body.get();
@@ -187 +187 @@
 }
 
-JSObject* FunctionImp::construct(ExecState* exec, const List& args)
+JSObject* JSFunction::construct(ExecState* exec, const List& args)
 {
     JSObject* proto;
@@ -221 +221 @@
 // isn't stored in the activation object.
 
-IndexToNameMap::IndexToNameMap(FunctionImp* func, const List& args)
+IndexToNameMap::IndexToNameMap(JSFunction* func, const List& args)
 {
   _map = new Identifier[args.size()];
@@ -279 +279 @@
 
 // ECMA 10.1.8
-Arguments::Arguments(ExecState* exec, FunctionImp* func, const List& args, JSActivation* act)
+Arguments::Arguments(ExecState* exec, JSFunction* func, const List& args, JSActivation* act)
     : JSObject(exec->lexicalGlobalObject()->objectPrototype())
     , _activationObject(act)