Properly set the prototype for regexp objects

Clean up the code, so that regexp's get instantiated by
the ExecutionEngine

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

1 files changed, 8 insertions, 2 deletions

diff --git a/qmljs_engine.cpp b/qmljs_engine.cpp
index a29088f68e..6e837e21ba 100644
--- a/qmljs_engine.cpp
+++ b/qmljs_engine.cpp
@@ -357,7 +357,7 @@ FunctionObject *ExecutionEngine::newDateCtor(ExecutionContext *ctx)
     return new (memoryManager) DateCtor(ctx);
 }
 
-Object *ExecutionEngine::newRegExpObject(const QString &pattern, int flags)
+RegExpObject *ExecutionEngine::newRegExpObject(const QString &pattern, int flags)
 {
     bool global = (flags & IR::RegExp::RegExp_Global);
     QRegularExpression::PatternOptions options = 0;
@@ -366,7 +366,13 @@ Object *ExecutionEngine::newRegExpObject(const QString &pattern, int flags)
     if (flags & IR::RegExp::RegExp_Multiline)
         options |= QRegularExpression::MultilineOption;
 
-    Object *object = new (memoryManager) RegExpObject(QRegularExpression(pattern, options), global);
+    QRegularExpression re(pattern, options);
+    return newRegExpObject(re, global);
+}
+
+RegExpObject *ExecutionEngine::newRegExpObject(const QRegularExpression &re, bool global)
+{
+    RegExpObject *object = new (memoryManager) RegExpObject(re, global);
     object->prototype = regExpPrototype;
     return object;
 }