Changeset 27100 in webkit for trunk/JavaScriptCore/kjs/function.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/function.cpp (modified) (5 diffs)

trunk/JavaScriptCore/kjs/function.cpp

@@ -70 +70 @@
 
   // enter a new execution context
-  Context ctx(globalObj, exec->dynamicInterpreter(), thisObj, body.get(),
-                 FunctionCode, exec->context(), this, &args);
-  ExecState newExec(exec->dynamicInterpreter(), &ctx);
+  ExecState newExec(exec->dynamicInterpreter(), globalObj, thisObj, body.get(),
+                    FunctionCode, exec, this, &args);
   if (exec->hadException())
     newExec.setException(exec->exception());
-  ctx.setExecState(&newExec);
 
   Debugger* dbg = exec->dynamicInterpreter()->debugger();
@@ -128 +126 @@
 {
   FunctionImp* thisObj = static_cast<FunctionImp*>(slot.slotBase());
-  Context* context = exec->m_context;
-  while (context) {
-    if (context->function() == thisObj)
-      return static_cast<ActivationImp*>(context->activationObject())->get(exec, propertyName);
-    context = context->callingContext();
+  ExecState* e = exec;
+  while (e) {
+    if (e->function() == thisObj)
+      return static_cast<ActivationImp*>(e->activationObject())->get(exec, propertyName);
+    e = e->callingExecState();
   }
   return jsNull();
@@ -140 +138 @@
 {
     FunctionImp* thisObj = static_cast<FunctionImp*>(slot.slotBase());
-    Context* context = exec->m_context;
-    while (context) {
-        if (context->function() == thisObj)
+    ExecState* e = exec;
+    while (e) {
+        if (e->function() == thisObj)
             break;
-        context = context->callingContext();
-    }
-
-    if (!context)
+        e = e->callingExecState();
+    }
+
+    if (!e)
         return jsNull();
     
-    Context* callingContext = context->callingContext();
-    if (!callingContext)
+    ExecState* callingExecState = e->callingExecState();
+    if (!callingExecState)
         return jsNull();
     
-    FunctionImp* callingFunction = callingContext->function();
+    FunctionImp* callingFunction = callingExecState->function();
     if (!callingFunction)
         return jsNull();
@@ -745 +743 @@
         // enter a new execution context
         Interpreter* interpreter = switchGlobal ? static_cast<JSGlobalObject*>(thisObj)->interpreter() : exec->dynamicInterpreter();
-        JSObject* thisVal = static_cast<JSObject*>(exec->context()->thisValue());
-        Context ctx(interpreter->globalObject(),
-                       interpreter,
-                       thisVal,
-                       progNode.get(),
-                       EvalCode,
-                       exec->context());
-        ExecState newExec(interpreter, &ctx);
+        JSObject* thisVal = static_cast<JSObject*>(exec->thisValue());
+        ExecState newExec(interpreter, interpreter->globalObject(), thisVal, progNode.get(), EvalCode, exec);
         if (exec->hadException())
             newExec.setException(exec->exception());
-        ctx.setExecState(&newExec);
           
         if (switchGlobal) {
-            ctx.pushScope(thisObj);
-            ctx.setVariableObject(thisObj);
+            newExec.pushScope(thisObj);
+            newExec.setVariableObject(thisObj);
         }
         
@@ -765 +756 @@
           
         if (switchGlobal)
-            ctx.popScope();
+            newExec.popScope();
 
         // if an exception occured, propogate it back to the previous execution object