JavaScriptCore-7601.1.46.3.tar.gz

[apple/javascriptcore.git] / runtime / ArrayConstructor.h

diff --git a/runtime/ArrayConstructor.h b/runtime/ArrayConstructor.h
index 727475b4796d7f5a5a72687bda7ee0df47b1ec3c..040f26c4c9905a457694c05c854470607bb484a7 100644 (file)
--- a/runtime/ArrayConstructor.h
+++ b/runtime/ArrayConstructor.h
@@ -32,30 +32,28 @@ class JSArray;
 class ArrayConstructor : public InternalFunction {
 public:
     typedef InternalFunction Base;
 class ArrayConstructor : public InternalFunction {
 public:
     typedef InternalFunction Base;

+    static const unsigned StructureFlags = OverridesGetOwnPropertySlot | InternalFunction::StructureFlags;

 
 

-    static ArrayConstructor* create(ExecState* exec, JSGlobalObject* globalObject, Structure* structure, ArrayPrototype* arrayPrototype)
+    static ArrayConstructor* create(VM& vm, Structure* structure, ArrayPrototype* arrayPrototype)

     {
     {

-        ArrayConstructor* constructor = new (NotNull, allocateCell<ArrayConstructor>(*exec->heap())) ArrayConstructor(globalObject, structure);
-        constructor->finishCreation(exec, arrayPrototype);
+        ArrayConstructor* constructor = new (NotNull, allocateCell<ArrayConstructor>(vm.heap)) ArrayConstructor(vm, structure);
+        constructor->finishCreation(vm, arrayPrototype);

         return constructor;
     }
 
         return constructor;
     }
 

-    static const ClassInfo s_info;
+    DECLARE_INFO;

 
     static Structure* createStructure(VM& vm, JSGlobalObject* globalObject, JSValue prototype)
     {
 
     static Structure* createStructure(VM& vm, JSGlobalObject* globalObject, JSValue prototype)
     {

-        return Structure::create(vm, globalObject, prototype, TypeInfo(ObjectType, StructureFlags), &s_info);
+        return Structure::create(vm, globalObject, prototype, TypeInfo(ObjectType, StructureFlags), info());

     }
 
 protected:
     }
 
 protected:

-    void finishCreation(ExecState*, ArrayPrototype*);
-    static const unsigned StructureFlags = OverridesGetOwnPropertySlot | InternalFunction::StructureFlags;
+    void finishCreation(VM&, ArrayPrototype*);

 
 private:
 
 private:

-    ArrayConstructor(JSGlobalObject*, Structure*);
-    static bool getOwnPropertySlot(JSCell*, ExecState*, PropertyName, PropertySlot&);
-
-    static bool getOwnPropertyDescriptor(JSObject*, ExecState*, PropertyName, PropertyDescriptor&);
+    ArrayConstructor(VM&, Structure*);
+    static bool getOwnPropertySlot(JSObject*, ExecState*, PropertyName, PropertySlot&);

 
     static ConstructType getConstructData(JSCell*, ConstructData&);
     static CallType getCallData(JSCell*, CallData&);
 
     static ConstructType getConstructData(JSCell*, ConstructData&);
     static CallType getCallData(JSCell*, CallData&);