Changeset 12911 in webkit for trunk/JavaScriptCore/kjs/object_object.cpp

Timestamp:

Feb 20, 2006, 11:54:55 PM (19 years ago)

Author:

mjs

Message:

Reviewed by Geoff and Darin.

Patch from Maks Orlovich, based on work by David Faure, hand-applied and
significantly reworked by me.

• Patch: give internal function names (KJS merge) ​http://bugzilla.opendarwin.org/show_bug.cgi?id=6279

• tests/mozilla/expected.html: Updated for newly fixed test.

• kjs/array_object.cpp: (ArrayProtoFunc::ArrayProtoFunc):
• kjs/array_object.h:
• kjs/bool_object.cpp: (BooleanPrototype::BooleanPrototype): (BooleanProtoFunc::BooleanProtoFunc):
• kjs/bool_object.h:
• kjs/date_object.cpp: (KJS::DateProtoFunc::DateProtoFunc): (KJS::DateObjectImp::DateObjectImp): (KJS::DateObjectFuncImp::DateObjectFuncImp):
• kjs/error_object.cpp: (ErrorPrototype::ErrorPrototype): (ErrorProtoFunc::ErrorProtoFunc):
• kjs/error_object.h:
• kjs/function.cpp: (KJS::FunctionImp::FunctionImp): (KJS::GlobalFuncImp::GlobalFuncImp):
• kjs/function.h:
• kjs/function_object.cpp: (FunctionPrototype::FunctionPrototype): (FunctionProtoFunc::FunctionProtoFunc): (FunctionProtoFunc::callAsFunction):
• kjs/function_object.h:
• kjs/internal.cpp: (KJS::InterpreterImp::initGlobalObject): (KJS::InternalFunctionImp::InternalFunctionImp):
• kjs/internal.h: (KJS::InternalFunctionImp::functionName):
• kjs/lookup.h: (KJS::staticFunctionGetter): (KJS::HashEntryFunction::HashEntryFunction): (KJS::HashEntryFunction::implementsCall): (KJS::HashEntryFunction::toBoolean): (KJS::HashEntryFunction::implementsHasInstance): (KJS::HashEntryFunction::hasInstance):
• kjs/math_object.cpp: (MathFuncImp::MathFuncImp):
• kjs/math_object.h:
• kjs/number_object.cpp: (NumberPrototype::NumberPrototype): (NumberProtoFunc::NumberProtoFunc):
• kjs/number_object.h:
• kjs/object.cpp: (KJS::JSObject::putDirectFunction): (KJS::Error::create):
• kjs/object.h:
• kjs/object_object.cpp: (ObjectPrototype::ObjectPrototype): (ObjectProtoFunc::ObjectProtoFunc):
• kjs/object_object.h:
• kjs/regexp_object.cpp: (RegExpPrototype::RegExpPrototype): (RegExpProtoFunc::RegExpProtoFunc):
• kjs/regexp_object.h:
• kjs/string_object.cpp: (StringProtoFunc::StringProtoFunc): (StringObjectImp::StringObjectImp): (StringObjectFuncImp::StringObjectFuncImp):
• kjs/string_object.h:

File:

• trunk/JavaScriptCore/kjs/object_object.cpp (modified) (2 diffs)

trunk/JavaScriptCore/kjs/object_object.cpp

@@ -35 +35 @@
 // ------------------------------ ObjectPrototype --------------------------------
 
-ObjectPrototype::ObjectPrototype(ExecState *exec,
-                                       FunctionPrototype *funcProto)
+ObjectPrototype::ObjectPrototype(ExecState* exec, FunctionPrototype* funcProto)
   : JSObject() // [[Prototype]] is null
 {
-    putDirect(toStringPropertyName, new ObjectProtoFunc(exec, funcProto, ObjectProtoFunc::ToString,               0), DontEnum);
-    putDirect(toLocaleStringPropertyName, new ObjectProtoFunc(exec, funcProto, ObjectProtoFunc::ToLocaleString,   0), DontEnum);
-    putDirect(valueOfPropertyName, new ObjectProtoFunc(exec, funcProto, ObjectProtoFunc::ValueOf,                 0), DontEnum);
-    putDirect("hasOwnProperty", new ObjectProtoFunc(exec, funcProto, ObjectProtoFunc::HasOwnProperty,             1), DontEnum);
-    putDirect("propertyIsEnumerable", new ObjectProtoFunc(exec, funcProto, ObjectProtoFunc::PropertyIsEnumerable, 1), DontEnum);
-    putDirect("isPrototypeOf", new ObjectProtoFunc(exec, funcProto, ObjectProtoFunc::IsPrototypeOf,               1), DontEnum);
+    putDirectFunction(new ObjectProtoFunc(exec, funcProto, ObjectProtoFunc::ToString, 0, toStringPropertyName), DontEnum);
+    putDirectFunction(new ObjectProtoFunc(exec, funcProto, ObjectProtoFunc::ToLocaleString, 0, toLocaleStringPropertyName), DontEnum);
+    putDirectFunction(new ObjectProtoFunc(exec, funcProto, ObjectProtoFunc::ValueOf, 0, valueOfPropertyName), DontEnum);
+    static Identifier hasOwnPropertyPropertyName("hasOwnProperty");
+    static Identifier propertyIsEnumerablePropertyName("propertyIsEnumerable");
+    static Identifier isPrototypeOfPropertyName("isPrototypeOf");
+    putDirectFunction(new ObjectProtoFunc(exec, funcProto, ObjectProtoFunc::HasOwnProperty, 1, hasOwnPropertyPropertyName), DontEnum);
+    putDirectFunction(new ObjectProtoFunc(exec, funcProto, ObjectProtoFunc::PropertyIsEnumerable, 1, propertyIsEnumerablePropertyName), DontEnum);
+    putDirectFunction(new ObjectProtoFunc(exec, funcProto, ObjectProtoFunc::IsPrototypeOf, 1, isPrototypeOfPropertyName), DontEnum);
+
     // Mozilla extensions
-    putDirect("__defineGetter__", new ObjectProtoFunc(exec, funcProto, ObjectProtoFunc::DefineGetter,             2), DontEnum);
-    putDirect("__defineSetter__", new ObjectProtoFunc(exec, funcProto, ObjectProtoFunc::DefineSetter,             2), DontEnum);
-    putDirect("__lookupGetter__", new ObjectProtoFunc(exec, funcProto, ObjectProtoFunc::LookupGetter,             1), DontEnum);
-    putDirect("__lookupSetter__", new ObjectProtoFunc(exec, funcProto, ObjectProtoFunc::LookupSetter,             1), DontEnum);
+    static const Identifier defineGetterPropertyName("__defineGetter__");
+    static const Identifier defineSetterPropertyName("__defineSetter__");
+    static const Identifier lookupGetterPropertyName("__lookupGetter__");
+    static const Identifier lookupSetterPropertyName("__lookupSetter__");
+    putDirectFunction(new ObjectProtoFunc(exec, funcProto, ObjectProtoFunc::DefineGetter, 2, defineGetterPropertyName), DontEnum);
+    putDirectFunction(new ObjectProtoFunc(exec, funcProto, ObjectProtoFunc::DefineSetter, 2, defineSetterPropertyName), DontEnum);
+    putDirectFunction(new ObjectProtoFunc(exec, funcProto, ObjectProtoFunc::LookupGetter, 1, lookupGetterPropertyName), DontEnum);
+    putDirectFunction(new ObjectProtoFunc(exec, funcProto, ObjectProtoFunc::LookupSetter, 1, lookupSetterPropertyName), DontEnum);
 }
 
@@ -55 +62 @@
 // ------------------------------ ObjectProtoFunc --------------------------------
 
-ObjectProtoFunc::ObjectProtoFunc(ExecState *exec,
-                                       FunctionPrototype *funcProto,
-                                       int i, int len)
-  : InternalFunctionImp(funcProto), id(i)
+ObjectProtoFunc::ObjectProtoFunc(ExecState*, FunctionPrototype* funcProto, int i, int len, const Identifier& name)
+  : InternalFunctionImp(funcProto, name)
+  , id(i)
 {
   putDirect(lengthPropertyName, len, DontDelete|ReadOnly|DontEnum);