Changeset 27097 in webkit for trunk/JavaScriptCore/kjs/ExecState.cpp

Timestamp:

Oct 26, 2007, 1:32:40 AM (18 years ago)

Author:

mjs

Message:

JavaScriptCore:

Reviewed by Oliver.

• moved Context class into ExecState.{h,cpp} in preparation for merging ExecState and Context classes.

• kjs/ExecState.h: Moved CodeType enum and Context class here in preparation for merging ExecState and Context.
• kjs/ExecState.cpp: Moved Context class here from Context.cpp. (KJS::Context::Context): (KJS::Context::~Context): (KJS::Context::mark):
• kjs/context.h: Removed.
• kjs/Context.cpp: Removed.
• kjs/function.h: Removed CodeType enum.
• kjs/LabelStack.h: Added. Pulled LabelStack class out of internal.h.
• kjs/internal.h: Removed LabelStack.
• JavaScriptCore.xcodeproj/project.pbxproj: Added new file, removed ones that are gone.
• kjs/collector.cpp: Fixed includes.
• kjs/function.cpp: ditto
• kjs/internal.cpp: ditto
• kjs/interpreter.cpp: ditto
• kjs/lookup.h: ditto
• kjs/nodes.cpp: ditto

WebCore:

Reviewed by Oliver.

• update for JavaScriptCore header changes

• bindings/objc/WebScriptObject.mm:
• bridge/mac/WebCoreScriptDebugger.mm:

File:

• trunk/JavaScriptCore/kjs/ExecState.cpp (modified) (1 diff)

trunk/JavaScriptCore/kjs/ExecState.cpp

@@ -23 +23 @@
  */
 
-#include "context.h"
+#include "config.h"
+#include "ExecState.h"
+
 #include "JSGlobalObject.h"
-#include "ExecState.h"
 #include "internal.h"
 
 namespace KJS {
+
+
+// ECMA 10.2
+Context::Context(JSGlobalObject* glob, Interpreter* interpreter, JSObject* thisV, 
+                 FunctionBodyNode* currentBody, CodeType type, Context* callingCon, 
+                 FunctionImp* func, const List* args)
+    : m_interpreter(interpreter)
+    , m_savedContext(interpreter->context())
+    , m_currentBody(currentBody)
+    , m_function(func)
+    , m_arguments(args)
+    , m_iterationDepth(0)
+    , m_switchDepth(0) 
+{
+    m_codeType = type;
+    m_callingContext = callingCon;
+    
+    // create and initialize activation object (ECMA 10.1.6)
+    if (type == FunctionCode) {
+        m_activation = new ActivationImp(func, *args);
+        m_variable = m_activation;
+    } else {
+        m_activation = 0;
+        m_variable = glob;
+    }
+    
+    // ECMA 10.2
+    switch(type) {
+    case EvalCode:
+        if (m_callingContext) {
+            scope = m_callingContext->scopeChain();
+            m_variable = m_callingContext->variableObject();
+            m_thisVal = m_callingContext->thisValue();
+            break;
+        } // else same as GlobalCode
+    case GlobalCode:
+        scope.clear();
+        scope.push(glob);
+        m_thisVal = static_cast<JSObject*>(glob);
+        break;
+    case FunctionCode:
+        scope = func->scope();
+        scope.push(m_activation);
+        m_variable = m_activation; // TODO: DontDelete ? (ECMA 10.2.3)
+        m_thisVal = thisV;
+        break;
+    }
+
+    m_interpreter->setContext(this);
+}
+
+Context::~Context()
+{
+    m_interpreter->setContext(m_savedContext);
+
+    // The arguments list is only needed to potentially create the  arguments object, 
+    // which isn't accessible from nested scopes so we can discard the list as soon 
+    // as the function is done running.
+    // This prevents lists of Lists from building up, waiting to be garbage collected
+    ActivationImp* activation = static_cast<ActivationImp*>(m_activation);
+    if (activation)
+        activation->releaseArguments();
+}
+
+void Context::mark()
+{
+    for (Context* context = this; context; context = context->m_callingContext)
+        context->scope.mark();
+}
 
 Interpreter* ExecState::lexicalInterpreter() const