[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdelibs/khtml/ecma
From:       David Faure <faure () kde ! org>
Date:       2004-10-29 13:55:25
Message-ID: 20041029135525.37B4016BB9 () office ! kde ! org
[Download RAW message or body]

CVS commit by faure: 

Don't return an invalid Value if an exception was thrown, return Undefined.
CCMAIL: Harri Porten <porten@kde.org>, Pascal Léurneau <pletourn@globetrotter.net>


  M +9 -9      kjs_binding.cpp   1.65


--- kdelibs/khtml/ecma/kjs_binding.cpp  #1.64:1.65
@@ -88,26 +88,22 @@ UString DOMObject::toString(ExecState *)
 Value DOMFunction::get(ExecState *exec, const Identifier &propertyName) const
 {
-  Value result;
   try {
-    result = tryGet(exec, propertyName);
+    return tryGet(exec, propertyName);
   }
   catch (DOM::DOMException e) {
-    result = Undefined();
     Object err = Error::create(exec, GeneralError, QString("DOM exception %1").arg(e.code).local8Bit());
     exec->setException(err);
+    return Undefined();
   }
   catch (...) {
     kdError(6070) << "Unknown exception in DOMFunction::get()" << endl;
-    result = String("Unknown exception");
+    return String("Unknown exception");
   }
-
-  return result;
 }
 
 Value DOMFunction::call(ExecState *exec, Object &thisObj, const List &args)
 {
-  Value val;
   try {
-    val = tryCall(exec, thisObj, args);
+    return tryCall(exec, thisObj, args);
   }
   // pity there's no way to distinguish between these in JS code
@@ -118,4 +114,5 @@ Value DOMFunction::call(ExecState *exec,
     err.put(exec, "code", Number(e.code));
     exec->setException(err);
+    return Undefined();
   }
   catch (DOM::RangeException e) {
@@ -123,4 +120,5 @@ Value DOMFunction::call(ExecState *exec,
     err.put(exec, "code", Number(e.code));
     exec->setException(err);
+    return Undefined();
   }
   catch (DOM::CSSException e) {
@@ -128,4 +126,5 @@ Value DOMFunction::call(ExecState *exec,
     err.put(exec, "code", Number(e.code));
     exec->setException(err);
+    return Undefined();
   }
   catch (DOM::EventException e) {
@@ -133,4 +132,5 @@ Value DOMFunction::call(ExecState *exec,
     err.put(exec, "code", Number(e.code));
     exec->setException(err);
+    return Undefined();
   }
   catch (...) {
@@ -138,6 +138,6 @@ Value DOMFunction::call(ExecState *exec,
     Object err = Error::create(exec, GeneralError, "Unknown exception");
     exec->setException(err);
+    return Undefined();
   }
-  return val;
 }
 


[prev in list] [next in list] [prev in thread] [next in thread]