Unify the get and getIndexed vtable functions of QV4::Object

This finalizes the refactoring of Object's vtable API. Also added
the receiver argument to the method as required by the ES7 spec.

Change-Id: I36f9989211c47458788fe9f7e929862bcfe7b845
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>

1 files changed, 7 insertions, 3 deletions

diff --git a/src/qml/jsruntime/qv4typedarray.cpp b/src/qml/jsruntime/qv4typedarray.cpp
index bb679f7ea0..ec319524a2 100644
--- a/src/qml/jsruntime/qv4typedarray.cpp
+++ b/src/qml/jsruntime/qv4typedarray.cpp
@@ -336,7 +336,7 @@ ReturnedValue TypedArrayCtor::callAsConstructor(const FunctionObject *f, const V
     char *b = newBuffer->d()->data->data();
     ScopedValue val(scope);
     while (idx < l) {
-        val = o->getIndexed(idx);
+        val = o->get(idx);
         array->d()->type->write(scope.engine, b, 0, val);
         if (scope.engine->hasException)
             return Encode::undefined();
@@ -367,8 +367,12 @@ Heap::TypedArray *TypedArray::create(ExecutionEngine *e, Heap::TypedArray::Type
     return e->memoryManager->allocObject<TypedArray>(ic->d(), t);
 }
 
-ReturnedValue TypedArray::getIndexed(const Managed *m, uint index, bool *hasProperty)
+ReturnedValue TypedArray::get(const Managed *m, Identifier id, const Value *receiver, bool *hasProperty)
 {
+    if (!id.isArrayIndex())
+        return Object::get(m, id, receiver, hasProperty);
+
+    uint index = id.asArrayIndex();
     Scope scope(static_cast<const Object *>(m)->engine());
     Scoped<TypedArray> a(scope, static_cast<const TypedArray *>(m));
 
@@ -535,7 +539,7 @@ ReturnedValue IntrinsicTypedArrayPrototype::method_set(const FunctionObject *b,
         char *b = buffer->d()->data->data() + a->d()->byteOffset + offset*elementSize;
         ScopedValue val(scope);
         while (idx < l) {
-            val = o->getIndexed(idx);
+            val = o->get(idx);
             a->d()->type->write(scope.engine, b, 0, val);
             if (scope.engine->hasException)
                 RETURN_UNDEFINED();