1 files changed, 78 insertions, 5 deletions

diff --git a/src/qml/qml/qqmlcustomparser.cpp b/src/qml/qml/qqmlcustomparser.cpp
index 19e49009ce..004d9f435a 100644
--- a/src/qml/qml/qqmlcustomparser.cpp
+++ b/src/qml/qml/qqmlcustomparser.cpp
@@ -93,7 +93,7 @@ using namespace QQmlScript;
     The \a object will be an instance of the TypeClass specified by QML_REGISTER_CUSTOM_TYPE.
 */
 
-QQmlCustomParserNode 
+QQmlCustomParserNode
 QQmlCustomParserNodePrivate::fromObject(QQmlScript::Object *root)
 {
     QQmlCustomParserNode rootNode;
@@ -111,7 +111,7 @@ QQmlCustomParserNodePrivate::fromObject(QQmlScript::Object *root)
     return rootNode;
 }
 
-QQmlCustomParserProperty 
+QQmlCustomParserProperty
 QQmlCustomParserNodePrivate::fromProperty(QQmlScript::Property *p)
 {
     QQmlCustomParserProperty prop;
@@ -256,7 +256,6 @@ void QQmlCustomParser::error(const QString& description)
 void QQmlCustomParser::error(const QQmlCustomParserProperty& prop, const QString& description)
 {
     QQmlError error;
-    QString exceptionDescription;
     error.setLine(prop.location().line);
     error.setColumn(prop.location().column);
     error.setDescription(description);
@@ -271,7 +270,6 @@ void QQmlCustomParser::error(const QQmlCustomParserProperty& prop, const QString
 void QQmlCustomParser::error(const QQmlCustomParserNode& node, const QString& description)
 {
     QQmlError error;
-    QString exceptionDescription;
     error.setLine(node.location().line);
     error.setColumn(node.location().column);
     error.setDescription(description);
@@ -279,6 +277,34 @@ void QQmlCustomParser::error(const QQmlCustomParserNode& node, const QString& de
 }
 
 /*!
+    Reports an error in parsing \a binding, with the given \a description.
+
+    An error is generated referring to the position of \a node in the source file.
+*/
+void QQmlCustomParser::error(const QV4::CompiledData::Binding *binding, const QString &description)
+{
+    QQmlError error;
+    error.setLine(binding->location.line);
+    error.setColumn(binding->location.column);
+    error.setDescription(description);
+    exceptions << error;
+}
+
+/*!
+    Reports an error in parsing \a object, with the given \a description.
+
+    An error is generated referring to the position of \a object in the source file.
+*/
+void QQmlCustomParser::error(const QV4::CompiledData::Object *object, const QString &description)
+{
+    QQmlError error;
+    error.setLine(object->location.line);
+    error.setColumn(object->location.column);
+    error.setDescription(description);
+    exceptions << error;
+}
+
+/*!
     If \a script is a simple enumeration expression (eg. Text.AlignLeft),
     returns the integer equivalent (eg. 1), and sets \a ok to true.
 
@@ -313,7 +339,54 @@ const QMetaObject *QQmlCustomParser::resolveType(const QString& name) const
 */
 QQmlBinding::Identifier QQmlCustomParser::bindingIdentifier(const QQmlScript::Variant &value, const QString& name)
 {
-    return compiler->bindingIdentifier(name, value, QQmlCompilerTypes::BindingContext(object));
+    return compiler->bindingIdentifier(value, name, this);
+}
+
+QQmlBinding::Identifier QQmlCustomParser::bindingIdentifier(const QV4::CompiledData::Binding *binding)
+{
+    return compiler->bindingIdentifier(binding, this);
+}
+
+AST::Node *QQmlCustomParser::astForBinding(int scriptIndex) const
+{
+    return compiler->astForBinding(scriptIndex);
+}
+
+struct StaticQtMetaObject : public QObject
+{
+    static const QMetaObject *get()
+        { return &staticQtMetaObject; }
+};
+
+int QQmlCustomParserCompilerBackend::evaluateEnum(const QString &scope, const QByteArray &enumValue, bool *ok) const
+{
+    Q_ASSERT_X(ok, "QQmlCompiler::evaluateEnum", "ok must not be a null pointer");
+    *ok = false;
+
+    if (scope != QLatin1String("Qt")) {
+        QQmlType *type = 0;
+        imports().resolveType(scope, &type, 0, 0, 0);
+        return type ? type->enumValue(QHashedCStringRef(enumValue.constData(), enumValue.length()), ok) : -1;
+    }
+
+    const QMetaObject *mo = StaticQtMetaObject::get();
+    int i = mo->enumeratorCount();
+    while (i--) {
+        int v = mo->enumerator(i).keyToValue(enumValue.constData(), ok);
+        if (*ok)
+            return v;
+    }
+    return -1;
+}
+
+const QMetaObject *QQmlCustomParserCompilerBackend::resolveType(const QString &name) const
+{
+    QQmlType *qmltype = 0;
+    if (!imports().resolveType(name, &qmltype, 0, 0, 0))
+        return 0;
+    if (!qmltype)
+        return 0;
+    return qmltype->metaObject();
 }
 
 QT_END_NAMESPACE