* Inline / duplicate exception checking per CR feedback * Coding standards

humbletim committed 9 years ago

Commit 3ad3fd41 parent 0b73cef3 files · +24 −76Browse files

Showing the changes to libraries/script-engine/src/ScriptEngine.cpp (1 of 3 files). Show all

Unified · Split

libraries/script-engine/src/ScriptEngine.cpp+22−23

     QScriptValue result;
     {
-        // catch any exceptions throw by nested operations
-        ExceptionEmitter tryCatch(this, __FUNCTION__);
         result = BaseScriptEngine::evaluate(program);
+        if (!isEvaluating() && hasUncaughtException()) {
+            emit unhandledException(cloneUncaughtException(__FUNCTION__));
+            clearExceptions();
+        }
     }
     return result;
 }
     emit runningStateChanged();
     {
-        // catch any exceptions throw by nested operations
-        ExceptionEmitter tryCatch(this, __FUNCTION__);
         evaluate(_scriptContents, _fileNameString);
+        if (!isEvaluating() && hasUncaughtException()) {
+            emit unhandledException(cloneUncaughtException(__FUNCTION__));
+            clearExceptions();
+        }
     }
 #ifdef _WIN32
     // VS13 does not sleep_until unless it uses the system_clock, see:
                         evaluate(contents, url.toString());
                     };
-                    ExceptionEmitter tryCatch(this, "include");
                     doWithEnvironment(capturedEntityIdentifier, capturedSandboxURL, operation);
-                    if (tryCatch.hasPending()) {
+                    if (hasUncaughtException()) {
-                        // match previous include behavior where possible by logging, not propagating, exceptions.
+                        emit unhandledException(cloneUncaughtException(__FUNCTION__));
-                        auto err = tryCatch.pending();
+                        clearExceptions();
-                        emit unhandledException(err);
-                        // FIXME: to be revisited with next PR 21114-part3 for compat with require/module
-                        //if (tryCatch.wouldEmit()) {
-                        tryCatch.consume();
-                        //}
                     }
                 } else {
                     scriptWarningMessage("Script.include() skipping evaluation of previously included url:" + url.toString());
         for (int i=0; i < RETRY_ATTEMPT_BATCH && !_pendingLoadEntities.isEmpty(); i++) {
             auto retry = _pendingLoadEntities.takeFirst();
             qCDebug(scriptengine) << "deferLoadEntityScript.retry[" << i << "]:" << retry.entityID << retry.entityScript;
-            if(!_entityScripts.contains(retry.entityID)) {
+            if (!_entityScripts.contains(retry.entityID)) {
                 qCDebug(scriptengine) << "deferLoadEntityScript.retry -- entity details gone (entity deleted?)";
             } else {
                 auto details = _entityScripts[retry.entityID];
     sandbox.setProcessEventsInterval(SANDBOX_TIMEOUT);
     QScriptValue testConstructor, exception;
     {
-        ExceptionEmitter tryCatch(&sandbox, QString("(preflight %1)").arg(entityID.toString()));
         QTimer timeout;
         timeout.setSingleShot(true);
         timeout.start(SANDBOX_TIMEOUT);
         testConstructor = sandbox.evaluate(program);
-        if (tryCatch.hasPending()) {
+        if (sandbox.hasUncaughtException()) {
-            exception = tryCatch.consume();
+            exception = sandbox.cloneUncaughtException(QString("(preflight %1)").arg(entityID.toString()));
+            sandbox.clearExceptions();
         } else if (testConstructor.isError()) {
             exception = testConstructor;
         }
     QScriptValue entityScriptConstructor, entityScriptObject;
     QUrl sandboxURL = currentSandboxURL.isEmpty() ? scriptOrURL : currentSandboxURL;
     auto initialization = [&]{
-        ExceptionEmitter tryCatch(this, "(construct " + entityID.toString() + ")");
         entityScriptConstructor = evaluate(contents, fileName);
         entityScriptObject = entityScriptConstructor.construct();
-        if (tryCatch.hasPending()) {
+        if (hasUncaughtException()) {
-            entityScriptObject = tryCatch.consume();
+            entityScriptObject = cloneUncaughtException("(construct " + entityID.toString() + ")");
+            clearExceptions();
         }
     };
     currentEntityIdentifier = entityID;
     currentSandboxURL = sandboxURL;
-    ExceptionEmitter tryCatcher(this, !entityID.isNull() ? entityID.toString() : __FUNCTION__);
 #if DEBUG_CURRENT_ENTITY
     QScriptValue oldData = this->globalObject().property("debugEntityID");
     this->globalObject().setProperty("debugEntityID", entityID.toScriptValue(this)); // Make the entityID available to javascript as a global.
 #else
     operation();
 #endif
+    if (!isEvaluating() && hasUncaughtException()) {
+        emit unhandledException(cloneUncaughtException(!entityID.isNull() ? entityID.toString() : __FUNCTION__));
+        clearExceptions();
+    }
     currentEntityIdentifier = oldIdentifier;
     currentSandboxURL = oldSandboxURL;
 }