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

qmljs: sync parser with current 5.12 state

Browse Source 
Task-number: QTCREATORBUG-22474
Change-Id: I86d7ee7cc28e95f814f2ba36551a36c8a59e1a79
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
This commit is contained in:
Tim Jenssen
2019-06-19 19:42:15 +02:00
committed by Tim Jenssen
parent 3333f1b8ac
commit 44f1d18307
2 changed files with 48 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/libs/qmljs/parser/qmljslexer_p.h
View File

@@ -146,6 +146,7 @@ public:
int tokenStartColumn() const { return _tokenColumn; }
inline QStringRef tokenSpell() const { return _tokenSpell; }
inline QStringRef rawString() const { return _rawString; }
double tokenValue() const { return _tokenValue; }
QString tokenText() const;
@@ -198,6 +199,7 @@ private:
QString _tokenText;
QString _errorMessage;
QStringRef _tokenSpell;
QStringRef _rawString;
const QChar *_codePtr;
const QChar *_endPtr;
@@ -233,6 +235,7 @@ private:
bool _followsClosingBrace;
bool _delimited;
bool _qmlMode;
bool _skipLinefeed = false;
int _generatorLevel = 0;
bool _staticIsKeyword = false;
};