diff options
author | Simon Hausmann <simon.hausmann@digia.com> | 2013-08-06 16:41:28 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-08 09:00:05 +0200 |
commit | 5b456c8da4462f9e11fa4da78a9e6ea86423a1e8 (patch) | |
tree | c8a24054a711d0ca4aed52ddcc480fcd25b32c91 /src/qml/qml/qqmlcompiler_p.h | |
parent | dea991ec5b6e1e8546dfd3695c12425ee27d2ef3 (diff) |
Beginning of a new qml parser
The goal is to parse QML and JavaScript binding expressions/functions in one
go and generate data structures that allow for the parsing to happen in a thread
and the instantiation of the object tree in another thread, just reading from
the generated data structures. This will replace qqmlcompiler and the VME.
This new way of loading QML is currently hidden behind the QML_NEW_COMPILER=1
environment variable. There's lots of work left to fill in the gaps in object
construction, Component support, Component.onComplete, error messages, etc. etc.
Change-Id: I5e40643cff169f469f0b6ce151584ffee5ca5e90
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src/qml/qml/qqmlcompiler_p.h')
-rw-r--r-- | src/qml/qml/qqmlcompiler_p.h | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/src/qml/qml/qqmlcompiler_p.h b/src/qml/qml/qqmlcompiler_p.h index bc013358f5..ca825a923d 100644 --- a/src/qml/qml/qqmlcompiler_p.h +++ b/src/qml/qml/qqmlcompiler_p.h @@ -70,6 +70,13 @@ QT_BEGIN_NAMESPACE +namespace QV4 { +namespace CompiledData { +struct CompilationUnit; +struct QmlUnit; +} +} + class QQmlEngine; class QQmlComponent; class QQmlContext; @@ -125,6 +132,11 @@ public: QList<QQmlScriptData *> scripts; QList<QUrl> urls; + // --- new compiler + QV4::CompiledData::CompilationUnit *compilationUnit; + QV4::CompiledData::QmlUnit *qmlUnit; + // --- + struct Instruction { #define QML_INSTR_DATA_TYPEDEF(I, FMT) typedef QQmlInstructionData<QQmlInstruction::I> I; FOR_EACH_QML_INSTR(QML_INSTR_DATA_TYPEDEF) |