Changeset 31499 in webkit

Timestamp:

Mar 31, 2008, 8:55:32 PM (17 years ago)

Author:

ggaren@apple.com

Message:

2008-03-31 Geoffrey Garen <​ggaren@apple.com>

Reviewed by Beth Dakin.

Next step toward global code: subclass JSActivation + JSActivationData
from JSVariableObject + JSVariableObjectData.

JSActivation now relies on JSVariableObject for access to registers and
symbol table, and for some delete functionality, but not for anything
else yet.

(KJS::JSActivation::mark): Cleaned up the style here a little bit.

Location:

branches/squirrelfish/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• kjs/JSActivation.cpp (modified) (3 diffs)
• kjs/JSActivation.h (modified) (3 diffs)

branches/squirrelfish/JavaScriptCore/ChangeLog

@@ +1 @@
+2008-03-31  Geoffrey Garen  <ggaren@apple.com>
+
+        Reviewed by Beth Dakin.
+
+        Next step toward global code: subclass JSActivation + JSActivationData
+        from JSVariableObject + JSVariableObjectData.
+        
+        JSActivation now relies on JSVariableObject for access to registers and
+        symbol table, and for some delete functionality, but not for anything
+        else yet.
+
+        (KJS::JSActivation::mark): Cleaned up the style here a little bit.
+
 2008-03-31  Geoffrey Garen  <ggaren@apple.com>
 

branches/squirrelfish/JavaScriptCore/kjs/JSActivation.cpp

@@ -37 +37 @@
 
 JSActivation::JSActivation(PassRefPtr<FunctionBodyNode> functionBody, Vector<Register>* registers, int rOffset)
-    : m_data(new JSActivationData(functionBody, registers, rOffset))
+    : JSVariableObject(new JSActivationData(functionBody, registers, rOffset))
 {
 }
@@ -113 +113 @@
         return false;
 
-    if (symbolTable().contains(propertyName.ustring().rep()))
-        return false;
-
     return Base::deleteProperty(exec, propertyName);
 }
@@ -130 +127 @@
     Vector<Register>::iterator end = d()->registers->end();
     for (Vector<Register>::iterator it = d()->registers->begin(); it != end; ++it) {
-        if (!(*it).u.jsValue->marked())
-            (*it).u.jsValue->mark();
+        JSValue* v = it->u.jsValue;
+        if (!v->marked())
+            v->mark();
     }
 }
 
+bool JSActivation::isActivationObject() const
+{
+    return true;
+}
+
+bool JSActivation::isDynamicScope() const
+{
+    return d()->functionBody->usesEval();
+}
+
 } // namespace KJS

branches/squirrelfish/JavaScriptCore/kjs/JSActivation.h

@@ -30 +30 @@
 #define JSActivation_h
 
-#include "object.h"
+#include "JSVariableObject.h"
+#include "SymbolTable.h"
 #include "nodes.h"
-#include "SymbolTable.h"
 
 namespace KJS {
@@ -42 +42 @@
     // through d().
 
-    class JSActivation : public JSObject {
-    typedef JSObject Base;
+    class JSActivation : public JSVariableObject {
+    typedef JSVariableObject Base;
     public:
         JSActivation(PassRefPtr<FunctionBodyNode>, Vector<Register>*, int rOffset);
         virtual ~JSActivation();
         
-        virtual bool isActivationObject() const { return true; }
+        virtual bool isActivationObject() const;
+        virtual bool isDynamicScope() const;
 
         virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&);
@@ -64 +65 @@
         
     private:
-        struct JSActivationData {
-            JSActivationData(PassRefPtr<FunctionBodyNode> functionBody_, Vector<Register>* registers_, int rOffset_)
-                : didCopyRegisters(false)
+        struct JSActivationData : public JSVariableObjectData {
+            JSActivationData(PassRefPtr<FunctionBodyNode> functionBody_, Vector<Register>* registers, int rOffset)
+                : JSVariableObjectData(&functionBody_->symbolTable(), registers, rOffset)
+                , didCopyRegisters(false)
                 , functionBody(functionBody_)
-                , registers(registers_)
-                , rOffset(rOffset_)
-                , symbolTable(&functionBody->symbolTable())
             {
             }
 
             bool didCopyRegisters;
-
             RefPtr<FunctionBodyNode> functionBody; // Owns the symbol table
-
-            // Will be inherited from JSVariableObjectData
-            Vector<Register>* registers;
-            int rOffset;
-            SymbolTable* symbolTable; // Maps name -> index in register file.
         };
         
-        SymbolTable& symbolTable() { return *d()->symbolTable; }
-        Vector<Register>& registers() { return *d()->registers; }
-        JSActivationData* d() const { return static_cast<JSActivationData*>(m_data); }
-
-        JSActivationData* m_data;
+        JSActivationData* d() const { return static_cast<JSActivationData*>(JSVariableObject::d); }
     };