Changeset 9767 in webkit for trunk/JavaScriptCore/kjs/function.cpp

Timestamp:

Jul 14, 2005, 11:13:50 AM (20 years ago)

Author:

ggaren

Message:

-fixed ​http://bugzilla.opendarwin.org/show_bug.cgi?id=3970
throw statements fail inside eval statements

Reviewed by mjs.

• kjs/function.cpp: (KJS::GlobalFuncImp::call): Big change since I fixed the tabbing. The important part is: if (c.complType() == Throw) exec->setException(c.value());

• kjs/nodes.cpp: (ThrowNode::execute): removed duplicate KJS_CHECKEXCEPTION (TryNode::execute): try now clears the exception state before the finally block executes, and checks the state after the block executes, so that exceptions in finally code get caught.

• tests/mozilla/expected.html:

File:

• trunk/JavaScriptCore/kjs/function.cpp (modified) (1 diff)

trunk/JavaScriptCore/kjs/function.cpp

@@ -773 +773 @@
 
   switch (id) {
-  case Eval: { // eval()
-    Value x = args[0];
-    if (x.type() != StringType)
-      return x;
-    else {
-      UString s = x.toString(exec);
-
-      int sid;
-      int errLine;
-      UString errMsg;
-      ProgramNode *progNode = Parser::parse(UString(), 0, s.data(),s.size(),&sid,&errLine,&errMsg);
-
-      // no program node means a syntax occurred
-      if (!progNode) {
-        Object err = Error::create(exec,SyntaxError,errMsg.ascii(),errLine);
-        err.put(exec,"sid",Number(sid));
-        exec->setException(err);
-        return err;
+    case Eval: { // eval()
+      Value x = args[0];
+      if (x.type() != StringType)
+        return x;
+      else {
+        UString s = x.toString(exec);
+        
+        int sid;
+        int errLine;
+        UString errMsg;
+        ProgramNode *progNode = Parser::parse(UString(), 0, s.data(),s.size(),&sid,&errLine,&errMsg);
+        
+        // no program node means a syntax occurred
+        if (!progNode) {
+          Object err = Error::create(exec,SyntaxError,errMsg.ascii(),errLine);
+          err.put(exec,"sid",Number(sid));
+          exec->setException(err);
+          return err;
+        }
+        
+        progNode->ref();
+        
+        // enter a new execution context
+        Object thisVal(Object::dynamicCast(exec->context().thisValue()));
+        ContextImp ctx(exec->dynamicInterpreter()->globalObject(),
+                       exec->dynamicInterpreter()->imp(),
+                       thisVal,
+                       EvalCode,
+                       exec->context().imp());
+        
+        ExecState newExec(exec->dynamicInterpreter(), &ctx);
+        newExec.setException(exec->exception()); // could be null
+        
+        // execute the code
+        progNode->processVarDecls(&newExec);
+        Completion c = progNode->execute(&newExec);
+
+        // if an exception occured, propogate it back to the previous execution object
+        if (newExec.hadException())
+          exec->setException(newExec.exception());
+
+        res = Undefined();
+        if (c.complType() == Throw)
+          exec->setException(c.value());
+        else if (c.isValueCompletion())
+            res = c.value();
+
+        if ( progNode->deref() )
+          delete progNode;
       }
-
-      progNode->ref();
-
-      // enter a new execution context
-      Object thisVal(Object::dynamicCast(exec->context().thisValue()));
-      ContextImp ctx(exec->dynamicInterpreter()->globalObject(),
-                     exec->dynamicInterpreter()->imp(),
-                     thisVal,
-                     EvalCode,
-                     exec->context().imp());
-
-      ExecState newExec(exec->dynamicInterpreter(), &ctx);
-      newExec.setException(exec->exception()); // could be null
-
-      // execute the code
-      progNode->processVarDecls(&newExec);
-      Completion c = progNode->execute(&newExec);
-
-      // if an exception occured, propogate it back to the previous execution object
-      if (newExec.hadException())
-        exec->setException(newExec.exception());
-
-      if ( progNode->deref() )
-          delete progNode;
-      if (c.complType() == ReturnValue)
-          return c.value();
-      // ### setException() on throw?
-      else if (c.complType() == Normal) {
-          if (c.isValueCompletion())
-              return c.value();
-          else
-              return Undefined();
-      } else {
-          return Undefined();
-      }
-    }
-    break;
-  }
+      break;
+    }
   case ParseInt:
     res = Number(parseInt(args[0].toString(exec), args[1].toInt32(exec)));