Avoid side effects when en exception has been thrown.

We don't want to check for exceptions after every single
line on our runtime methods. A better way to handle this
is to add the check in all methods that have direct side
effects (as e.g. writing to a property of the JS stack).

We also need to return whereever we throw an exception.
To simplify the code, ExecutionContext::throwXxx methods now
return a ReturnedValue (always undefined) for convenience.

Change-Id: Ide6c804f819c731a3f14c6c43121d08029c9fb90
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>

1 files changed, 11 insertions, 11 deletions

diff --git a/src/qml/jsruntime/qv4context_p.h b/src/qml/jsruntime/qv4context_p.h
index e85350451b..bd779f23f4 100644
--- a/src/qml/jsruntime/qv4context_p.h
+++ b/src/qml/jsruntime/qv4context_p.h
@@ -127,17 +127,17 @@ struct Q_QML_EXPORT ExecutionContext
 
     void createMutableBinding(const StringRef name, bool deletable);
 
-    void throwError(const QV4::ValueRef value);
-    void throwError(const QString &message);
-    void throwSyntaxError(const QString &message);
-    void throwSyntaxError(const QString &message, const QString &fileName, int line, int column);
-    void throwTypeError();
-    void throwTypeError(const QString &message);
-    void throwReferenceError(const ValueRef value);
-    void throwReferenceError(const QString &value, const QString &fileName, int line, int column);
-    void throwRangeError(const ValueRef value);
-    void throwURIError(const ValueRef msg);
-    void throwUnimplemented(const QString &message);
+    ReturnedValue throwError(const QV4::ValueRef value);
+    ReturnedValue throwError(const QString &message);
+    ReturnedValue throwSyntaxError(const QString &message);
+    ReturnedValue throwSyntaxError(const QString &message, const QString &fileName, int line, int column);
+    ReturnedValue throwTypeError();
+    ReturnedValue throwTypeError(const QString &message);
+    ReturnedValue throwReferenceError(const ValueRef value);
+    ReturnedValue throwReferenceError(const QString &value, const QString &fileName, int line, int column);
+    ReturnedValue throwRangeError(const ValueRef value);
+    ReturnedValue throwURIError(const ValueRef msg);
+    ReturnedValue throwUnimplemented(const QString &message);
 
     void setProperty(const StringRef name, const ValueRef value);
     ReturnedValue getProperty(const StringRef name);