From 4f086e3aacdab13625192b31adefe2d18ced2ae6 Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Thu, 3 May 2018 21:50:18 +0200 Subject: 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 --- src/qml/jsruntime/qv4engine_p.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/qml/jsruntime/qv4engine_p.h') diff --git a/src/qml/jsruntime/qv4engine_p.h b/src/qml/jsruntime/qv4engine_p.h index 64bbd1163f..e1b1ba38ca 100644 --- a/src/qml/jsruntime/qv4engine_p.h +++ b/src/qml/jsruntime/qv4engine_p.h @@ -190,6 +190,7 @@ public: ValueTypeProto, SignalHandlerProto, IteratorProto, + ForInIteratorProto, ArrayIteratorProto, StringIteratorProto, @@ -274,6 +275,7 @@ public: Object *valueTypeWrapperPrototype() const { return reinterpret_cast(jsObjects + ValueTypeProto); } Object *signalHandlerPrototype() const { return reinterpret_cast(jsObjects + SignalHandlerProto); } Object *iteratorPrototype() const { return reinterpret_cast(jsObjects + IteratorProto); } + Object *forInIteratorPrototype() const { return reinterpret_cast(jsObjects + ForInIteratorProto); } Object *arrayIteratorPrototype() const { return reinterpret_cast(jsObjects + ArrayIteratorProto); } Object *stringIteratorPrototype() const { return reinterpret_cast(jsObjects + StringIteratorProto); } @@ -489,7 +491,7 @@ public: Heap::Object *newVariantObject(const QVariant &v); - Heap::Object *newForEachIteratorObject(Object *o); + Heap::Object *newForInIteratorObject(Object *o); Heap::Object *newArrayIteratorObject(Object *o); Heap::QmlContext *qmlContext() const; -- cgit v1.2.3