webkitgtk-2.4.11webkitgtk-2.4.11

1 files changed, 59 insertions, 64 deletions

diff --git a/Source/JavaScriptCore/runtime/RegExpObject.h b/Source/JavaScriptCore/runtime/RegExpObject.h
index 1b44301bd..2b49ba2a4 100644
--- a/Source/JavaScriptCore/runtime/RegExpObject.h
+++ b/Source/JavaScriptCore/runtime/RegExpObject.h
@@ -1,6 +1,6 @@
 /*
  *  Copyright (C) 1999-2000 Harri Porten (porten@kde.org)
- *  Copyright (C) 2003, 2007, 2008, 2012, 2016 Apple Inc. All Rights Reserved.
+ *  Copyright (C) 2003, 2007, 2008, 2012 Apple Inc. All Rights Reserved.
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Lesser General Public
@@ -26,86 +26,81 @@
 
 namespace JSC {
     
-class RegExpObject : public JSNonFinalObject {
-public:
-    typedef JSNonFinalObject Base;
-    static const unsigned StructureFlags = Base::StructureFlags | OverridesGetOwnPropertySlot | OverridesGetPropertyNames;
-
-    static RegExpObject* create(VM& vm, Structure* structure, RegExp* regExp)
-    {
-        RegExpObject* object = new (NotNull, allocateCell<RegExpObject>(vm.heap)) RegExpObject(vm, structure, regExp);
-        object->finishCreation(vm);
-        return object;
-    }
+    class RegExpObject : public JSNonFinalObject {
+    public:
+        typedef JSNonFinalObject Base;
+
+        static RegExpObject* create(VM& vm, Structure* structure, RegExp* regExp)
+        {
+            RegExpObject* object = new (NotNull, allocateCell<RegExpObject>(vm.heap)) RegExpObject(vm, structure, regExp);
+            object->finishCreation(vm);
+            return object;
+        }
 
-    void setRegExp(VM& vm, RegExp* r) { m_regExp.set(vm, this, r); }
-    RegExp* regExp() const { return m_regExp.get(); }
+        void setRegExp(VM& vm, RegExp* r) { m_regExp.set(vm, this, r); }
+        RegExp* regExp() const { return m_regExp.get(); }
 
-    bool setLastIndex(ExecState* exec, size_t lastIndex)
-    {
-        if (LIKELY(m_lastIndexIsWritable)) {
+        void setLastIndex(ExecState* exec, size_t lastIndex)
+        {
             m_lastIndex.setWithoutWriteBarrier(jsNumber(lastIndex));
-            return true;
+            if (LIKELY(m_lastIndexIsWritable))
+                m_lastIndex.setWithoutWriteBarrier(jsNumber(lastIndex));
+            else
+                throwTypeError(exec, StrictModeReadonlyPropertyWriteError);
         }
-        throwTypeError(exec, StrictModeReadonlyPropertyWriteError);
-        return false;
-    }
-    bool setLastIndex(ExecState* exec, JSValue lastIndex, bool shouldThrow)
-    {
-        if (LIKELY(m_lastIndexIsWritable)) {
-            m_lastIndex.set(exec->vm(), this, lastIndex);
-            return true;
+        void setLastIndex(ExecState* exec, JSValue lastIndex, bool shouldThrow)
+        {
+            if (LIKELY(m_lastIndexIsWritable))
+                m_lastIndex.set(exec->vm(), this, lastIndex);
+            else if (shouldThrow)
+                throwTypeError(exec, StrictModeReadonlyPropertyWriteError);
+        }
+        JSValue getLastIndex() const
+        {
+            return m_lastIndex.get();
         }
 
-        if (shouldThrow)
-            throwTypeError(exec, StrictModeReadonlyPropertyWriteError);
-        return false;
-    }
-    JSValue getLastIndex() const
-    {
-        return m_lastIndex.get();
-    }
+        bool test(ExecState* exec, JSString* string) { return match(exec, string); }
+        JSValue exec(ExecState*, JSString*);
 
-    bool test(ExecState* exec, JSString* string) { return match(exec, string); }
-    JSValue exec(ExecState*, JSString*);
+        static bool getOwnPropertySlot(JSObject*, ExecState*, PropertyName, PropertySlot&);
+        static void put(JSCell*, ExecState*, PropertyName, JSValue, PutPropertySlot&);
 
-    static bool getOwnPropertySlot(JSObject*, ExecState*, PropertyName, PropertySlot&);
-    static void put(JSCell*, ExecState*, PropertyName, JSValue, PutPropertySlot&);
+        DECLARE_EXPORT_INFO;
 
-    DECLARE_EXPORT_INFO;
+        static Structure* createStructure(VM& vm, JSGlobalObject* globalObject, JSValue prototype)
+        {
+            return Structure::create(vm, globalObject, prototype, TypeInfo(ObjectType, StructureFlags), info());
+        }
 
-    static Structure* createStructure(VM& vm, JSGlobalObject* globalObject, JSValue prototype)
-    {
-        return Structure::create(vm, globalObject, prototype, TypeInfo(RegExpObjectType, StructureFlags), info());
-    }
+    protected:
+        JS_EXPORT_PRIVATE RegExpObject(VM&, Structure*, RegExp*);
+        JS_EXPORT_PRIVATE void finishCreation(VM&);
 
-protected:
-    JS_EXPORT_PRIVATE RegExpObject(VM&, Structure*, RegExp*);
-    JS_EXPORT_PRIVATE void finishCreation(VM&);
+        static const unsigned StructureFlags = OverridesVisitChildren | OverridesGetOwnPropertySlot | Base::StructureFlags;
 
-    static void visitChildren(JSCell*, SlotVisitor&);
+        static void visitChildren(JSCell*, SlotVisitor&);
 
-    JS_EXPORT_PRIVATE static bool deleteProperty(JSCell*, ExecState*, PropertyName);
-    JS_EXPORT_PRIVATE static void getOwnNonIndexPropertyNames(JSObject*, ExecState*, PropertyNameArray&, EnumerationMode);
-    JS_EXPORT_PRIVATE static void getPropertyNames(JSObject*, ExecState*, PropertyNameArray&, EnumerationMode);
-    JS_EXPORT_PRIVATE static void getGenericPropertyNames(JSObject*, ExecState*, PropertyNameArray&, EnumerationMode);
-    JS_EXPORT_PRIVATE static bool defineOwnProperty(JSObject*, ExecState*, PropertyName, const PropertyDescriptor&, bool shouldThrow);
+        JS_EXPORT_PRIVATE static bool deleteProperty(JSCell*, ExecState*, PropertyName);
+        JS_EXPORT_PRIVATE static void getOwnNonIndexPropertyNames(JSObject*, ExecState*, PropertyNameArray&, EnumerationMode);
+        JS_EXPORT_PRIVATE static void getPropertyNames(JSObject*, ExecState*, PropertyNameArray&, EnumerationMode);
+        JS_EXPORT_PRIVATE static bool defineOwnProperty(JSObject*, ExecState*, PropertyName, const PropertyDescriptor&, bool shouldThrow);
 
-private:
-    MatchResult match(ExecState*, JSString*);
+    private:
+        MatchResult match(ExecState*, JSString*);
 
-    WriteBarrier<RegExp> m_regExp;
-    WriteBarrier<Unknown> m_lastIndex;
-    bool m_lastIndexIsWritable;
-};
+        WriteBarrier<RegExp> m_regExp;
+        WriteBarrier<Unknown> m_lastIndex;
+        bool m_lastIndexIsWritable;
+    };
 
-RegExpObject* asRegExpObject(JSValue);
+    RegExpObject* asRegExpObject(JSValue);
 
-inline RegExpObject* asRegExpObject(JSValue value)
-{
-    ASSERT(asObject(value)->inherits(RegExpObject::info()));
-    return static_cast<RegExpObject*>(asObject(value));
-}
+    inline RegExpObject* asRegExpObject(JSValue value)
+    {
+        ASSERT(asObject(value)->inherits(RegExpObject::info()));
+        return static_cast<RegExpObject*>(asObject(value));
+    }
 
 } // namespace JSC