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

Timestamp:

Dec 4, 2005, 3:28:56 PM (19 years ago)

Author:

andersca

Message:

2005-12-04 Anders Carlsson <​[email protected]>

Reviewed by Geoffrey.

• Fixes <​http://bugzilla.opendarwin.org/show_bug.cgi?id=3999>

• kjs/object.cpp: (KJS::ObjectImp::canPut): Refactor to use getPropertyAttributes.

(KJS::ObjectImp::propertyIsEnumerable):
New function which checks if a property is enumerable.

(KJS::ObjectImp::getPropertyAttributes):

• kjs/object.h: Add getPropertyAttributes and propertyIsEnumerable.

• kjs/object_object.cpp: (ObjectPrototypeImp::ObjectPrototypeImp): (ObjectProtoFuncImp::callAsFunction):
• kjs/object_object.h: (KJS::ObjectProtoFuncImp::): Add propertyIsEnumerable to the Object prototype.

File:

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

trunk/JavaScriptCore/kjs/object_object.cpp

@@ -39 +39 @@
   : ObjectImp() // [[Prototype]] is Null()
 {
-    putDirect(toStringPropertyName, new ObjectProtoFuncImp(exec,funcProto,ObjectProtoFuncImp::ToString,            0), DontEnum);
-    putDirect(toLocaleStringPropertyName, new ObjectProtoFuncImp(exec,funcProto,ObjectProtoFuncImp::ToLocaleString,0), DontEnum);
-    putDirect(valueOfPropertyName,  new ObjectProtoFuncImp(exec,funcProto,ObjectProtoFuncImp::ValueOf,             0), DontEnum);
-    putDirect("hasOwnProperty", new ObjectProtoFuncImp(exec,funcProto,ObjectProtoFuncImp::HasOwnProperty,          1), DontEnum);
+    putDirect(toStringPropertyName, new ObjectProtoFuncImp(exec, funcProto, ObjectProtoFuncImp::ToString,               0), DontEnum);
+    putDirect(toLocaleStringPropertyName, new ObjectProtoFuncImp(exec, funcProto, ObjectProtoFuncImp::ToLocaleString,   0), DontEnum);
+    putDirect(valueOfPropertyName, new ObjectProtoFuncImp(exec, funcProto, ObjectProtoFuncImp::ValueOf,                 0), DontEnum);
+    putDirect("hasOwnProperty", new ObjectProtoFuncImp(exec, funcProto, ObjectProtoFuncImp::HasOwnProperty,             1), DontEnum);
+    putDirect("propertyIsEnumerable", new ObjectProtoFuncImp(exec, funcProto, ObjectProtoFuncImp::PropertyIsEnumerable, 1), DontEnum);
 }
 
@@ -62 +63 @@
 }
 
-// ECMA 15.2.4.2, 15.2.4.4, 15.2.4.5
+// ECMA 15.2.4.2, 15.2.4.4, 15.2.4.5, 15.2.4.7
 
 ValueImp *ObjectProtoFuncImp::callAsFunction(ExecState *exec, ObjectImp *thisObj, const List &args)
@@ -73 +74 @@
             return jsBoolean(thisObj->getOwnPropertySlot(exec, Identifier(args[0]->toString(exec)), slot));
         }
+        case PropertyIsEnumerable:
+            return jsBoolean(thisObj->propertyIsEnumerable(exec, Identifier(args[0]->toString(exec))));
         case ToLocaleString:
             return jsString(thisObj->toString(exec));