qmljs: use new qml parser

adds support for singleton and getter/setter properties

Change-Id: Ia6691ac7799a46885db0df44617617dcc3c13189
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
This commit is contained in:
Fawzi Mohamed
2013-11-06 14:17:23 +01:00
parent 0374d83e83
commit e9c97aa1d1
35 changed files with 2420 additions and 1675 deletions

View File

@@ -43,7 +43,8 @@
#include "qmljsglobal_p.h"
#include "qmljsgrammar_p.h"
#include <QtCore/QString>
#include <QtCore/qstring.h>
QT_QML_BEGIN_NAMESPACE
@@ -109,12 +110,14 @@ public:
enum Error {
NoError,
IllegalCharacter,
IllegalHexNumber,
UnclosedStringLiteral,
IllegalEscapeSequence,
IllegalUnicodeEscapeSequence,
UnclosedComment,
IllegalExponentIndicator,
IllegalIdentifier
IllegalIdentifier,
IllegalHexadecimalEscapeSequence
};
enum RegExpBodyPrefix {
@@ -189,6 +192,7 @@ private:
void syncProhibitAutomaticSemicolon();
QChar decodeUnicodeEscapeCharacter(bool *ok);
QChar decodeHexEscapeCharacter(bool *ok);
private:
Engine *_engine;
@@ -199,6 +203,7 @@ private:
QStringRef _tokenSpell;
const QChar *_codePtr;
const QChar *_endPtr;
const QChar *_lastLinePtr;
const QChar *_tokenLinePtr;
const QChar *_tokenStartPtr;