diff options
| author | Marco Benelli <marco.benelli@qt.io> | 2018-10-16 15:32:58 +0200 |
|---|---|---|
| committer | Marco Benelli <marco.benelli@qt.io> | 2018-11-22 11:21:32 +0000 |
| commit | 4646acad0db369302d08a1b83e1971be31c1df4f (patch) | |
| tree | cc6b02cc0942309f9887e3a8e0f19a34e60123d5 /src/libs/qmljs/qmljsdocument.cpp | |
| parent | fe8a3727735f1e6cf9414999ff5103520b1a56f9 (diff) | |
| download | qt-creator-4646acad0db369302d08a1b83e1971be31c1df4f.tar.gz | |
qmljs: update parser
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>
Diffstat (limited to 'src/libs/qmljs/qmljsdocument.cpp')
| -rw-r--r-- | src/libs/qmljs/qmljsdocument.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/libs/qmljs/qmljsdocument.cpp b/src/libs/qmljs/qmljsdocument.cpp index 0474fca121..a4551b1c1c 100644 --- a/src/libs/qmljs/qmljsdocument.cpp +++ b/src/libs/qmljs/qmljsdocument.cpp @@ -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() |