Changeset 47271 in webkit for trunk/JavaScriptCore

Timestamp:

Aug 14, 2009, 12:00:12 AM (16 years ago)

Author:

[email protected]

Message:

[ES5] Implement Array.isArray
​https://bugs.webkit.org/show_bug.cgi?id=28296

Reviewed by Maciej Stachowiak

Add support for Array.isArray to the Array constructor

Location:

trunk/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• runtime/ArrayConstructor.cpp (modified) (3 diffs)
• runtime/ArrayConstructor.h (modified) (1 diff)
• runtime/CommonIdentifiers.h (modified) (1 diff)
• runtime/JSGlobalObject.cpp (modified) (1 diff)

trunk/JavaScriptCore/ChangeLog

@@ -7 +7 @@
         * runtime/JSArray.h:
         (JSC::MarkStack::drain):
+
+2009-08-13  Oliver Hunt  <[email protected]>
+
+        Reviewed by Maciej Stachowiak.
+
+        [ES5] Implement Array.isArray
+        https://bugs.webkit.org/show_bug.cgi?id=28296
+
+        Add support for Array.isArray to the Array constructor
+
+        * runtime/ArrayConstructor.cpp:
+        (JSC::ArrayConstructor::ArrayConstructor):
+        (JSC::arrayConstructorIsArray):
+        * runtime/ArrayConstructor.h:
+        * runtime/CommonIdentifiers.h:
+        * runtime/JSArray.h:
+        (JSC::MarkStack::drain):
+        * runtime/JSGlobalObject.cpp:
+        (JSC::JSGlobalObject::reset):
 
 2009-08-13  Oliver Hunt  <[email protected]>

trunk/JavaScriptCore/runtime/ArrayConstructor.cpp

@@ -34 +34 @@
 
 ASSERT_CLASS_FITS_IN_CELL(ArrayConstructor);
+    
+static JSValue JSC_HOST_CALL arrayConstructorIsArray(ExecState*, JSObject*, JSValue, const ArgList&);
 
-ArrayConstructor::ArrayConstructor(ExecState* exec, PassRefPtr<Structure> structure, ArrayPrototype* arrayPrototype)
+ArrayConstructor::ArrayConstructor(ExecState* exec, PassRefPtr<Structure> structure, ArrayPrototype* arrayPrototype, Structure* prototypeFunctionStructure)
     : InternalFunction(&exec->globalData(), structure, Identifier(exec, arrayPrototype->classInfo()->className))
 {
@@ -43 +45 @@
     // no. of arguments for constructor
     putDirectWithoutTransition(exec->propertyNames().length, jsNumber(exec, 1), ReadOnly | DontEnum | DontDelete);
+
+    // ES5
+    putDirectFunctionWithoutTransition(exec, new (exec) NativeFunctionWrapper(exec, prototypeFunctionStructure, 1, exec->propertyNames().isArray, arrayConstructorIsArray), DontEnum);
 }
 
@@ -84 +89 @@
 }
 
+JSValue JSC_HOST_CALL arrayConstructorIsArray(ExecState*, JSObject*, JSValue, const ArgList& args)
+{
+    if (!args.at(0).isObject())
+        return jsBoolean(false);
+    return jsBoolean(asObject(args.at(0))->isObject(&JSArray::info));
+}
+
 } // namespace JSC

trunk/JavaScriptCore/runtime/ArrayConstructor.h

@@ -30 +30 @@
     class ArrayConstructor : public InternalFunction {
     public:
-        ArrayConstructor(ExecState*, PassRefPtr<Structure>, ArrayPrototype*);
+        ArrayConstructor(ExecState*, PassRefPtr<Structure>, ArrayPrototype*, Structure*);
 
         virtual ConstructType getConstructData(ConstructData&);

trunk/JavaScriptCore/runtime/CommonIdentifiers.h

@@ -48 +48 @@
     macro(index) \
     macro(input) \
+    macro(isArray) \
     macro(isPrototypeOf) \
     macro(length) \

trunk/JavaScriptCore/runtime/JSGlobalObject.cpp

@@ -259 +259 @@
     JSCell* objectConstructor = new (exec) ObjectConstructor(exec, ObjectConstructor::createStructure(d()->functionPrototype), d()->objectPrototype, d()->prototypeFunctionStructure.get());
     JSCell* functionConstructor = new (exec) FunctionConstructor(exec, FunctionConstructor::createStructure(d()->functionPrototype), d()->functionPrototype);
-    JSCell* arrayConstructor = new (exec) ArrayConstructor(exec, ArrayConstructor::createStructure(d()->functionPrototype), d()->arrayPrototype);
+    JSCell* arrayConstructor = new (exec) ArrayConstructor(exec, ArrayConstructor::createStructure(d()->functionPrototype), d()->arrayPrototype, d()->prototypeFunctionStructure.get());
     JSCell* stringConstructor = new (exec) StringConstructor(exec, StringConstructor::createStructure(d()->functionPrototype), d()->prototypeFunctionStructure.get(), d()->stringPrototype);
     JSCell* booleanConstructor = new (exec) BooleanConstructor(exec, BooleanConstructor::createStructure(d()->functionPrototype), d()->booleanPrototype);