diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2018-06-19 21:29:01 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2018-06-26 10:03:46 +0000 |
| commit | 53adb5bbc659f4ae78427b0b1925bf9732d8a6e5 (patch) | |
| tree | c45d87219ef000d09c514b3800564d896ce4b95f /src/qml/jsruntime/qv4arrayobject.cpp | |
| parent | 89f585157af905d45012dbd9c079c48491e5211d (diff) | |
Unify deleteProperty and deleteIndexedProperty vtable methods
Change-Id: I25245818c6ff2104642594476cb9684bac824f29
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/qml/jsruntime/qv4arrayobject.cpp')
| -rw-r--r-- | src/qml/jsruntime/qv4arrayobject.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/qml/jsruntime/qv4arrayobject.cpp b/src/qml/jsruntime/qv4arrayobject.cpp index a82628e249..481dfd22c6 100644 --- a/src/qml/jsruntime/qv4arrayobject.cpp +++ b/src/qml/jsruntime/qv4arrayobject.cpp @@ -450,7 +450,7 @@ ReturnedValue ArrayPrototype::method_copyWithin(const FunctionObject *b, const V instance->setIndexed(to, fromVal, QV4::Object::DoThrowOnRejection); CHECK_EXCEPTION(); } else { - bool didDelete = instance->deleteIndexedProperty(to); + bool didDelete = instance->deleteProperty(Identifier::fromArrayIndex(to)); CHECK_EXCEPTION(); if (!didDelete) { return scope.engine->throwTypeError(); @@ -624,7 +624,7 @@ ReturnedValue ArrayPrototype::method_pop(const FunctionObject *b, const Value *t ScopedValue result(scope, instance->getIndexed(len - 1)); CHECK_EXCEPTION(); - if (!instance->deleteIndexedProperty(len - 1)) + if (!instance->deleteProperty(Identifier::fromArrayIndex(len - 1))) return scope.engine->throwTypeError(); if (instance->isArrayObject()) @@ -715,12 +715,12 @@ ReturnedValue ArrayPrototype::method_reverse(const FunctionObject *b, const Valu if (hiExists) ok = instance->putIndexed(lo, hval); else - ok = instance->deleteIndexedProperty(lo); + ok = instance->deleteProperty(Identifier::fromArrayIndex(lo)); if (ok) { if (loExists) ok = instance->putIndexed(hi, lval); else - ok = instance->deleteIndexedProperty(hi); + ok = instance->deleteProperty(Identifier::fromArrayIndex(hi)); } if (!ok) return scope.engine->throwTypeError(); @@ -763,11 +763,11 @@ ReturnedValue ArrayPrototype::method_shift(const FunctionObject *b, const Value if (exists) ok = instance->putIndexed(k - 1, v); else - ok = instance->deleteIndexedProperty(k - 1); + ok = instance->deleteProperty(Identifier::fromArrayIndex(k - 1)); if (!ok) return scope.engine->throwTypeError(); } - bool ok = instance->deleteIndexedProperty(len - 1); + bool ok = instance->deleteProperty(Identifier::fromArrayIndex(len - 1)); if (!ok) return scope.engine->throwTypeError(); } @@ -891,12 +891,12 @@ ReturnedValue ArrayPrototype::method_splice(const FunctionObject *b, const Value if (exists) ok = instance->putIndexed(k + itemCount, v); else - ok = instance->deleteIndexedProperty(k + itemCount); + ok = instance->deleteProperty(Identifier::fromArrayIndex(k + itemCount)); if (!ok) return scope.engine->throwTypeError(); } for (uint k = len; k > len - deleteCount + itemCount; --k) { - if (!instance->deleteIndexedProperty(k - 1)) + if (!instance->deleteProperty(Identifier::fromArrayIndex(k - 1))) return scope.engine->throwTypeError(); } } else if (itemCount > deleteCount) { @@ -909,7 +909,7 @@ ReturnedValue ArrayPrototype::method_splice(const FunctionObject *b, const Value if (exists) ok = instance->putIndexed(k + itemCount - 1, v); else - ok = instance->deleteIndexedProperty(k + itemCount - 1); + ok = instance->deleteProperty(Identifier::fromArrayIndex(k + itemCount - 1)); if (!ok) return scope.engine->throwTypeError(); --k; @@ -949,7 +949,7 @@ ReturnedValue ArrayPrototype::method_unshift(const FunctionObject *b, const Valu if (exists) ok = instance->putIndexed(k + argc - 1, v); else - ok = instance->deleteIndexedProperty(k + argc - 1); + ok = instance->deleteProperty(Identifier::fromArrayIndex(k + argc - 1)); if (!ok) return scope.engine->throwTypeError(); } |