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

trunk/JavaScriptCore/kjs/function.cpp

@@ -78 +78 @@
   Object &globalObj = exec->dynamicInterpreter()->globalObject();
 
+  // enter a new execution context
+  ContextImp ctx(globalObj, exec->dynamicInterpreter()->imp(), thisObj, codeType(),
+                 exec->context().imp(), this, &args);
+  ExecState newExec(exec->dynamicInterpreter(), &ctx);
+  newExec.setException(exec->exception()); // could be null
+
+  // assign user supplied arguments to parameters
+  processParameters(&newExec, args);
+  // add variable declarations (initialized to undefined)
+  processVarDecls(&newExec);
+
   Debugger *dbg = exec->dynamicInterpreter()->imp()->debugger();
   int sid = -1;
@@ -88 +99 @@
 
     Object func(this);
-    bool cont = dbg->callEvent(exec,sid,lineno,func,args);
+    bool cont = dbg->callEvent(&newExec,sid,lineno,func,args);
     if (!cont) {
       dbg->imp()->abort();
@@ -95 +106 @@
   }
 
-  // enter a new execution context
-  ContextImp ctx(globalObj, exec->dynamicInterpreter()->imp(), thisObj, codeType(),
-                 exec->context().imp(), this, &args);
-  ExecState newExec(exec->dynamicInterpreter(), &ctx);
-  newExec.setException(exec->exception()); // could be null
-
-  // assign user supplied arguments to parameters
-  processParameters(&newExec, args);
-  // add variable declarations (initialized to undefined)
-  processVarDecls(&newExec);
-
   Completion comp = execute(&newExec);
 
   // if an exception occured, propogate it back to the previous execution object
   if (newExec.hadException())
-    exec->setException(newExec.exception());
+    comp = Completion(Throw, newExec.exception());
 
 #ifdef KJS_VERBOSE
@@ -122 +122 @@
 
   if (dbg) {
+    if (inherits(&DeclaredFunctionImp::info))
+      lineno = static_cast<DeclaredFunctionImp*>(this)->body->lastLine();
+
+    if (comp.complType() == Throw)
+        newExec.setException(comp.value());
+
     Object func(this);
-    int cont = dbg->returnEvent(exec,sid,lineno,func);
+    int cont = dbg->returnEvent(&newExec,sid,lineno,func);
     if (!cont) {
       dbg->imp()->abort();
@@ -790 +796 @@
         UString errMsg;
         ProgramNode *progNode = Parser::parse(UString(), 0, s.data(),s.size(),&sid,&errLine,&errMsg);
-        
+
+        Debugger *dbg = exec->dynamicInterpreter()->imp()->debugger();
+        if (dbg) {
+          bool cont = dbg->sourceParsed(exec, sid, UString(), s, errLine);
+          if (!cont)
+            return Undefined();
+        }
+
         // no program node means a syntax occurred
         if (!progNode) {