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

Timestamp:

Oct 26, 2007, 3:36:45 AM (18 years ago)

Author:

mjs

Message:

Windows build fix.

• JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj:

File:

• trunk/JavaScriptCore/kjs/ExecState.cpp (modified) (7 diffs)

trunk/JavaScriptCore/kjs/ExecState.cpp

@@ -1 @@
-// -*- c-basic-offset: 2 -*-
+// -*- mode: c++; c-basic-offset: 4 -*-
 /*
  *  This file is part of the KDE libraries
  *  Copyright (C) 1999-2001 Harri Porten ([email protected])
  *  Copyright (C) 2001 Peter Kelly ([email protected])
- *  Copyright (C) 2003 Apple Computer, Inc.
+ *  Copyright (C) 2003, 2007 Apple Inc. All rights reserved.
  *
  *  This library is free software; you can redistribute it and/or
@@ -34 +34 @@
 
 // ECMA 10.2
-Context::Context(JSGlobalObject* glob, Interpreter* interpreter, JSObject* thisV, 
-                 FunctionBodyNode* currentBody, CodeType type, Context* callingCon, 
-                 FunctionImp* func, const List* args)
+ExecState::ExecState(Interpreter* interpreter, JSGlobalObject* glob, JSObject* thisV, 
+                     FunctionBodyNode* currentBody, CodeType type, ExecState* callingExec, 
+                     FunctionImp* func, const List* args)
     : m_interpreter(interpreter)
-    , m_savedContext(interpreter->context())
+    , m_exception(0)
+    , m_propertyNames(CommonIdentifiers::shared())
+    , m_savedExecState(interpreter->currentExec())
     , m_currentBody(currentBody)
     , m_function(func)
@@ -46 +48 @@
 {
     m_codeType = type;
-    m_callingContext = callingCon;
+    m_callingExecState = callingExec;
     
     // create and initialize activation object (ECMA 10.1.6)
@@ -60 +62 @@
     switch(type) {
     case EvalCode:
-        if (m_callingContext) {
-            scope = m_callingContext->scopeChain();
-            m_variable = m_callingContext->variableObject();
-            m_thisVal = m_callingContext->thisValue();
+        if (m_callingExecState) {
+            scope = m_callingExecState->scopeChain();
+            m_variable = m_callingExecState->variableObject();
+            m_thisVal = m_callingExecState->thisValue();
             break;
         } // else same as GlobalCode
@@ -79 +81 @@
     }
 
-    m_interpreter->setContext(this);
+    if (currentBody)
+        m_interpreter->setCurrentExec(this);
 }
 
-Context::~Context()
+ExecState::~ExecState()
 {
-    m_interpreter->setContext(m_savedContext);
+    m_interpreter->setCurrentExec(m_savedExecState);
 
     // The arguments list is only needed to potentially create the  arguments object, 
@@ -95 +98 @@
 }
 
-void Context::mark()
+void ExecState::mark()
 {
-    for (Context* context = this; context; context = context->m_callingContext)
-        context->scope.mark();
+    for (ExecState* exec = this; exec; exec = exec->m_callingExecState)
+        exec->scope.mark();
 }
 
 Interpreter* ExecState::lexicalInterpreter() const
 {
-    if (!m_context)
+    if (scopeChain().isEmpty())
         return dynamicInterpreter();
     
-    JSObject* object = m_context->scopeChain().bottom();
+    JSObject* object = scopeChain().bottom();
     if (object && object->isGlobalObject())
         return static_cast<JSGlobalObject*>(object)->interpreter();
@@ -113 +116 @@
 }
 
+
 } // namespace KJS