JavaScriptCore-7600.1.4.16.1.tar.gz

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

diff --git a/runtime/RegExpMatchesArray.h b/runtime/RegExpMatchesArray.h
index af747b6a99bc2024594987c809d47c3cbc8365c6..8997d8e47fcc8c4fad02b45c4c5d6b12ef02ba45 100644 (file)
--- a/runtime/RegExpMatchesArray.h
+++ b/runtime/RegExpMatchesArray.h
@@ -40,11 +40,11 @@ namespace JSC {
         JSString* leftContext(ExecState*);
         JSString* rightContext(ExecState*);
 
         JSString* leftContext(ExecState*);
         JSString* rightContext(ExecState*);
 

-        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, ArrayWithArrayStorage);
+            return Structure::create(vm, globalObject, prototype, TypeInfo(ObjectType, StructureFlags), info(), ArrayWithSlowPutArrayStorage);

         }
 
         static void visitChildren(JSCell*, SlotVisitor&);
         }
 
         static void visitChildren(JSCell*, SlotVisitor&);


@@ -67,16 +67,16 @@ namespace JSC {
                 reifyMatchProperty(exec);
         }
 
                 reifyMatchProperty(exec);
         }
 

-        static bool getOwnPropertySlot(JSCell* cell, ExecState* exec, PropertyName propertyName, PropertySlot& slot)
+        static bool getOwnPropertySlot(JSObject* object, ExecState* exec, PropertyName propertyName, PropertySlot& slot)

         {
         {

-            RegExpMatchesArray* thisObject = jsCast<RegExpMatchesArray*>(cell);
+            RegExpMatchesArray* thisObject = jsCast<RegExpMatchesArray*>(object);

             thisObject->reifyAllPropertiesIfNecessary(exec);
             return JSArray::getOwnPropertySlot(thisObject, exec, propertyName, slot);
         }
 
             thisObject->reifyAllPropertiesIfNecessary(exec);
             return JSArray::getOwnPropertySlot(thisObject, exec, propertyName, slot);
         }
 

-        static bool getOwnPropertySlotByIndex(JSCell* cell, ExecState* exec, unsigned propertyName, PropertySlot& slot)
+        static bool getOwnPropertySlotByIndex(JSObject* object, ExecState* exec, unsigned propertyName, PropertySlot& slot)

         {
         {

-            RegExpMatchesArray* thisObject = jsCast<RegExpMatchesArray*>(cell);
+            RegExpMatchesArray* thisObject = jsCast<RegExpMatchesArray*>(object);

             if (propertyName)
                 thisObject->reifyAllPropertiesIfNecessary(exec);
             else
             if (propertyName)
                 thisObject->reifyAllPropertiesIfNecessary(exec);
             else


@@ -84,13 +84,6 @@ namespace JSC {
             return JSArray::getOwnPropertySlotByIndex(thisObject, exec, propertyName, slot);
         }
 
             return JSArray::getOwnPropertySlotByIndex(thisObject, exec, propertyName, slot);
         }
 

-        static bool getOwnPropertyDescriptor(JSObject* object, ExecState* exec, PropertyName propertyName, PropertyDescriptor& descriptor)
-        {
-            RegExpMatchesArray* thisObject = jsCast<RegExpMatchesArray*>(object);
-            thisObject->reifyAllPropertiesIfNecessary(exec);
-            return JSArray::getOwnPropertyDescriptor(thisObject, exec, propertyName, descriptor);
-        }
-

         static void put(JSCell* cell, ExecState* exec, PropertyName propertyName, JSValue v, PutPropertySlot& slot)
         {
             RegExpMatchesArray* thisObject = jsCast<RegExpMatchesArray*>(cell);
         static void put(JSCell* cell, ExecState* exec, PropertyName propertyName, JSValue v, PutPropertySlot& slot)
         {
             RegExpMatchesArray* thisObject = jsCast<RegExpMatchesArray*>(cell);


@@ -126,7 +119,7 @@ namespace JSC {
             JSArray::getOwnPropertyNames(thisObject, exec, arr, mode);
         }
 
             JSArray::getOwnPropertyNames(thisObject, exec, arr, mode);
         }
 

-        static bool defineOwnProperty(JSObject* object, ExecState* exec, PropertyName propertyName, PropertyDescriptor& descriptor, bool shouldThrow)
+        static bool defineOwnProperty(JSObject* object, ExecState* exec, PropertyName propertyName, const PropertyDescriptor& descriptor, bool shouldThrow)

         {
             RegExpMatchesArray* thisObject = jsCast<RegExpMatchesArray*>(object);
             thisObject->reifyAllPropertiesIfNecessary(exec);
         {
             RegExpMatchesArray* thisObject = jsCast<RegExpMatchesArray*>(object);
             thisObject->reifyAllPropertiesIfNecessary(exec);


@@ -142,6 +135,11 @@ namespace JSC {
         ReifiedState m_state;
 };
 
         ReifiedState m_state;
 };
 

+inline bool isRegExpMatchesArray(JSValue value)
+{
+    return value.isCell() && value.asCell()->classInfo() == RegExpMatchesArray::info();
+}
+

 }
 
 #endif // RegExpMatchesArray_h
 }
 
 #endif // RegExpMatchesArray_h