Rename ForeachIterator to ForInIterator

As it's being used for for(... in ...) loops. Also add a ES6
compatible iterator interface to it, so that we can unify
the handling of for-in and for-of.

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

1 files changed, 14 insertions, 5 deletions

diff --git a/src/qml/jsruntime/qv4objectiterator_p.h b/src/qml/jsruntime/qv4objectiterator_p.h
index 744d16301a..2b2410bf1f 100644
--- a/src/qml/jsruntime/qv4objectiterator_p.h
+++ b/src/qml/jsruntime/qv4objectiterator_p.h
@@ -111,7 +111,7 @@ private:
 };
 
 namespace Heap {
-struct ForEachIteratorObject : Object {
+struct ForInIteratorObject : Object {
     void init(QV4::Object *o);
     ObjectIterator &it() { return *reinterpret_cast<ObjectIterator*>(&itData); }
     Value workArea[2];
@@ -123,15 +123,24 @@ private:
 
 }
 
-struct ForEachIteratorObject: Object {
-    V4_OBJECT2(ForEachIteratorObject, Object)
+struct ForInIteratorPrototype : Object
+{
+    V4_PROTOTYPE(iteratorPrototype)
+    void init(ExecutionEngine *engine);
+
+    static ReturnedValue method_next(const FunctionObject *b, const Value *thisObject, const Value *argv, int argc);
+};
+
+struct ForInIteratorObject: Object {
+    V4_OBJECT2(ForInIteratorObject, Object)
     Q_MANAGED_TYPE(ForeachIteratorObject)
+    V4_PROTOTYPE(forInIteratorPrototype)
 
-    ReturnedValue nextPropertyName() { return d()->it().nextPropertyNameAsString(); }
+    ReturnedValue nextPropertyName() const { return d()->it().nextPropertyNameAsString(); }
 };
 
 inline
-void Heap::ForEachIteratorObject::init(QV4::Object *o)
+void Heap::ForInIteratorObject::init(QV4::Object *o)
 {
     Object::init();
     it() = ObjectIterator(internalClass->engine, workArea, workArea + 1, o,