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

QmlJs: sync qmljs parser

Browse Source 
The last version of the grammar contains some constructs that the code model
needs to know.

Task-number: QTCREATORBUG-17842
Change-Id: I6250f96431acc05b19f3fd1b6cc268a07485cf0f
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
This commit is contained in:
Marco Benelli
2017-03-16 17:13:46 +01:00
parent aa87ee72ec
commit 61d30a20ce
24 changed files with 1411 additions and 1222 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/libs/qmljs/parser/qmljsparser_p.h
View File

@@ -159,7 +159,7 @@ public:
inline DiagnosticMessage diagnosticMessage() const
{
foreach (const DiagnosticMessage &d, diagnostic_messages) {
for (const DiagnosticMessage &d : diagnostic_messages) {
if (d.kind != Severity::Warning)
return d;
}
@@ -231,8 +231,9 @@ protected:
#define J_SCRIPT_REGEXPLITERAL_RULE1 88
#define J_SCRIPT_REGEXPLITERAL_RULE1 91
#define J_SCRIPT_REGEXPLITERAL_RULE2 89
#define J_SCRIPT_REGEXPLITERAL_RULE2 92
QT_QML_END_NAMESPACE