Introduced a new parser for qmldir files.

4 files changed, 352 insertions, 20 deletions

diff --git a/src/declarative/qml/qml.pri b/src/declarative/qml/qml.pri
index a8df61e..5e0c3e0 100644
--- a/src/declarative/qml/qml.pri
+++ b/src/declarative/qml/qml.pri
@@ -51,7 +51,8 @@ SOURCES += \
     $$PWD/qmllistscriptclass.cpp \
     $$PWD/qmlworkerscript.cpp \
     $$PWD/qmlimageprovider.cpp \
-    $$PWD/qmlnetworkaccessmanagerfactory.cpp
+    $$PWD/qmlnetworkaccessmanagerfactory.cpp \
+    $$PWD/qmldirparser.cpp
 HEADERS += \
     $$PWD/qmlparser_p.h \
     $$PWD/qmlglobal_p.h \
@@ -119,7 +120,8 @@ HEADERS += \
     $$PWD/qmlscriptclass_p.h \
     $$PWD/qmlguard_p.h \
     $$PWD/qmlimageprovider.h \
-    $$PWD/qmlnetworkaccessmanagerfactory.h
+    $$PWD/qmlnetworkaccessmanagerfactory.h \
+    $$PWD/qmldirparser_p.h
 QT += sql
 include(parser/parser.pri)
 include(rewriter/rewriter.pri)
diff --git a/src/declarative/qml/qmldirparser.cpp b/src/declarative/qml/qmldirparser.cpp
new file mode 100644
index 0000000..c7de233
--- /dev/null
+++ b/src/declarative/qml/qmldirparser.cpp
@@ -0,0 +1,209 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qmldirparser_p.h"
+#include "qmlerror.h"
+
+#include <QtCore/QTextStream>
+#include <QtCore/QtDebug>
+
+QT_BEGIN_NAMESPACE
+
+QmlDirParser::QmlDirParser()
+{
+}
+
+QmlDirParser::~QmlDirParser()
+{
+}
+
+QUrl QmlDirParser::url() const
+{
+    return _url;
+}
+
+void QmlDirParser::setUrl(const QUrl &url)
+{
+    _url = url;
+}
+
+QString QmlDirParser::source() const
+{
+    return _source;
+}
+
+void QmlDirParser::setSource(const QString &source)
+{
+    _source = source;
+}
+
+bool QmlDirParser::parse()
+{
+    _errors.clear();
+    _plugins.clear();
+    _components.clear();
+
+    QTextStream stream(&_source);
+    int lineNumber = 0;
+
+    forever {
+        ++lineNumber;
+
+        const QString line = stream.readLine();
+        if (line.isNull())
+            break;
+
+        QString sections[3];
+        int sectionCount = 0;
+
+        int index = 0;
+        const int length = line.length();
+
+        while (index != length) {
+            const QChar ch = line.at(index);
+
+            if (ch.isSpace()) {
+                do { ++index; }
+                while (index != length && line.at(index).isSpace());
+
+            } else if (ch == QLatin1Char('#')) {
+                // recognized a comment
+                break;
+
+            } else {
+                const int start = index;
+
+                do { ++index; }
+                while (index != length && !line.at(index).isSpace());
+
+                const QString lexeme = line.mid(start, index - start);
+
+                if (sectionCount >= 3) {
+                    reportError(lineNumber, start, QLatin1String("unexpected token"));
+
+                } else {
+                    sections[sectionCount++] = lexeme;
+                }
+            }
+        }
+
+        if (sectionCount == 0) {
+            continue; // no sections, no party.
+
+        } else if (sections[0] == QLatin1String("plugin")) {
+            if (sectionCount < 2) {
+                reportError(lineNumber, -1,
+                            QString::fromUtf8("plugin directive requires 2 arguments, but %1 were provided").arg(sectionCount + 1));
+
+                continue;
+            }
+
+            const Plugin entry(sections[1], sections[2]);
+
+            _plugins.append(entry);
+
+        } else if (sectionCount == 3) {
+            const QString &version = sections[1];
+            const int dotIndex = version.indexOf(QLatin1Char('.'));
+
+            if (dotIndex == -1) {
+                qWarning() << "expected '.'"; // ### use reportError
+
+            } else if (version.indexOf(QLatin1Char('.'), dotIndex + 1) != -1) {
+                qWarning() << "unexpected '.'"; // ### use reportError
+
+            } else {
+                bool validVersionNumber = false;
+                const int majorVersion = version.left(dotIndex).toInt(&validVersionNumber);
+
+                if (validVersionNumber) {
+                    const int minorVersion = version.mid(dotIndex + 1).toInt(&validVersionNumber);
+
+                    if (validVersionNumber) {
+                        const Component entry(sections[0], sections[2], majorVersion, minorVersion);
+
+                        _components.append(entry);
+                    }
+                }
+            }
+        } else {
+             // ### use reportError
+            qWarning() << "a component declaration requires 3 arguments, but" << (sectionCount + 1) << "were provided";
+        }
+    }
+
+    return hasError();
+}
+
+void QmlDirParser::reportError(int line, int column, const QString &description)
+{
+    QmlError error;
+    error.setUrl(_url);
+    error.setLine(line);
+    error.setColumn(column);
+    error.setDescription(description);
+    _errors.append(error);
+}
+
+bool QmlDirParser::hasError() const
+{
+    if (! _errors.isEmpty())
+        return true;
+
+    return false;
+}
+
+QList<QmlError> QmlDirParser::errors() const
+{
+    return _errors;
+}
+
+QList<QmlDirParser::Plugin> QmlDirParser::plugins() const
+{
+    return _plugins;
+}
+
+QList<QmlDirParser::Component> QmlDirParser::components() const
+{
+    return _components;
+}
+
+QT_END_NAMESPACE
diff --git a/src/declarative/qml/qmldirparser_p.h b/src/declarative/qml/qmldirparser_p.h
new file mode 100644
index 0000000..ff8b0f8
--- /dev/null
+++ b/src/declarative/qml/qmldirparser_p.h
@@ -0,0 +1,123 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QMLDIRPARSER_P_H
+#define QMLDIRPARSER_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include <QtCore/QUrl>
+#include <QtCore/QHash>
+
+QT_BEGIN_NAMESPACE
+
+class QmlError;
+
+class QmlDirParser
+{
+    Q_DISABLE_COPY(QmlDirParser)
+
+public:
+    QmlDirParser();
+    ~QmlDirParser();
+
+    QUrl url() const;
+    void setUrl(const QUrl &url);
+
+    QString source() const;
+    void setSource(const QString &source);
+
+    bool parse();
+
+    bool hasError() const;
+    QList<QmlError> errors() const;
+
+    struct Plugin
+    {
+        Plugin() {}
+
+        Plugin(const QString &name, const QString &path)
+            : name(name), path(path) {}
+
+        QString name;
+        QString path;
+    };
+
+    struct Component
+    {
+        Component()
+            : majorVersion(0), minorVersion(0) {}
+
+        Component(const QString &typeName, const QString &fileName, int majorVersion, int minorVersion)
+            : typeName(typeName), fileName(fileName), majorVersion(majorVersion), minorVersion(minorVersion) {}
+
+        QString typeName;
+        QString fileName;
+        int majorVersion;
+        int minorVersion;
+    };
+
+    QList<Component> components() const;
+    QList<Plugin> plugins() const;
+
+private:
+    void reportError(int line, int column, const QString &message);
+
+private:
+    QList<QmlError> _errors;
+    QUrl _url;
+    QString _source;
+    QList<Component> _components;
+    QList<Plugin> _plugins;
+};
+
+QT_END_NAMESPACE
+
+#endif // QMLDIRPARSER_P_H
diff --git a/src/declarative/qml/qmlengine.cpp b/src/declarative/qml/qmlengine.cpp
index cf26f58..6f26a07 100644
--- a/src/declarative/qml/qmlengine.cpp
+++ b/src/declarative/qml/qmlengine.cpp
@@ -66,6 +66,7 @@
 #include "qmlscriptclass_p.h"
 #include "qmlnetworkaccessmanagerfactory.h"
 #include "qmlimageprovider.h"
+#include "qmldirparser_p.h"
 
 #include <qfxperf_p_p.h>
 
@@ -1262,24 +1263,21 @@ struct QmlEnginePrivate::ImportedNamespace {
                         qmldircontent = QString::fromUtf8(qmldir.readAll());
                     }
                 }
-                QString typespace = QString::fromUtf8(type)+QLatin1Char(' ');
-                QStringList lines = qmldircontent.split(QLatin1Char('\n'));
-                foreach (QString line, lines) {
-                    if (line.isEmpty() || line.at(0) == QLatin1Char('#'))
-                        continue;
-                    if (line.startsWith(typespace)) {
-                        int space1 = line.indexOf(QLatin1Char(' '));
-                        int space2 = space1 >=0 ? line.indexOf(QLatin1Char(' '),space1+1) : -1;
-                        QString mapversions = line.mid(space1+1,space2<0?line.length()-space1-1:space2-space1-1);
-                        int dot = mapversions.indexOf(QLatin1Char('.'));
-                        int mapvmaj = mapversions.left(dot).toInt();
-                        if (mapvmaj<=vmaj) {
-                            if (mapvmaj<vmaj || vmin >= mapversions.mid(dot+1).toInt()) {
-                                QStringRef mapfile = space2<0 ? QStringRef() : line.midRef(space2+1,line.length()-space2-1);
-                                if (url_return)
-                                    *url_return = url.resolved(QUrl(mapfile.toString()));
-                                return true;
-                            }
+
+                const QString typespace = QString::fromUtf8(type);
+
+                QmlDirParser qmldirParser;
+                qmldirParser.setUrl(url);
+                qmldirParser.setSource(qmldircontent);
+                qmldirParser.parse();
+
+                foreach (const QmlDirParser::Component &c, qmldirParser.components()) { // ### TODO: cache the components
+                    if (c.majorVersion < vmaj || (c.majorVersion == vmaj && vmin >= c.minorVersion)) {
+                        if (c.typeName == typespace) {
+                            if (url_return)
+                                *url_return = url.resolved(QUrl(c.fileName));
+
+                            return true;
                         }
                     }
                 }