1 files changed, 33 insertions, 99 deletions

diff --git a/src/qml/qml/qqmlobjectcreator_p.h b/src/qml/qml/qqmlobjectcreator_p.h
index ec4b362491..68f2eaeab3 100644
--- a/src/qml/qml/qqmlobjectcreator_p.h
+++ b/src/qml/qml/qqmlobjectcreator_p.h
@@ -45,139 +45,73 @@
 #include <private/qqmltypenamecache_p.h>
 #include <private/qv4compileddata_p.h>
 #include <private/qqmlcompiler_p.h>
-#include <QLinkedList>
+#include <private/qqmltypecompiler_p.h>
+#include <private/qfinitestack_p.h>
 
 QT_BEGIN_NAMESPACE
 
 class QQmlAbstractBinding;
+struct QQmlTypeCompiler;
+class QQmlInstantiationInterrupt;
 
-struct QQmlCompilePass
-{
-    QQmlCompilePass(const QUrl &url, const QV4::CompiledData::QmlUnit *unit);
-    QList<QQmlError> errors;
-
-protected:
-    QString stringAt(int idx) const { return qmlUnit->header.stringAt(idx); }
-    void recordError(const QV4::CompiledData::Location &location, const QString &description);
-
-    const QUrl url;
-    const QV4::CompiledData::QmlUnit *qmlUnit;
-};
-
-class QQmlPropertyCacheCreator : public QQmlCompilePass
-{
-    Q_DECLARE_TR_FUNCTIONS(QQmlPropertyCacheCreator)
-public:
-    QQmlPropertyCacheCreator(QQmlEnginePrivate *enginePrivate, const QV4::CompiledData::QmlUnit *qmlUnit,
-                             const QUrl &url, const QQmlImports *imports,
-                             QHash<int, QQmlCompiledData::TypeReference> *resolvedTypes);
-
-    bool create(const QV4::CompiledData::Object *obj, QQmlPropertyCache **cache, QByteArray *vmeMetaObjectData);
-
-protected:
-    QQmlEnginePrivate *enginePrivate;
-    const QQmlImports *imports;
-    QHash<int, QQmlCompiledData::TypeReference> *resolvedTypes;
-};
-
-class QQmlComponentAndAliasResolver : public QQmlCompilePass
-{
-    Q_DECLARE_TR_FUNCTIONS(QQmlAnonymousComponentResolver)
-public:
-    QQmlComponentAndAliasResolver(const QUrl &url, const QV4::CompiledData::QmlUnit *qmlUnit,
-                                   const QHash<int, QQmlCompiledData::TypeReference> &resolvedTypes,
-                                   const QList<QQmlPropertyCache *> &propertyCaches,
-                                   QList<QByteArray> *vmeMetaObjectData,
-                                   QHash<int, int> *objectIndexToIdForRoot,
-                                   QHash<int, QHash<int, int> > *objectIndexToIdPerComponent);
-
-    bool resolve();
-
-    QVector<int> componentRoots;
-    QHash<int, int> objectIndexToComponentIndex;
-
-protected:
-    bool collectIdsAndAliases(int objectIndex);
-    bool resolveAliases();
-
-    bool isComponentType(int typeNameIndex) const
-    { return resolvedTypes.value(typeNameIndex).type == 0; }
-
-    int _componentIndex;
-    QHash<int, int> _idToObjectIndex;
-    QHash<int, int> *_objectIndexToIdInScope;
-    QList<int> _objectsWithAliases;
-
-    const QHash<int, QQmlCompiledData::TypeReference> resolvedTypes;
-    const QList<QQmlPropertyCache *> propertyCaches;
-    QList<QByteArray> *vmeMetaObjectData;
-    QHash<int, int> *objectIndexToIdForRoot;
-    QHash<int, QHash<int, int> > *objectIndexToIdPerComponent;
-};
-
-class QQmlPropertyValidator : public QQmlCompilePass
-{
-    Q_DECLARE_TR_FUNCTIONS(QQmlPropertyValidator)
-public:
-    QQmlPropertyValidator(const QUrl &url, const QV4::CompiledData::QmlUnit *qmlUnit,
-                          const QHash<int, QQmlCompiledData::TypeReference> &resolvedTypes,
-                          const QList<QQmlPropertyCache *> &propertyCaches,
-                          const QHash<int, QHash<int, int> > &objectIndexToIdPerComponent);
-
-    bool validate();
-
-private:
-    bool validateObject(const QV4::CompiledData::Object *obj, int objectIndex, QQmlPropertyCache *propertyCache);
-
-    bool isComponent(int objectIndex) const { return objectIndexToIdPerComponent.contains(objectIndex); }
-
-    const QHash<int, QQmlCompiledData::TypeReference> &resolvedTypes;
-    const QList<QQmlPropertyCache *> &propertyCaches;
-    const QHash<int, QHash<int, int> > objectIndexToIdPerComponent;
-};
-
-class QmlObjectCreator : public QQmlCompilePass
+class QmlObjectCreator
 {
     Q_DECLARE_TR_FUNCTIONS(QmlObjectCreator)
 public:
-    QmlObjectCreator(QQmlContextData *contextData, QQmlCompiledData *compiledData);
+    QmlObjectCreator(QQmlContextData *contextData, QQmlCompiledData *compiledData, QQmlContextData *creationContext, QQmlContextData *rootContext = 0,
+                     QFiniteStack<QQmlAbstractBinding*> *inheritedBindingStack = 0, QFiniteStack<QQmlParserStatus*> *inheritedParserStatusStack = 0);
+    ~QmlObjectCreator();
 
     QObject *create(int subComponentIndex = -1, QObject *parent = 0);
-    void finalize();
+    QQmlContextData *finalize(QQmlInstantiationInterrupt &interrupt);
 
-    QQmlComponentAttached *componentAttached;
+    QQmlComponentAttached **componentAttached;
     QList<QQmlEnginePrivate::FinalizeCallback> finalizeCallbacks;
 
+    QList<QQmlError> errors;
+
+    QQmlContextData *parentContextData() const { return parentContext; }
+
 private:
     QObject *createInstance(int index, QObject *parent = 0);
 
-    bool populateInstance(int index, QObject *instance, QQmlRefPointer<QQmlPropertyCache> cache,
-                          QObject *scopeObjectForJavaScript, QQmlPropertyData *valueTypeProperty);
+    bool populateInstance(int index, QObject *instance, QQmlRefPointer<QQmlPropertyCache> cache, QObject *bindingTarget, QQmlPropertyData *valueTypeProperty);
 
     void setupBindings();
-    bool setPropertyValue(QQmlPropertyData *property, int index, const QV4::CompiledData::Binding *binding);
+    bool setPropertyBinding(QQmlPropertyData *property, const QV4::CompiledData::Binding *binding);
     void setPropertyValue(QQmlPropertyData *property, const QV4::CompiledData::Binding *binding);
     void setupFunctions();
 
+    QString stringAt(int idx) const { return qmlUnit->header.stringAt(idx); }
+    void recordError(const QV4::CompiledData::Location &location, const QString &description);
+
+    QUrl url;
     QQmlEngine *engine;
+    const QV4::CompiledData::QmlUnit *qmlUnit;
     const QV4::CompiledData::CompilationUnit *jsUnit;
     QQmlContextData *parentContext;
+    QQmlContextData *creationContext;
     QQmlContextData *context;
-    const QHash<int, QQmlCompiledData::TypeReference> resolvedTypes;
-    const QList<QQmlPropertyCache *> propertyCaches;
-    const QList<QByteArray> vmeMetaObjectData;
+    const QHash<int, QQmlCompiledData::TypeReference*> resolvedTypes;
+    const QVector<QQmlPropertyCache *> propertyCaches;
+    const QVector<QByteArray> vmeMetaObjectData;
     QHash<int, int> objectIndexToId;
-    QLinkedList<QVector<QQmlAbstractBinding*> > allCreatedBindings;
+    QFiniteStack<QQmlAbstractBinding*> *allCreatedBindings;
+    QFiniteStack<QQmlParserStatus*> *allParserStatusCallbacks;
+    bool ownBindingAndParserStatusStacks;
     QQmlCompiledData *compiledData;
+    QQmlContextData *rootContext;
+    QQmlComponentAttached *componentAttachedImpl;
 
     QObject *_qobject;
-    QObject *_qobjectForBindings;
+    QObject *_scopeObject;
+    QObject *_bindingTarget;
+
     QQmlPropertyData *_valueTypeProperty; // belongs to _qobjectForBindings's property cache
     const QV4::CompiledData::Object *_compiledObject;
     QQmlData *_ddata;
     QQmlRefPointer<QQmlPropertyCache> _propertyCache;
     QQmlVMEMetaObject *_vmeMetaObject;
-    QVector<QQmlAbstractBinding*> _createdBindings;
     QQmlListProperty<void> _currentList;
     QV4::ExecutionContext *_qmlContext;
 };