Changeset 9929 in webkit for trunk/JavaScriptCore/kjs/debugger.cpp

Timestamp:

Jul 27, 2005, 4:10:48 PM (20 years ago)

Author:

mjs

Message:

Changes by Michael Kahl, reviewed by me.

• fixed <rdar://problem/4194278> Need better debugging support in JavaScriptCore

• JavaScriptCore.xcodeproj/project.pbxproj:
• kjs/debugger.cpp: (KJS::AttachedInterpreter::AttachedInterpreter): (KJS::AttachedInterpreter::~AttachedInterpreter): (Debugger::~Debugger): (Debugger::attach): (Debugger::detach): (Debugger::sourceParsed):
• kjs/debugger.h:
• kjs/function.cpp: (KJS::FunctionImp::call): (KJS::GlobalFuncImp::call):
• kjs/function_object.cpp: (FunctionObjectImp::construct):
• kjs/grammar.y:
• kjs/internal.cpp: (Parser::parse): (InterpreterImp::evaluate):
• kjs/internal.h: (KJS::InterpreterImp::setDebugger):
• kjs/interpreter.cpp:
• kjs/interpreter.h: (KJS::Interpreter::imp):
• kjs/nodes.cpp:

File:

• trunk/JavaScriptCore/kjs/debugger.cpp (modified) (4 diffs)

trunk/JavaScriptCore/kjs/debugger.cpp

@@ -37 +37 @@
   {
   public:
-    AttachedInterpreter(Interpreter *i) : interp(i) {}
+    AttachedInterpreter(Interpreter *i, AttachedInterpreter *ai) : interp(i), next(ai) { ++Debugger::debuggersPresent; }
+    ~AttachedInterpreter() { --Debugger::debuggersPresent; }
     Interpreter *interp;
     AttachedInterpreter *next;
@@ -43 +44 @@
 
 }
+
+int Debugger::debuggersPresent = 0;
 
 Debugger::Debugger()
@@ -51 +54 @@
 Debugger::~Debugger()
 {
-  // detach from all interpreters
-  while (rep->interps)
-    detach(rep->interps->interp);
-
+  detach(0);
   delete rep;
 }
@@ -60 +60 @@
 void Debugger::attach(Interpreter *interp)
 {
-  if (interp->imp()->debugger() != this)
-    interp->imp()->setDebugger(this);
-
-  // add to the list of attached interpreters
-  if (!rep->interps)
-    rep->interps = new AttachedInterpreter(interp);
-  else {
-    AttachedInterpreter *ai = rep->interps;
-    while (ai->next)
-      ai = ai->next;
-    ai->next = new AttachedInterpreter(interp);;
-  }
+  Debugger *other = interp->imp()->debugger();
+  if (other == this)
+    return;
+  if (other)
+    other->detach(interp);
+  interp->imp()->setDebugger(this);
+  rep->interps = new AttachedInterpreter(interp, rep->interps);
 }
 
 void Debugger::detach(Interpreter *interp)
 {
-  if (interp->imp()->debugger() == this)
-    interp->imp()->setDebugger(this);
+  if (interp && interp->imp()->debugger() == this)
+    interp->imp()->setDebugger(0);
 
-  // remove from the list of attached interpreters
-  if (rep->interps->interp == interp) {
-    AttachedInterpreter *old = rep->interps;
-    rep->interps = rep->interps->next;
-    delete old;
-  }
-
-  AttachedInterpreter *ai = rep->interps;
-  while (ai->next && ai->next->interp != interp)
-    ai = ai->next;
-  if (ai->next) {
-    AttachedInterpreter *old = ai->next;
-    ai->next = ai->next->next;
-    delete old;
+  // iterate the addresses where AttachedInterpreter pointers are stored
+  // so we can unlink items from the list
+  AttachedInterpreter **p = &rep->interps;
+  AttachedInterpreter *q;
+  while ((q = *p)) {
+    if (!interp || q->interp == interp) {
+      *p = q->next;
+      delete q;
+    } else {
+      p = &q->next;
+    }
   }
 }
 
-bool Debugger::sourceParsed(ExecState */*exec*/, int /*sourceId*/,
-                            const UString &/*source*/, int /*errorLine*/)
+bool Debugger::sourceParsed(ExecState */*exec*/, int /*sourceId*/, const UString &/*sourceURL*/, 
+                           const UString &/*source*/, int /*errorLine*/)
 {
   return true;