feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlJS: Switch to new format for QML meta data.

Browse Source
This commit is contained in:
Christian Kamm
2011-02-08 13:22:34 +01:00
parent dd1de1b82f
commit 2ec429e8ce
30 changed files with 10091 additions and 7080 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
src/libs/qmljs/qmljsinterpreter.cpp
View File

@@ -36,6 +36,7 @@
#include "qmljslink.h"
#include "qmljsbind.h"
#include "qmljsscopebuilder.h"
#include "qmljstypedescriptionreader.h"
#include "parser/qmljsast_p.h"
#include <languageutils/fakemetaobject.h>
@@ -1943,45 +1944,48 @@ const Value *Function::invoke(const Activation *activation) const
// typing environment
////////////////////////////////////////////////////////////////////////////////
QList<FakeMetaObject::ConstPtr> CppQmlTypesLoader::builtinObjects;
QHash<QString, FakeMetaObject::ConstPtr> CppQmlTypesLoader::builtinObjects;
QStringList CppQmlTypesLoader::loadXml(const QFileInfoList &xmlFiles)
QStringList CppQmlTypesLoader::loadQmlTypes(const QFileInfoList &qmlTypeFiles)
{
QMap<QString, FakeMetaObject::Ptr> newObjects;
QHash<QString, FakeMetaObject::Ptr> newObjects;
QStringList errorMsgs;
foreach (const QFileInfo &xmlFile, xmlFiles) {
QFile file(xmlFile.absoluteFilePath());
foreach (const QFileInfo &qmlTypeFile, qmlTypeFiles) {
QFile file(qmlTypeFile.absoluteFilePath());
if (file.open(QIODevice::ReadOnly)) {
QmlXmlReader read(&file);
if (!read(&newObjects)) {
errorMsgs.append(read.errorMessage());
}
QString contents = QString::fromUtf8(file.readAll());
file.close();
QmlJS::TypeDescriptionReader reader(contents);
if (!reader(&newObjects)) {
errorMsgs.append(reader.errorMessage());
}
} else {
errorMsgs.append(QmlXmlReader::tr("%1: %2").arg(xmlFile.absoluteFilePath(),
file.errorString()));
errorMsgs.append(QmlJS::TypeDescriptionReader::tr("%1: %2")
.arg(qmlTypeFile.absoluteFilePath(),
file.errorString()));
}
}
if (errorMsgs.isEmpty()) {
setSuperClasses(&newObjects);
// we need to go from QList<T *> of newObjects.values() to QList<const T *>
// we need to go from QHash<K, T::Ptr> to QHash<K, T::ConstPtr>
// and there seems to be no better way
QMapIterator<QString, FakeMetaObject::Ptr> it(newObjects);
QHashIterator<QString, FakeMetaObject::Ptr> it(newObjects);
while (it.hasNext()) {
it.next();
builtinObjects.append(it.value());
builtinObjects.insert(it.key(), it.value());
}
}
return errorMsgs;
}
QString CppQmlTypesLoader::parseQmlTypeXml(const QByteArray &xml, QMap<QString, FakeMetaObject::Ptr> *newObjects)
QString CppQmlTypesLoader::parseQmlTypeDescriptions(const QByteArray &xml, QHash<QString, FakeMetaObject::Ptr> *newObjects)
{
QmlXmlReader reader(xml);
QmlJS::TypeDescriptionReader reader(QString::fromUtf8(xml));
if (!reader(newObjects)) {
if (reader.errorMessage().isEmpty())
return QLatin1String("unknown error");
@@ -1991,16 +1995,18 @@ QString CppQmlTypesLoader::parseQmlTypeXml(const QByteArray &xml, QMap<QString,
return QString();
}
void CppQmlTypesLoader::setSuperClasses(QMap<QString, FakeMetaObject::Ptr> *newObjects)
void CppQmlTypesLoader::setSuperClasses(QHash<QString, FakeMetaObject::Ptr> *newObjects)
{
QMapIterator<QString, FakeMetaObject::Ptr> it(*newObjects);
QHashIterator<QString, FakeMetaObject::Ptr> it(*newObjects);
while (it.hasNext()) {
it.next();
FakeMetaObject::Ptr obj = it.value();
const QString superName = obj->superclassName();
if (! superName.isEmpty()) {
FakeMetaObject::Ptr superClass = newObjects->value(superName);
FakeMetaObject::ConstPtr superClass = newObjects->value(superName);
if (!superClass)
superClass = builtinObjects.value(superName);
if (superClass)
obj->setSuperclass(superClass);
else
@@ -2009,7 +2015,8 @@ void CppQmlTypesLoader::setSuperClasses(QMap<QString, FakeMetaObject::Ptr> *newO
}
}
void CppQmlTypes::load(Engine *engine, const QList<FakeMetaObject::ConstPtr> &objects)
template <typename T>
void CppQmlTypes::load(Engine *engine, const T &objects)
{
// load
QList<FakeMetaObject::ConstPtr> newObjects;
@@ -2052,6 +2059,9 @@ void CppQmlTypes::load(Engine *engine, const QList<FakeMetaObject::ConstPtr> &ob
}
}
}
// explicitly instantiate load for list and hash
template void CppQmlTypes::load< QList<FakeMetaObject::ConstPtr> >(Engine *, const QList<FakeMetaObject::ConstPtr> &);
template void CppQmlTypes::load< QHash<QString, FakeMetaObject::ConstPtr> >(Engine *, const QHash<QString, FakeMetaObject::ConstPtr> &);
QList<QmlObjectValue *> CppQmlTypes::typesForImport(const QString &packageName, ComponentVersion version) const
{

13
src/libs/qmljs/qmljsinterpreter.h
View File

@@ -585,20 +585,21 @@ class QMLJS_EXPORT CppQmlTypesLoader
{
public:
/** \return an empty list when successful, error messages otherwise. */
static QStringList loadXml(const QFileInfoList &xmlFiles);
static QList<LanguageUtils::FakeMetaObject::ConstPtr> builtinObjects;
static QStringList loadQmlTypes(const QFileInfoList &xmlFiles);
static QHash<QString, LanguageUtils::FakeMetaObject::ConstPtr> builtinObjects;
// parses the xml string and fills the newObjects map
static QString parseQmlTypeXml(const QByteArray &xml,
QMap<QString, LanguageUtils::FakeMetaObject::Ptr> *newObjects);
static QString parseQmlTypeDescriptions(const QByteArray &xml,
QHash<QString, LanguageUtils::FakeMetaObject::Ptr> *newObjects);
private:
static void setSuperClasses(QMap<QString, LanguageUtils::FakeMetaObject::Ptr> *newObjects);
static void setSuperClasses(QHash<QString, LanguageUtils::FakeMetaObject::Ptr> *newObjects);
};
class QMLJS_EXPORT CppQmlTypes
{
public:
void load(Interpreter::Engine *interpreter, const QList<LanguageUtils::FakeMetaObject::ConstPtr> &objects);
template <typename T>
void load(Interpreter::Engine *interpreter, const T &objects);
QList<Interpreter::QmlObjectValue *> typesForImport(const QString &prefix, LanguageUtils::ComponentVersion version) const;
Interpreter::QmlObjectValue *typeForImport(const QString &qualifiedName,

2
src/libs/qmljs/qmljstypedescriptionreader.cpp
View File

@@ -26,7 +26,7 @@ TypeDescriptionReader::~TypeDescriptionReader()
{
}
bool TypeDescriptionReader::operator()(QMap<QString, FakeMetaObject::Ptr> *objects)
bool TypeDescriptionReader::operator()(QHash<QString, FakeMetaObject::Ptr> *objects)
{
QString fileName("typeDescription");
Engine engine;

9
src/libs/qmljs/qmljstypedescriptionreader.h
View File

@@ -5,6 +5,9 @@
#include <QtCore/QScopedPointer>
// for Q_DECLARE_TR_FUNCTIONS
#include <QtCore/QCoreApplication>
QT_BEGIN_NAMESPACE
class QIODevice;
class QBuffer;
@@ -21,11 +24,13 @@ class SourceLocation;
class TypeDescriptionReader
{
Q_DECLARE_TR_FUNCTIONS(QmlJS::TypeDescriptionReader)
public:
explicit TypeDescriptionReader(const QString &data);
~TypeDescriptionReader();
bool operator()(QMap<QString, LanguageUtils::FakeMetaObject::Ptr> *objects);
bool operator()(QHash<QString, LanguageUtils::FakeMetaObject::Ptr> *objects);
QString errorMessage() const;
private:
@@ -45,7 +50,7 @@ private:
QString _source;
QString _errorMessage;
QMap<QString, LanguageUtils::FakeMetaObject::Ptr> *_objects;
QHash<QString, LanguageUtils::FakeMetaObject::Ptr> *_objects;
};
} // namespace QmlJS