JavaScriptCore-7600.1.4.15.12.tar.gz

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

diff --git a/runtime/StringConstructor.h b/runtime/StringConstructor.h
index 40e574c02e268605780cf5ab962d565daf58ddb2..a2c08231ef12de5bcbd09a62ace732183b7de6b1 100644 (file)
--- a/runtime/StringConstructor.h
+++ b/runtime/StringConstructor.h
@@ -31,31 +31,30 @@ namespace JSC {
     public:
         typedef InternalFunction Base;
 
     public:
         typedef InternalFunction Base;
 

-        static StringConstructor* create(ExecState* exec, JSGlobalObject* globalObject , Structure* structure, StringPrototype* stringPrototype)
+        static StringConstructor* create(VM& vm, Structure* structure, StringPrototype* stringPrototype)

         {
         {

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

             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:
         static const unsigned StructureFlags = OverridesGetOwnPropertySlot | InternalFunction::StructureFlags;
 
     private:
         }
 
     protected:
         static const unsigned StructureFlags = OverridesGetOwnPropertySlot | InternalFunction::StructureFlags;
 
     private:

-        StringConstructor(JSGlobalObject*, Structure*);
-        void finishCreation(ExecState*, StringPrototype*);
+        StringConstructor(VM&, Structure*);
+        void finishCreation(VM&, StringPrototype*);

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

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

     };
     
     JSCell* JSC_HOST_CALL stringFromCharCode(ExecState*, int32_t);
     };
     
     JSCell* JSC_HOST_CALL stringFromCharCode(ExecState*, int32_t);