Add convenience functions for creating and inspecting error objects

Serves to simplify porting from QtScript by replacing
QScriptContext::Error and QScriptContext::throwError().

Change-Id: I4bfe404c358c50aaf3b5469a4304fec97552bf24
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>

2 files changed, 18 insertions, 0 deletions

diff --git a/src/qml/jsruntime/qv4engine.cpp b/src/qml/jsruntime/qv4engine.cpp
index 129bb20019..169ab0a4a4 100644
--- a/src/qml/jsruntime/qv4engine.cpp
+++ b/src/qml/jsruntime/qv4engine.cpp
@@ -849,6 +849,11 @@ Heap::Object *ExecutionEngine::newErrorObject(const Value &value)
     return ErrorObject::create<ErrorObject>(this, value, errorCtor());
 }
 
+Heap::Object *ExecutionEngine::newErrorObject(const QString &message)
+{
+    return ErrorObject::create<ErrorObject>(this, message);
+}
+
 Heap::Object *ExecutionEngine::newSyntaxErrorObject(const QString &message)
 {
     return ErrorObject::create<SyntaxErrorObject>(this, message);
@@ -918,6 +923,16 @@ Promise::ReactionHandler *ExecutionEngine::getPromiseReactionHandler()
     return m_reactionHandler.data();
 }
 
+Heap::Object *ExecutionEngine::newURIErrorObject(const QString &message)
+{
+    return ErrorObject::create<URIErrorObject>(this, message);
+}
+
+Heap::Object *ExecutionEngine::newEvalErrorObject(const QString &message)
+{
+    return ErrorObject::create<EvalErrorObject>(this, message);
+}
+
 Heap::Object *ExecutionEngine::newVariantObject(const QVariant &v)
 {
     return memoryManager->allocate<VariantObject>(v);
diff --git a/src/qml/jsruntime/qv4engine_p.h b/src/qml/jsruntime/qv4engine_p.h
index 928c9f4947..64c7e2f32b 100644
--- a/src/qml/jsruntime/qv4engine_p.h
+++ b/src/qml/jsruntime/qv4engine_p.h
@@ -522,13 +522,16 @@ public:
     Heap::RegExpObject *newRegExpObject(const QRegExp &re);
 
     Heap::Object *newErrorObject(const Value &value);
+    Heap::Object *newErrorObject(const QString &message);
     Heap::Object *newSyntaxErrorObject(const QString &message, const QString &fileName, int line, int column);
     Heap::Object *newSyntaxErrorObject(const QString &message);
     Heap::Object *newReferenceErrorObject(const QString &message);
     Heap::Object *newReferenceErrorObject(const QString &message, const QString &fileName, int line, int column);
     Heap::Object *newTypeErrorObject(const QString &message);
     Heap::Object *newRangeErrorObject(const QString &message);
+    Heap::Object *newURIErrorObject(const QString &message);
     Heap::Object *newURIErrorObject(const Value &message);
+    Heap::Object *newEvalErrorObject(const QString &message);
 
     Heap::PromiseObject *newPromiseObject();
     Heap::Object *newPromiseObject(const QV4::FunctionObject *thisObject, const QV4::PromiseCapability *capability);