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

Updating qmljs parser to latest qtdeclarative parser

Browse Source 
improves support for string templates, required properties,
and other smaller improvements

Task-number: QTCREATORBUG-21869
Change-Id: Ia2359e1f75d4bd7b9ea4f27a920acd2251e36108
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
This commit is contained in:
Fawzi Mohamed
2021-12-03 15:49:28 +01:00
parent 16ced8a7d6
commit 125d7c0cce
25 changed files with 5669 additions and 5969 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -116,6 +116,7 @@ public:
AST::UiPragma *UiPragma;
AST::UiImport *UiImport;
AST::UiParameterList *UiParameterList;
AST::UiPropertyAttributes *UiPropertyAttributes;
AST::UiPublicMember *UiPublicMember;
AST::UiObjectDefinition *UiObjectDefinition;
AST::UiObjectInitializer *UiObjectInitializer;
@@ -288,29 +289,27 @@ protected:
} // end of namespace QmlJS
#line 1819 "qmljs.g"
#define J_SCRIPT_REGEXPLITERAL_RULE1 159
#line 1878 "qmljs.g"
#line 1831 "qmljs.g"
#define J_SCRIPT_REGEXPLITERAL_RULE1 164
#define J_SCRIPT_REGEXPLITERAL_RULE2 160
#line 1890 "qmljs.g"
#line 3451 "qmljs.g"
#define J_SCRIPT_REGEXPLITERAL_RULE2 165
#define J_SCRIPT_EXPRESSIONSTATEMENTLOOKAHEAD_RULE 461
#line 3502 "qmljs.g"
#line 4103 "qmljs.g"
#define J_SCRIPT_EXPRESSIONSTATEMENTLOOKAHEAD_RULE 466
#define J_SCRIPT_CONCISEBODYLOOKAHEAD_RULE 531
#line 4154 "qmljs.g"
#line 4645 "qmljs.g"
#define J_SCRIPT_CONCISEBODYLOOKAHEAD_RULE 536
#define J_SCRIPT_EXPORTDECLARATIONLOOKAHEAD_RULE 600
#line 4696 "qmljs.g"
#define J_SCRIPT_EXPORTDECLARATIONLOOKAHEAD_RULE 605
#line 4980 "qmljs.g"
#line 4929 "qmljs.g"
QT_QML_END_NAMESPACE