Fix indentation of JSActivation.h.
authorfpizlo@apple.com <fpizlo@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sun, 17 Nov 2013 03:49:42 +0000 (03:49 +0000)
committerfpizlo@apple.com <fpizlo@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sun, 17 Nov 2013 03:49:42 +0000 (03:49 +0000)
Rubber stamped by Mark Hahnenberg.

* runtime/JSActivation.h:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@159384 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/JavaScriptCore/ChangeLog
Source/JavaScriptCore/runtime/JSActivation.h

index 96d8c42..e2402a8 100644 (file)
@@ -1,5 +1,13 @@
 2013-11-16  Filip Pizlo  <fpizlo@apple.com>
 
+        Fix indentation of JSActivation.h.
+
+        Rubber stamped by Mark Hahnenberg.
+
+        * runtime/JSActivation.h:
+
+2013-11-16  Filip Pizlo  <fpizlo@apple.com>
+
         Fix indentation of JSVariableObject.h.
 
         Rubber stamped by Mark Hahnenberg.
index 3ee39b5..1a25624 100644 (file)
 
 namespace JSC {
 
-    class Register;
+class Register;
     
-    class JSActivation : public JSVariableObject {
-    private:
-        JSActivation(VM&, CallFrame*, Register*, SharedSymbolTable*);
+class JSActivation : public JSVariableObject {
+private:
+    JSActivation(VM&, CallFrame*, Register*, SharedSymbolTable*);
     
-    public:
-        typedef JSVariableObject Base;
-
-        static JSActivation* create(VM& vm, CallFrame* callFrame, Register* registers, CodeBlock* codeBlock)
-        {
-            SharedSymbolTable* symbolTable = codeBlock->symbolTable();
-            JSActivation* activation = new (
-                NotNull,
-                allocateCell<JSActivation>(
-                    vm.heap,
-                    allocationSize(symbolTable)
-                )
-            ) JSActivation(vm, callFrame, registers, symbolTable);
-            activation->finishCreation(vm);
-            return activation;
-        }
-        
-        static JSActivation* create(VM& vm, CallFrame* callFrame, CodeBlock* codeBlock)
-        {
-            return create(vm, callFrame, callFrame->registers(), codeBlock);
-        }
-
-        static void visitChildren(JSCell*, SlotVisitor&);
-
-        static bool getOwnPropertySlot(JSObject*, ExecState*, PropertyName, PropertySlot&);
-        static void getOwnNonIndexPropertyNames(JSObject*, ExecState*, PropertyNameArray&, EnumerationMode);
-
-        static void put(JSCell*, ExecState*, PropertyName, JSValue, PutPropertySlot&);
-
-        static bool deleteProperty(JSCell*, ExecState*, PropertyName);
-
-        static JSValue toThis(JSCell*, ExecState*, ECMAMode);
-
-        void tearOff(VM&);
-        
-        DECLARE_INFO;
-
-        static Structure* createStructure(VM& vm, JSGlobalObject* globalObject, JSValue proto) { return Structure::create(vm, globalObject, proto, TypeInfo(ActivationObjectType, StructureFlags), info()); }
-
-        WriteBarrierBase<Unknown>& registerAt(int) const;
-        bool isValidIndex(int) const;
-        bool isValid(const SymbolTableEntry&) const;
-        bool isTornOff();
-        int registersOffset();
-        static int registersOffset(SharedSymbolTable*);
-
-    protected:
-        static const unsigned StructureFlags = OverridesGetOwnPropertySlot | OverridesVisitChildren | OverridesGetPropertyNames | Base::StructureFlags;
-
-    private:
-        bool symbolTableGet(PropertyName, PropertySlot&);
-        bool symbolTableGet(PropertyName, PropertyDescriptor&);
-        bool symbolTableGet(PropertyName, PropertySlot&, bool& slotIsWriteable);
-        bool symbolTablePut(ExecState*, PropertyName, JSValue, bool shouldThrow);
-        bool symbolTablePutWithAttributes(VM&, PropertyName, JSValue, unsigned attributes);
-
-        static JSValue argumentsGetter(ExecState*, JSValue, PropertyName);
-
-        static size_t allocationSize(SharedSymbolTable*);
-        static size_t storageOffset();
-
-        WriteBarrier<Unknown>* storage(); // captureCount() number of registers.
-    };
-
-    extern int activationCount;
-    extern int allTheThingsCount;
-
-    inline JSActivation::JSActivation(VM& vm, CallFrame* callFrame, Register* registers, SharedSymbolTable* symbolTable)
-        : Base(
-            vm,
-            callFrame->lexicalGlobalObject()->activationStructure(),
-            registers,
-            callFrame->scope(),
-            symbolTable
-        )
-    {
-        WriteBarrier<Unknown>* storage = this->storage();
-        size_t captureCount = symbolTable->captureCount();
-        for (size_t i = 0; i < captureCount; ++i)
-            new(&storage[i]) WriteBarrier<Unknown>;
-    }
+public:
+    typedef JSVariableObject Base;
 
-    JSActivation* asActivation(JSValue);
-
-    inline JSActivation* asActivation(JSValue value)
-    {
-        ASSERT(asObject(value)->inherits(JSActivation::info()));
-        return jsCast<JSActivation*>(asObject(value));
-    }
-    
-    ALWAYS_INLINE JSActivation* Register::activation() const
-    {
-        return asActivation(jsValue());
-    }
-
-    inline int JSActivation::registersOffset(SharedSymbolTable* symbolTable)
+    static JSActivation* create(VM& vm, CallFrame* callFrame, Register* registers, CodeBlock* codeBlock)
     {
-        return storageOffset() + ((symbolTable->captureCount() - symbolTable->captureStart()  - 1) * sizeof(WriteBarrier<Unknown>));
+        SharedSymbolTable* symbolTable = codeBlock->symbolTable();
+        JSActivation* activation = new (
+            NotNull,
+            allocateCell<JSActivation>(
+                vm.heap,
+                allocationSize(symbolTable)
+            )
+        ) JSActivation(vm, callFrame, registers, symbolTable);
+        activation->finishCreation(vm);
+        return activation;
     }
-
-    inline void JSActivation::tearOff(VM& vm)
-    {
-        ASSERT(!isTornOff());
-
-        WriteBarrierBase<Unknown>* dst = reinterpret_cast_ptr<WriteBarrierBase<Unknown>*>(
-            reinterpret_cast<char*>(this) + registersOffset(symbolTable()));
-        WriteBarrierBase<Unknown>* src = m_registers;
-
-        int captureEnd = symbolTable()->captureEnd();
-        for (int i = symbolTable()->captureStart(); i > captureEnd; --i)
-            dst[i].set(vm, this, src[i].get());
-
-        m_registers = dst;
-        ASSERT(isTornOff());
-    }
-
-    inline bool JSActivation::isTornOff()
+        
+    static JSActivation* create(VM& vm, CallFrame* callFrame, CodeBlock* codeBlock)
     {
-        return m_registers == reinterpret_cast_ptr<WriteBarrierBase<Unknown>*>(
-            reinterpret_cast<char*>(this) + registersOffset(symbolTable()));
+        return create(vm, callFrame, callFrame->registers(), codeBlock);
     }
 
-    inline size_t JSActivation::storageOffset()
-    {
-        return WTF::roundUpToMultipleOf<sizeof(WriteBarrier<Unknown>)>(sizeof(JSActivation));
-    }
+    static void visitChildren(JSCell*, SlotVisitor&);
 
-    inline WriteBarrier<Unknown>* JSActivation::storage()
-    {
-        return reinterpret_cast_ptr<WriteBarrier<Unknown>*>(
-            reinterpret_cast<char*>(this) + storageOffset());
-    }
+    static bool getOwnPropertySlot(JSObject*, ExecState*, PropertyName, PropertySlot&);
+    static void getOwnNonIndexPropertyNames(JSObject*, ExecState*, PropertyNameArray&, EnumerationMode);
 
-    inline size_t JSActivation::allocationSize(SharedSymbolTable* symbolTable)
-    {
-        size_t objectSizeInBytes = WTF::roundUpToMultipleOf<sizeof(WriteBarrier<Unknown>)>(sizeof(JSActivation));
-        size_t storageSizeInBytes = symbolTable->captureCount() * sizeof(WriteBarrier<Unknown>);
-        return objectSizeInBytes + storageSizeInBytes;
-    }
+    static void put(JSCell*, ExecState*, PropertyName, JSValue, PutPropertySlot&);
 
-    inline bool JSActivation::isValidIndex(int index) const
-    {
-        if (index > symbolTable()->captureStart())
-            return false;
-        if (index <= symbolTable()->captureEnd())
-            return false;
-        return true;
-    }
+    static bool deleteProperty(JSCell*, ExecState*, PropertyName);
 
-    inline bool JSActivation::isValid(const SymbolTableEntry& entry) const
-    {
-        return isValidIndex(entry.getIndex());
-    }
+    static JSValue toThis(JSCell*, ExecState*, ECMAMode);
 
-    inline WriteBarrierBase<Unknown>& JSActivation::registerAt(int index) const
-    {
-        ASSERT(isValidIndex(index));
-        return Base::registerAt(index);
-    }
+    void tearOff(VM&);
+        
+    DECLARE_INFO;
+
+    static Structure* createStructure(VM& vm, JSGlobalObject* globalObject, JSValue proto) { return Structure::create(vm, globalObject, proto, TypeInfo(ActivationObjectType, StructureFlags), info()); }
+
+    WriteBarrierBase<Unknown>& registerAt(int) const;
+    bool isValidIndex(int) const;
+    bool isValid(const SymbolTableEntry&) const;
+    bool isTornOff();
+    int registersOffset();
+    static int registersOffset(SharedSymbolTable*);
+
+protected:
+    static const unsigned StructureFlags = OverridesGetOwnPropertySlot | OverridesVisitChildren | OverridesGetPropertyNames | Base::StructureFlags;
+
+private:
+    bool symbolTableGet(PropertyName, PropertySlot&);
+    bool symbolTableGet(PropertyName, PropertyDescriptor&);
+    bool symbolTableGet(PropertyName, PropertySlot&, bool& slotIsWriteable);
+    bool symbolTablePut(ExecState*, PropertyName, JSValue, bool shouldThrow);
+    bool symbolTablePutWithAttributes(VM&, PropertyName, JSValue, unsigned attributes);
+
+    static JSValue argumentsGetter(ExecState*, JSValue, PropertyName);
+
+    static size_t allocationSize(SharedSymbolTable*);
+    static size_t storageOffset();
+
+    WriteBarrier<Unknown>* storage(); // captureCount() number of registers.
+};
+
+extern int activationCount;
+extern int allTheThingsCount;
+
+inline JSActivation::JSActivation(VM& vm, CallFrame* callFrame, Register* registers, SharedSymbolTable* symbolTable)
+    : Base(
+        vm,
+        callFrame->lexicalGlobalObject()->activationStructure(),
+        registers,
+        callFrame->scope(),
+        symbolTable)
+{
+    WriteBarrier<Unknown>* storage = this->storage();
+    size_t captureCount = symbolTable->captureCount();
+    for (size_t i = 0; i < captureCount; ++i)
+        new(&storage[i]) WriteBarrier<Unknown>;
+}
+
+JSActivation* asActivation(JSValue);
+
+inline JSActivation* asActivation(JSValue value)
+{
+    ASSERT(asObject(value)->inherits(JSActivation::info()));
+    return jsCast<JSActivation*>(asObject(value));
+}
+    
+ALWAYS_INLINE JSActivation* Register::activation() const
+{
+    return asActivation(jsValue());
+}
+
+inline int JSActivation::registersOffset(SharedSymbolTable* symbolTable)
+{
+    return storageOffset() + ((symbolTable->captureCount() - symbolTable->captureStart()  - 1) * sizeof(WriteBarrier<Unknown>));
+}
+
+inline void JSActivation::tearOff(VM& vm)
+{
+    ASSERT(!isTornOff());
+
+    WriteBarrierBase<Unknown>* dst = reinterpret_cast_ptr<WriteBarrierBase<Unknown>*>(
+        reinterpret_cast<char*>(this) + registersOffset(symbolTable()));
+    WriteBarrierBase<Unknown>* src = m_registers;
+
+    int captureEnd = symbolTable()->captureEnd();
+    for (int i = symbolTable()->captureStart(); i > captureEnd; --i)
+        dst[i].set(vm, this, src[i].get());
+
+    m_registers = dst;
+    ASSERT(isTornOff());
+}
+
+inline bool JSActivation::isTornOff()
+{
+    return m_registers == reinterpret_cast_ptr<WriteBarrierBase<Unknown>*>(
+        reinterpret_cast<char*>(this) + registersOffset(symbolTable()));
+}
+
+inline size_t JSActivation::storageOffset()
+{
+    return WTF::roundUpToMultipleOf<sizeof(WriteBarrier<Unknown>)>(sizeof(JSActivation));
+}
+
+inline WriteBarrier<Unknown>* JSActivation::storage()
+{
+    return reinterpret_cast_ptr<WriteBarrier<Unknown>*>(
+        reinterpret_cast<char*>(this) + storageOffset());
+}
+
+inline size_t JSActivation::allocationSize(SharedSymbolTable* symbolTable)
+{
+    size_t objectSizeInBytes = WTF::roundUpToMultipleOf<sizeof(WriteBarrier<Unknown>)>(sizeof(JSActivation));
+    size_t storageSizeInBytes = symbolTable->captureCount() * sizeof(WriteBarrier<Unknown>);
+    return objectSizeInBytes + storageSizeInBytes;
+}
+
+inline bool JSActivation::isValidIndex(int index) const
+{
+    if (index > symbolTable()->captureStart())
+        return false;
+    if (index <= symbolTable()->captureEnd())
+        return false;
+    return true;
+}
+
+inline bool JSActivation::isValid(const SymbolTableEntry& entry) const
+{
+    return isValidIndex(entry.getIndex());
+}
+
+inline WriteBarrierBase<Unknown>& JSActivation::registerAt(int index) const
+{
+    ASSERT(isValidIndex(index));
+    return Base::registerAt(index);
+}
 
 } // namespace JSC