1 files changed, 90 insertions, 16 deletions

diff --git a/src/qml/compiler/qv4compileddata_p.h b/src/qml/compiler/qv4compileddata_p.h
index 90f27d5f57..94ea4bdc90 100644
--- a/src/qml/compiler/qv4compileddata_p.h
+++ b/src/qml/compiler/qv4compileddata_p.h
@@ -45,7 +45,7 @@
 #include <QVector>
 #include <QStringList>
 #include <QHash>
-#include <private/qv4value_def_p.h>
+#include <private/qv4value_p.h>
 #include <private/qv4executableallocator_p.h>
 
 QT_BEGIN_NAMESPACE
@@ -70,17 +70,32 @@ struct RegExp;
 
 struct Location
 {
-    int line;
-    int column;
+    qint32 line;
+    qint32 column;
+    inline bool operator<(const Location &other) const {
+        return line < other.line ||
+               (line == other.line && column < other.column);
+    }
+};
+
+struct TypeReference
+{
+    TypeReference(const Location &loc)
+        : location(loc)
+        , needsCreation(false)
+    {}
+    Location location; // first use
+    bool needsCreation; // whether the type needs to be creatable or not
 };
 
 // map from name index to location of first use
-struct TypeReferenceMap : QHash<int, Location>
+struct TypeReferenceMap : QHash<int, TypeReference>
 {
-    void add(int nameIndex, const Location &loc) {
-        if (contains(nameIndex))
-            return;
-        insert(nameIndex, loc);
+    TypeReference &add(int nameIndex, const Location &loc) {
+        Iterator it = find(nameIndex);
+        if (it != end())
+            return *it;
+        return *insert(nameIndex, loc);
     }
 };
 
@@ -102,7 +117,9 @@ struct Lookup
     enum Type {
         Type_Getter = 0x0,
         Type_Setter = 0x1,
-        Type_GlobalGetter = 2
+        Type_GlobalGetter = 2,
+        Type_IndexedGetter = 3,
+        Type_IndexedSetter = 4
     };
 
     quint32 type_and_flags;
@@ -188,8 +205,8 @@ struct Unit
     const RegExp *regexpAt(int index) const {
         return reinterpret_cast<const RegExp*>(reinterpret_cast<const char *>(this) + offsetToRegexpTable + index * sizeof(RegExp));
     }
-    const QV4::SafeValue *constants() const {
-        return reinterpret_cast<const QV4::SafeValue*>(reinterpret_cast<const char *>(this) + offsetToConstantTable);
+    const QV4::Value *constants() const {
+        return reinterpret_cast<const QV4::Value*>(reinterpret_cast<const char *>(this) + offsetToConstantTable);
     }
 
     const JSClassMember *jsClassAt(int idx, int *nMembers) const {
@@ -264,7 +281,7 @@ struct Function
 
 // Qml data structures
 
-struct Binding
+struct Q_QML_EXPORT Binding
 {
     quint32 propertyNameIndex;
 
@@ -280,7 +297,13 @@ struct Binding
     };
 
     enum Flags {
-        IsSignalHandlerExpression = 0x1
+        IsSignalHandlerExpression = 0x1,
+        IsSignalHandlerObject = 0x2,
+        IsOnAssignment = 0x4,
+        InitializerForReadOnlyDeclaration = 0x8,
+        IsResolvedEnum = 0x10,
+        IsListItem = 0x20,
+        IsBindingToAlias = 0x40
     };
 
     quint32 flags : 16;
@@ -294,8 +317,57 @@ struct Binding
     quint32 stringIndex; // Set for Type_String and Type_Script (the latter because of script strings)
 
     Location location;
+    Location valueLocation;
+
+    bool isValueBinding() const
+    {
+        if (type == Type_AttachedProperty
+            || type == Type_GroupProperty)
+            return false;
+        if (flags & IsSignalHandlerExpression
+            || flags & IsSignalHandlerObject)
+            return false;
+        return true;
+    }
+
+    bool isValueBindingNoAlias() const { return isValueBinding() && !(flags & IsBindingToAlias); }
+    bool isValueBindingToAlias() const { return isValueBinding() && (flags & IsBindingToAlias); }
+
+    bool isSignalHandler() const
+    {
+        if (flags & IsSignalHandlerExpression || flags & IsSignalHandlerObject) {
+            Q_ASSERT(!isValueBinding());
+            Q_ASSERT(!isAttachedProperty());
+            Q_ASSERT(!isGroupProperty());
+            return true;
+        }
+        return false;
+    }
+
+    bool isAttachedProperty() const
+    {
+        if (type == Type_AttachedProperty) {
+            Q_ASSERT(!isValueBinding());
+            Q_ASSERT(!isSignalHandler());
+            Q_ASSERT(!isGroupProperty());
+            return true;
+        }
+        return false;
+    }
+
+    bool isGroupProperty() const
+    {
+        if (type == Type_GroupProperty) {
+            Q_ASSERT(!isValueBinding());
+            Q_ASSERT(!isSignalHandler());
+            Q_ASSERT(!isAttachedProperty());
+            return true;
+        }
+        return false;
+    }
 
     QString valueAsString(const Unit *unit) const;
+    QString valueAsScriptString(const Unit *unit) const;
     double valueAsNumber() const
     {
         if (type == Type_Number)
@@ -369,7 +441,7 @@ struct Object
     // it will be the name of the attached type.
     quint32 inheritedTypeNameIndex;
     quint32 idIndex;
-    quint32 indexOfDefaultProperty;
+    qint32 indexOfDefaultProperty; // -1 means no default property declared in this object
     quint32 nFunctions;
     quint32 offsetToFunctions;
     quint32 nProperties;
@@ -491,9 +563,9 @@ struct Q_QML_EXPORT CompilationUnit
 
     QString fileName() const { return data->stringAt(data->sourceFileIndex); }
 
-    QV4::SafeString *runtimeStrings; // Array
+    QV4::StringValue *runtimeStrings; // Array
     QV4::Lookup *runtimeLookups;
-    QV4::SafeValue *runtimeRegularExpressions;
+    QV4::Value *runtimeRegularExpressions;
     QV4::InternalClass **runtimeClasses;
     QVector<QV4::Function *> runtimeFunctions;
 //    QVector<QV4::Function *> runtimeFunctionsSortedByAddress;
@@ -516,6 +588,8 @@ protected:
 
 }
 
+Q_DECLARE_TYPEINFO(QV4::CompiledData::JSClassMember, Q_PRIMITIVE_TYPE);
+
 QT_END_NAMESPACE
 
 #endif