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

trunk/JavaScriptCore/kjs/interpreter.cpp

@@ -83 +83 @@
 
 Interpreter::Interpreter(JSGlobalObject* globalObject)
-    : m_globalExec(this, 0)
+    : m_currentExec(0)
     , m_globalObject(globalObject)
+    , m_globalExec(this, globalObject, globalObject, 0)
 {
     init();
@@ -90 +91 @@
 
 Interpreter::Interpreter()
-    : m_globalExec(this, 0)
+    : m_currentExec(0)
     , m_globalObject(new JSGlobalObject())
+    , m_globalExec(this, m_globalObject, m_globalObject, 0)
 {
     init();
@@ -104 +106 @@
     m_recursion = 0;
     m_debugger= 0;
-    m_context = 0;
 
     resetTimeoutCheck();
@@ -362 +363 @@
     else {
         // execute the code
-        Context ctx(globalObj, this, thisObj, progNode.get());
-        ExecState newExec(this, &ctx);
-        ctx.setExecState(&newExec);
+        ExecState newExec(this, globalObj, thisObj, progNode.get());
         res = progNode->execute(&newExec);
     }
@@ -538 +537 @@
 void Interpreter::mark()
 {
-    if (m_context)
-        m_context->mark();
+    if (m_currentExec)
+        m_currentExec->mark();
 
     if (m_globalExec.exception() && !m_globalExec.exception()->marked())