feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
Files
af88a7876b50ed9dd71e3fc7614eef5998908d03
qt-creator/src/libs/qmljs/parser/parser.patch

84 lines
3.1 KiB
Diff
Raw Normal View History

Update qmljs parser to Qt 5.15 parser * parser side support for annotations, inline components, new UiVersion and all the things included in QT 5.15 parser * SourceLocation moved from QmlJS:AST to QmlJS * Visitors now need to handle throwRecursionDepthError * BaseVisitor for visitors that want to override all visit Task-number: QTCREATORBUG-23591 Change-Id: I682a30d0b08b6c929739fd0e339ef6fbde3eb630 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2020-02-28 17:51:32 +01:00
diff -u parser-genOut/qmljsgrammar.cpp parser/qmljsgrammar.cpp
--- parser-genOut/qmljsgrammar.cpp 2020-03-02 13:53:50.000000000 +0100
+++ parser/qmljsgrammar.cpp 2020-03-02 14:16:26.000000000 +0100
@@ -21,7 +21,8 @@
** information to ensure the GNU General Public License requirements will
** be met: https://www.gnu.org/licenses/gpl-3.0.html.
**
-***************************************************************************// This file was generated by qlalr - DO NOT EDIT!
+***************************************************************************/
+// This file was generated by qlalr - DO NOT EDIT!
#include "qmljsgrammar_p.h"
const char *const QmlJSGrammar::spell [] = {
diff -u parser-genOut/qmljsgrammar_p.h parser/qmljsgrammar_p.h
--- parser/qmljsgrammar_p.h 2020-03-03 13:51:43.000000000 +0100
+++ parser-fixed2/qmljsgrammar_p.h 2020-03-02 17:20:56.000000000 +0100
@@ -21,11 +21,13 @@
** information to ensure the GNU General Public License requirements will
** be met: https://www.gnu.org/licenses/gpl-3.0.html.
**
-***************************************************************************// This file was generated by qlalr - DO NOT EDIT!
+***************************************************************************/
+// This file was generated by qlalr - DO NOT EDIT!
#ifndef QMLJSGRAMMAR_P_H
#define QMLJSGRAMMAR_P_H
+#include "qmljsglobal_p.h"
-class QmlJSGrammar
+class QML_PARSER_EXPORT QmlJSGrammar
qml/parser: update parser to Qt version 5.2.0 Change-Id: I22234b9d99bdebf05309ad79ed3b9233db5cff78 Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2014-01-15 00:18:53 +01:00
{
public:
Update qmljs parser to Qt 5.15 parser * parser side support for annotations, inline components, new UiVersion and all the things included in QT 5.15 parser * SourceLocation moved from QmlJS:AST to QmlJS * Visitors now need to handle throwRecursionDepthError * BaseVisitor for visitors that want to override all visit Task-number: QTCREATORBUG-23591 Change-Id: I682a30d0b08b6c929739fd0e339ef6fbde3eb630 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2020-02-28 17:51:32 +01:00
enum VariousConstants {
diff -u parser-genOut/qmljslexer_p.h parser/qmljslexer_p.h
--- parser-genOut/qmljslexer_p.h 2020-03-02 13:53:50.000000000 +0100
+++ parser/qmljslexer_p.h 2020-03-02 13:55:13.000000000 +0100
@@ -47,7 +47,7 @@
QmlJS: Automate patching of generated parser. * License headers in qmljs.g * Directives usage Change-Id: Ia68498c58049a2e47f0e7b120ad44556aff7b17f Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
2011-12-07 11:21:10 +01:00
namespace QmlJS {
Update qmljs parser to Qt 5.15 parser * parser side support for annotations, inline components, new UiVersion and all the things included in QT 5.15 parser * SourceLocation moved from QmlJS:AST to QmlJS * Visitors now need to handle throwRecursionDepthError * BaseVisitor for visitors that want to override all visit Task-number: QTCREATORBUG-23591 Change-Id: I682a30d0b08b6c929739fd0e339ef6fbde3eb630 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2020-02-28 17:51:32 +01:00
class Engine;
-struct DiagnosticMessage;
+class DiagnosticMessage;
class Directives;
class QML_PARSER_EXPORT Lexer: public QmlJSGrammar
diff -u parser-genOut/qmljsparser.cpp parser/qmljsparser.cpp
--- parser-genOut/qmljsparser.cpp 2020-03-02 13:53:50.000000000 +0100
+++ parser/qmljsparser.cpp 2020-03-02 14:16:01.000000000 +0100
@@ -22,5 +22,6 @@
** be met: https://www.gnu.org/licenses/gpl-3.0.html.
**
****************************************************************************/
+#line 172 "qmljs.g"
#include "qmljs/parser/qmljsengine_p.h"
diff -u parser-genOut/qmljsparser_p.h parser/qmljsparser_p.h
--- parser-genOut/qmljsparser_p.h 2020-03-02 13:53:50.000000000 +0100
+++ parser/qmljsparser_p.h 2020-03-02 14:13:25.000000000 +0100
@@ -22,6 +22,7 @@
** be met: https://www.gnu.org/licenses/gpl-3.0.html.
**
****************************************************************************/
+#line 223 "qmljs.g"
//
diff -u parser-genOut/parser.pri parser/parser.pri
--- parser-genOut/parser.pri 2020-03-02 15:40:09.000000000 +0100
+++ parser/parser.pri 2020-03-02 15:41:11.000000000 +0100
@@ -22,10 +22,10 @@
$$PWD/qmljsparser.cpp \
-CONFIG += qlalr
+#CONFIG += qlalr
QLALRSOURCES = $$PWD/qmljs.g
-QMAKE_QLALRFLAGS = --no-debug --qt
+#QMAKE_QLALRFLAGS = --no-debug --qt
OTHER_FILES += $$QLALRSOURCES
# make sure we install the headers generated by qlalr
-private_headers.CONFIG += no_check_exist
+#private_headers.CONFIG += no_check_exist
Copy Permalink