Changeset 34580 in webkit for trunk/JavaScriptCore/kjs/function_object.cpp

Timestamp:

Jun 15, 2008, 8:02:57 PM (17 years ago)

Author:

Darin Adler

Message:

JavaScriptCore:

2008-06-15 Darin Adler <Darin Adler>

Rubber stamped by Sam.

• cut down on confusing uses of "Object" and "Imp" in JavaScriptCore class names

• API/JSCallbackFunction.cpp: (KJS::JSCallbackFunction::JSCallbackFunction):
• API/JSCallbackFunction.h:
• VM/Machine.cpp: (KJS::Machine::privateExecute):
• kjs/ExecState.h: (KJS::ExecState::regExpTable): (KJS::ExecState::regExpConstructorTable):
• kjs/JSGlobalData.cpp: (KJS::JSGlobalData::JSGlobalData): (KJS::JSGlobalData::~JSGlobalData):
• kjs/JSGlobalData.h:
• kjs/JSGlobalObject.cpp: (KJS::JSGlobalObject::reset):
• kjs/JSGlobalObject.h: (KJS::JSGlobalObject::objectConstructor): (KJS::JSGlobalObject::functionConstructor): (KJS::JSGlobalObject::arrayConstructor): (KJS::JSGlobalObject::booleanConstructor): (KJS::JSGlobalObject::stringConstructor): (KJS::JSGlobalObject::numberConstructor): (KJS::JSGlobalObject::dateConstructor): (KJS::JSGlobalObject::regExpConstructor): (KJS::JSGlobalObject::errorConstructor): (KJS::JSGlobalObject::evalErrorConstructor): (KJS::JSGlobalObject::rangeErrorConstructor): (KJS::JSGlobalObject::referenceErrorConstructor): (KJS::JSGlobalObject::syntaxErrorConstructor): (KJS::JSGlobalObject::typeErrorConstructor): (KJS::JSGlobalObject::URIErrorConstructor):
• kjs/array_object.cpp: (KJS::ArrayConstructor::ArrayConstructor): (KJS::ArrayConstructor::getConstructData): (KJS::ArrayConstructor::construct): (KJS::ArrayConstructor::callAsFunction):
• kjs/array_object.h:
• kjs/bool_object.cpp: (KJS::BooleanObject::BooleanObject): (KJS::BooleanPrototype::BooleanPrototype): (KJS::booleanProtoFuncToString): (KJS::booleanProtoFuncValueOf): (KJS::BooleanConstructor::BooleanConstructor): (KJS::BooleanConstructor::getConstructData): (KJS::BooleanConstructor::construct): (KJS::BooleanConstructor::callAsFunction):
• kjs/bool_object.h:
• kjs/date_object.cpp: (KJS::DatePrototype::DatePrototype): (KJS::DateConstructor::DateConstructor): (KJS::DateConstructor::getConstructData): (KJS::DateConstructor::construct): (KJS::DateConstructor::callAsFunction): (KJS::DateFunction::DateFunction): (KJS::DateFunction::callAsFunction):
• kjs/date_object.h:
• kjs/error_object.cpp: (KJS::ErrorPrototype::ErrorPrototype): (KJS::ErrorConstructor::ErrorConstructor): (KJS::ErrorConstructor::getConstructData): (KJS::ErrorConstructor::construct): (KJS::ErrorConstructor::callAsFunction): (KJS::NativeErrorConstructor::NativeErrorConstructor): (KJS::NativeErrorConstructor::getConstructData): (KJS::NativeErrorConstructor::construct): (KJS::NativeErrorConstructor::callAsFunction): (KJS::NativeErrorConstructor::mark):
• kjs/error_object.h:
• kjs/function.cpp: (KJS::JSFunction::JSFunction): (KJS::JSFunction::mark): (KJS::JSFunction::getOwnPropertySlot): (KJS::JSFunction::put): (KJS::JSFunction::deleteProperty): (KJS::PrototypeFunction::PrototypeFunction): (KJS::PrototypeReflexiveFunction::PrototypeReflexiveFunction): (KJS::PrototypeReflexiveFunction::mark):
• kjs/function.h:
• kjs/function_object.cpp: (KJS::functionProtoFuncToString): (KJS::FunctionConstructor::FunctionConstructor): (KJS::FunctionConstructor::getConstructData): (KJS::FunctionConstructor::construct): (KJS::FunctionConstructor::callAsFunction):
• kjs/function_object.h:
• kjs/internal.cpp: (KJS::StringObject::create): (KJS::JSString::toObject): (KJS::JSString::toThisObject): (KJS::JSString::getOwnPropertySlot): (KJS::InternalFunction::InternalFunction): (KJS::InternalFunction::getCallData): (KJS::InternalFunction::implementsHasInstance):
• kjs/math_object.cpp: (KJS::MathObject::MathObject): (KJS::MathObject::getOwnPropertySlot): (KJS::MathObject::getValueProperty):
• kjs/math_object.h:
• kjs/number_object.cpp: (KJS::NumberObject::NumberObject): (KJS::NumberPrototype::NumberPrototype): (KJS::numberProtoFuncToString): (KJS::numberProtoFuncToLocaleString): (KJS::numberProtoFuncValueOf): (KJS::numberProtoFuncToFixed): (KJS::numberProtoFuncToExponential): (KJS::numberProtoFuncToPrecision): (KJS::NumberConstructor::NumberConstructor): (KJS::NumberConstructor::getOwnPropertySlot): (KJS::NumberConstructor::getValueProperty): (KJS::NumberConstructor::getConstructData): (KJS::NumberConstructor::construct): (KJS::NumberConstructor::callAsFunction):
• kjs/number_object.h:
• kjs/object.cpp: (KJS::JSObject::putDirectFunction):
• kjs/object.h:
• kjs/object_object.cpp: (KJS::ObjectConstructor::ObjectConstructor): (KJS::ObjectConstructor::getConstructData): (KJS::ObjectConstructor::construct): (KJS::ObjectConstructor::callAsFunction):
• kjs/object_object.h:
• kjs/regexp.cpp: (KJS::RegExp::RegExp):
• kjs/regexp_object.cpp: (KJS::regExpProtoFuncTest): (KJS::regExpProtoFuncExec): (KJS::regExpProtoFuncCompile): (KJS::regExpProtoFuncToString): (KJS::RegExpObject::RegExpObject): (KJS::RegExpObject::~RegExpObject): (KJS::RegExpObject::getOwnPropertySlot): (KJS::RegExpObject::getValueProperty): (KJS::RegExpObject::put): (KJS::RegExpObject::putValueProperty): (KJS::RegExpObject::match): (KJS::RegExpObject::test): (KJS::RegExpObject::exec): (KJS::RegExpObject::getCallData): (KJS::RegExpObject::callAsFunction): (KJS::RegExpConstructorPrivate::RegExpConstructorPrivate): (KJS::RegExpConstructor::RegExpConstructor): (KJS::RegExpConstructor::performMatch): (KJS::RegExpMatchesArray::RegExpMatchesArray): (KJS::RegExpMatchesArray::~RegExpMatchesArray): (KJS::RegExpMatchesArray::fillArrayInstance): (KJS::RegExpConstructor::arrayOfMatches): (KJS::RegExpConstructor::getBackref): (KJS::RegExpConstructor::getLastParen): (KJS::RegExpConstructor::getLeftContext): (KJS::RegExpConstructor::getRightContext): (KJS::RegExpConstructor::getOwnPropertySlot): (KJS::RegExpConstructor::getValueProperty): (KJS::RegExpConstructor::put): (KJS::RegExpConstructor::putValueProperty): (KJS::RegExpConstructor::getConstructData): (KJS::RegExpConstructor::construct): (KJS::RegExpConstructor::callAsFunction): (KJS::RegExpConstructor::input):
• kjs/regexp_object.h:
• kjs/string_object.cpp: (KJS::StringObject::StringObject): (KJS::StringObject::getOwnPropertySlot): (KJS::StringObject::put): (KJS::StringObject::deleteProperty): (KJS::StringObject::getPropertyNames): (KJS::StringPrototype::StringPrototype): (KJS::StringPrototype::getOwnPropertySlot): (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::StringConstructor::StringConstructor): (KJS::StringConstructor::getConstructData): (KJS::StringConstructor::construct): (KJS::StringConstructor::callAsFunction): (KJS::StringConstructorFunction::StringConstructorFunction): (KJS::StringConstructorFunction::callAsFunction):
• kjs/string_object.h: (KJS::StringObjectThatMasqueradesAsUndefined::StringObjectThatMasqueradesAsUndefined):
• profiler/Profiler.cpp: (KJS::createCallIdentifier):

WebCore:

2008-06-15 Darin Adler <Darin Adler>

Rubber stamped by Sam.

• cut down on confusing uses of "Object" and "Imp" in JavaScriptCore class names

• bindings/js/JSCSSStyleDeclarationCustom.cpp: (WebCore::JSCSSStyleDeclaration::nameGetter):
• bridge/qt/qt_runtime.cpp: (KJS::Bindings::valueRealType): (KJS::Bindings::convertValueToQVariant): (KJS::Bindings::convertQVariantToValue): (KJS::Bindings::QtRuntimeMethod::QtRuntimeMethod):
• bridge/qt/qt_runtime.h:
• bridge/runtime_method.cpp: (RuntimeMethod::RuntimeMethod): (RuntimeMethod::getOwnPropertySlot):
• bridge/runtime_method.h:

WebKitTools:

2008-06-15 Darin Adler <Darin Adler>

• Scripts/create-exports: Added.
• Scripts/do-file-rename: Added some planned renames.
• Scripts/do-webcore-rename: Updated for the latest round of renaming.

File:

• trunk/JavaScriptCore/kjs/function_object.cpp (modified) (7 diffs)

trunk/JavaScriptCore/kjs/function_object.cpp

@@ -62 +62 @@
 JSValue* functionProtoFuncToString(ExecState* exec, JSObject* thisObj, const List&)
 {
-    if (!thisObj || !thisObj->inherits(&InternalFunctionImp::info)) {
+    if (!thisObj || !thisObj->inherits(&InternalFunction::info)) {
 #ifndef NDEBUG
         fprintf(stderr,"attempted toString() call on null or non-function object\n");
@@ -74 +74 @@
     }
 
-    return jsString("function " + static_cast<InternalFunctionImp*>(thisObj)->functionName().ustring() + "() {\n    [native code]\n}");
+    return jsString("function " + static_cast<InternalFunction*>(thisObj)->functionName().ustring() + "() {\n    [native code]\n}");
 }
 
@@ -126 +126 @@
 }
 
-// ------------------------------ FunctionObjectImp ----------------------------
-
-FunctionObjectImp::FunctionObjectImp(ExecState* exec, FunctionPrototype* functionPrototype)
-    : InternalFunctionImp(functionPrototype, functionPrototype->classInfo()->className)
+// ------------------------------ FunctionConstructor ----------------------------
+
+FunctionConstructor::FunctionConstructor(ExecState* exec, FunctionPrototype* functionPrototype)
+    : InternalFunction(functionPrototype, functionPrototype->classInfo()->className)
 {
     putDirect(exec->propertyNames().prototype, functionPrototype, DontEnum | DontDelete | ReadOnly);
@@ -137 +137 @@
 }
 
-ConstructType FunctionObjectImp::getConstructData(ConstructData&)
+ConstructType FunctionConstructor::getConstructData(ConstructData&)
 {
     return ConstructTypeNative;
@@ -143 +143 @@
 
 // ECMA 15.3.2 The Function Constructor
-JSObject* FunctionObjectImp::construct(ExecState* exec, const List& args, const Identifier& functionName, const UString& sourceURL, int lineNumber)
+JSObject* FunctionConstructor::construct(ExecState* exec, const List& args, const Identifier& functionName, const UString& sourceURL, int lineNumber)
 {
     UString p("");
@@ -216 +216 @@
 
 // ECMA 15.3.2 The Function Constructor
-JSObject* FunctionObjectImp::construct(ExecState* exec, const List& args)
+JSObject* FunctionConstructor::construct(ExecState* exec, const List& args)
 {
     return construct(exec, args, "anonymous", UString(), 1);
@@ -222 +222 @@
 
 // ECMA 15.3.1 The Function Constructor Called as a Function
-JSValue* FunctionObjectImp::callAsFunction(ExecState* exec, JSObject*, const List& args)
+JSValue* FunctionConstructor::callAsFunction(ExecState* exec, JSObject*, const List& args)
 {
     return construct(exec, args);