Unify put and putIndexed

Pass an Identifier through those virtual methods to unify
the string and integer based versions.

Also add the receiver that's required in ES7

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

1 files changed, 12 insertions, 9 deletions

diff --git a/src/qml/jsruntime/qv4argumentsobject.cpp b/src/qml/jsruntime/qv4argumentsobject.cpp
index ba9bf9652d..c2a50a49ec 100644
--- a/src/qml/jsruntime/qv4argumentsobject.cpp
+++ b/src/qml/jsruntime/qv4argumentsobject.cpp
@@ -185,17 +185,20 @@ ReturnedValue ArgumentsObject::getIndexed(const Managed *m, uint index, bool *ha
     return Encode::undefined();
 }
 
-bool ArgumentsObject::putIndexed(Managed *m, uint index, const Value &value)
+bool ArgumentsObject::put(Managed *m, Identifier id, const Value &value, Value *receiver)
 {
     ArgumentsObject *args = static_cast<ArgumentsObject *>(m);
-    if (!args->fullyCreated() && index >= static_cast<uint>(args->context()->argc()))
-        args->fullyCreate();
-
-    if (args->fullyCreated())
-        return Object::putIndexed(m, index, value);
-
-    args->context()->setArg(index, value);
-    return true;
+    if (id.isArrayIndex()) {
+        uint index = id.asArrayIndex();
+        if (!args->fullyCreated() && index >= static_cast<uint>(args->context()->argc()))
+            args->fullyCreate();
+
+        if (!args->fullyCreated()) {
+            args->context()->setArg(index, value);
+            return true;
+        }
+    }
+    return Object::put(m, id, value, receiver);
 }
 
 bool ArgumentsObject::deleteProperty(Managed *m, Identifier id)