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

qmljs: update parser

Browse Source 
Update the qtcreator qmljs parser to the
one of Qt 5.12. It supports EcmaScript 7.

Task-number: QTCREATORBUG-20341
Change-Id: I0d1cff71402ba17e22cde6b46c65614e162280de
Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io>
This commit is contained in:
Marco Benelli
2018-10-16 15:32:58 +02:00
parent fe8a372773
commit 4646acad0d
46 changed files with 10604 additions and 5872 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/libs/qmljs/qmljsdocument.cpp
View File

@@ -248,7 +248,7 @@ public:
{}
void pragmaLibrary(int line, int column) override
void pragmaLibrary(int line, int column)
{
isLibrary = true;
addLocation(line, column);
@@ -305,12 +305,14 @@ bool Document::parse_helper(int startToken)
case QmlJSGrammar::T_FEED_UI_PROGRAM:
_parsedCorrectly = parser.parse();
break;
case QmlJSGrammar::T_FEED_JS_PROGRAM:
case QmlJSGrammar::T_FEED_JS_SCRIPT:
case QmlJSGrammar::T_FEED_JS_MODULE:
_parsedCorrectly = parser.parseProgram();
for (const auto &d: directives.locations()) {
_jsdirectives << d;
}
break;
case QmlJSGrammar::T_FEED_JS_EXPRESSION:
_parsedCorrectly = parser.parseExpression();
break;
@@ -341,7 +343,7 @@ bool Document::parseQml()
bool Document::parseJavaScript()
{
return parse_helper(QmlJSGrammar::T_FEED_JS_PROGRAM);
return parse_helper(QmlJSGrammar::T_FEED_JS_SCRIPT);
}
bool Document::parseExpression()