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

Timestamp:

Dec 20, 2007, 12:33:42 PM (17 years ago)

Author:

Darin Adler

Message:

• roll out that last change -- it was causing test failures; I'll check it back in after fixing them

File:

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

trunk/JavaScriptCore/kjs/function.cpp

@@ -71 +71 @@
 JSValue* FunctionImp::callAsFunction(ExecState* exec, JSObject* thisObj, const List& args)
 {
-    ExecState newExec(exec->dynamicGlobalObject(), thisObj, body.get(), FunctionCode, exec, exec->dynamicGlobalObject()->currentExec(), this, &args);
-    JSValue* result = body->execute(&newExec);
-    if (newExec.completionType() == Throw) {
-        exec->setException(result);
-        return result;
-    }
-    if (newExec.completionType() == ReturnValue)
-        return result;
+  // enter a new execution context
+  ExecState newExec(exec->dynamicGlobalObject(), thisObj, body.get(), FunctionCode, exec, exec->dynamicGlobalObject()->currentExec(), this, &args);
+  if (exec->hadException())
+    newExec.setException(exec->exception());
+
+  Completion comp = execute(&newExec);
+
+  // if an exception occured, propogate it back to the previous execution object
+  if (newExec.hadException())
+    comp = Completion(Throw, newExec.exception());
+
+  if (comp.complType() == Throw) {
+    exec->setException(comp.value());
+    return comp.value();
+  }
+  else if (comp.complType() == ReturnValue)
+    return comp.value();
+  else
     return jsUndefined();
 }
@@ -203 +213 @@
   else
     return obj;
+}
+
+Completion FunctionImp::execute(ExecState* exec)
+{
+  Completion result = body->execute(exec);
+
+  if (result.complType() == Throw || result.complType() == ReturnValue)
+      return result;
+  return Completion(Normal, jsUndefined()); // TODO: or ReturnValue ?
 }
 
@@ -700 +719 @@
         JSObject* thisVal = static_cast<JSObject*>(exec->thisValue());
         ExecState newExec(globalObject, thisVal, evalNode.get(), EvalCode, exec, globalObject->currentExec());
+        if (exec->hadException())
+            newExec.setException(exec->exception());
           
         if (switchGlobal) {
@@ -705 +726 @@
             newExec.setVariableObject(static_cast<JSGlobalObject*>(thisObj));
         }
-        JSValue* value = evalNode->execute(&newExec);
+        
+        Completion c = evalNode->execute(&newExec);
+          
         if (switchGlobal)
             newExec.popScope();
 
-        if (exec->completionType() == Throw) {
-            exec->setException(value);
-            return value;
-        }
-        return value ? value : jsUndefined();
+        // if an exception occured, propogate it back to the previous execution object
+        if (newExec.hadException())
+          exec->setException(newExec.exception());
+
+        res = jsUndefined();
+        if (c.complType() == Throw)
+          exec->setException(c.value());
+        else if (c.isValueCompletion())
+            res = c.value();
       }
+      break;
     }
   case ParseInt: