1 files changed, 20 insertions, 44 deletions

diff --git a/src/qml/jsruntime/qv4regexpobject.cpp b/src/qml/jsruntime/qv4regexpobject.cpp
index 82b0f67075..83bfe21c67 100644
--- a/src/qml/jsruntime/qv4regexpobject.cpp
+++ b/src/qml/jsruntime/qv4regexpobject.cpp
@@ -74,15 +74,15 @@ void Heap::RegExpObject::init()
     Object::init();
     Scope scope(internalClass->engine);
     Scoped<QV4::RegExpObject> o(scope, this);
-    o->d()->value = QV4::RegExp::create(scope.engine, QString(), false, false, false);
+    value.set(scope.engine, QV4::RegExp::create(scope.engine, QString(), false, false));
     o->initProperties();
 }
 
 void Heap::RegExpObject::init(QV4::RegExp *value)
 {
     Object::init();
-    this->value = value->d();
     Scope scope(internalClass->engine);
+    this->value.set(scope.engine, value->d());
     Scoped<QV4::RegExpObject> o(scope, this);
     o->initProperties();
 }
@@ -134,14 +134,15 @@ void Heap::RegExpObject::init(const QRegExp &re)
     Scope scope(internalClass->engine);
     Scoped<QV4::RegExpObject> o(scope, this);
 
-    o->d()->value = QV4::RegExp::create(scope.engine, pattern, re.caseSensitivity() == Qt::CaseInsensitive, false);
+    o->d()->value.set(scope.engine,
+                        QV4::RegExp::create(scope.engine, pattern, re.caseSensitivity() == Qt::CaseInsensitive, false));
 
     o->initProperties();
 }
 
 void RegExpObject::initProperties()
 {
-    *propertyData(Index_LastIndex) = Primitive::fromInt32(0);
+    setProperty(Index_LastIndex, Primitive::fromInt32(0));
 
     Q_ASSERT(value());
 
@@ -153,25 +154,10 @@ void RegExpObject::initProperties()
         p.replace('/', QLatin1String("\\/"));
     }
 
-    *propertyData(Index_Source) = engine()->newString(p);
-    *propertyData(Index_Global) = Primitive::fromBoolean(global());
-    *propertyData(Index_IgnoreCase) = Primitive::fromBoolean(value()->ignoreCase);
-    *propertyData(Index_Multiline) = Primitive::fromBoolean(value()->multiLine);
-}
-
-
-void RegExpObject::markObjects(Heap::Base *that, ExecutionEngine *e)
-{
-    RegExpObject::Data *re = static_cast<RegExpObject::Data *>(that);
-    if (re->value)
-        re->value->mark(e);
-    Object::markObjects(that, e);
-}
-
-Value *RegExpObject::lastIndexProperty()
-{
-    Q_ASSERT(0 == internalClass()->find(engine()->id_lastIndex()));
-    return propertyData(0);
+    setProperty(Index_Source, engine()->newString(p));
+    setProperty(Index_Global, Primitive::fromBoolean(global()));
+    setProperty(Index_IgnoreCase, Primitive::fromBoolean(value()->ignoreCase));
+    setProperty(Index_Multiline, Primitive::fromBoolean(value()->multiLine));
 }
 
 // Converts a JS RegExp to a QRegExp.
@@ -225,8 +211,8 @@ void Heap::RegExpCtor::init(QV4::ExecutionContext *scope)
 
 void Heap::RegExpCtor::clearLastMatch()
 {
-    lastMatch = Primitive::nullValue();
-    lastInput = internalClass->engine->id_empty()->d();
+    lastMatch.set(internalClass->engine, Primitive::nullValue());
+    lastInput.set(internalClass->engine, internalClass->engine->id_empty()->d());
     lastMatchStart = 0;
     lastMatchEnd = 0;
 }
@@ -300,15 +286,6 @@ void RegExpCtor::call(const Managed *that, Scope &scope, CallData *callData)
     construct(that, scope, callData);
 }
 
-void RegExpCtor::markObjects(Heap::Base *that, ExecutionEngine *e)
-{
-    RegExpCtor::Data *This = static_cast<RegExpCtor::Data *>(that);
-    This->lastMatch.mark(e);
-    if (This->lastInput)
-        This->lastInput->mark(e);
-    FunctionObject::markObjects(that, e);
-}
-
 void RegExpPrototype::init(ExecutionEngine *engine, Object *constructor)
 {
     Scope scope(engine);
@@ -358,9 +335,9 @@ void RegExpPrototype::method_exec(const BuiltinFunction *, Scope &scope, CallDat
         RETURN_UNDEFINED();
     QString s = str->toQString();
 
-    int offset = r->global() ? r->lastIndexProperty()->toInt32() : 0;
+    int offset = r->global() ? r->lastIndex() : 0;
     if (offset < 0 || offset > s.length()) {
-        *r->lastIndexProperty() = Primitive::fromInt32(0);
+        r->setLastIndex(0);
         RETURN_RESULT(Encode::null());
     }
 
@@ -371,7 +348,7 @@ void RegExpPrototype::method_exec(const BuiltinFunction *, Scope &scope, CallDat
     regExpCtor->d()->clearLastMatch();
 
     if (result == -1) {
-        *r->lastIndexProperty() = Primitive::fromInt32(0);
+        r->setLastIndex(0);
         RETURN_RESULT(Encode::null());
     }
 
@@ -387,17 +364,17 @@ void RegExpPrototype::method_exec(const BuiltinFunction *, Scope &scope, CallDat
         array->arrayPut(i, v);
     }
     array->setArrayLengthUnchecked(len);
-    *array->propertyData(Index_ArrayIndex) = Primitive::fromInt32(result);
-    *array->propertyData(Index_ArrayInput) = str;
+    array->setProperty(Index_ArrayIndex, Primitive::fromInt32(result));
+    array->setProperty(Index_ArrayInput, str);
 
     RegExpCtor::Data *dd = regExpCtor->d();
-    dd->lastMatch = array;
-    dd->lastInput = str->d();
+    dd->lastMatch.set(scope.engine, array);
+    dd->lastInput.set(scope.engine, str->d());
     dd->lastMatchStart = matchOffsets[0];
     dd->lastMatchEnd = matchOffsets[1];
 
     if (r->global())
-        *r->lastIndexProperty() = Primitive::fromInt32(matchOffsets[1]);
+        r->setLastIndex(matchOffsets[1]);
 
     scope.result = array;
 }
@@ -429,8 +406,7 @@ void RegExpPrototype::method_compile(const BuiltinFunction *, Scope &scope, Call
     scope.engine->regExpCtor()->as<FunctionObject>()->construct(scope, cData);
     Scoped<RegExpObject> re(scope, scope.result.asReturnedValue());
 
-    r->d()->value = re->value();
-    RETURN_UNDEFINED();
+    r->d()->value.set(scope.engine, re->value());
 }
 
 template <int index>