diff options
| author | Fawzi Mohamed <fawzi.mohamed@qt.io> | 2020-02-28 17:51:32 +0100 |
|---|---|---|
| committer | Fawzi Mohamed <fawzi.mohamed@qt.io> | 2020-03-03 15:31:10 +0000 |
| commit | b09a48599e7e5db5447189136353b79aca3898cf (patch) | |
| tree | 5f6f3b1d4da3ed746caa612992d94ed21978dd75 /src/plugins/autotest | |
| parent | a24dead5f63d7eb0b209539daebf5b2ce558b1c0 (diff) | |
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>
Diffstat (limited to 'src/plugins/autotest')
| -rw-r--r-- | src/plugins/autotest/quick/quicktestvisitors.cpp | 7 | ||||
| -rw-r--r-- | src/plugins/autotest/quick/quicktestvisitors.h | 2 |
2 files changed, 9 insertions, 0 deletions
diff --git a/src/plugins/autotest/quick/quicktestvisitors.cpp b/src/plugins/autotest/quick/quicktestvisitors.cpp index 486356f13b2..598b16afec7 100644 --- a/src/plugins/autotest/quick/quicktestvisitors.cpp +++ b/src/plugins/autotest/quick/quicktestvisitors.cpp @@ -33,6 +33,8 @@ #include <utils/algorithm.h> #include <utils/qtcassert.h> +#include <QDebug> + namespace Autotest { namespace Internal { @@ -177,6 +179,11 @@ bool TestQmlVisitor::visit(QmlJS::AST::StringLiteral *ast) return false; } +void TestQmlVisitor::throwRecursionDepthError() +{ + qWarning("Warning: Hit maximum recursion depth while visiting AST in TestQmlVisitor"); +} + /************************************** QuickTestAstVisitor *************************************/ QuickTestAstVisitor::QuickTestAstVisitor(CPlusPlus::Document::Ptr doc, diff --git a/src/plugins/autotest/quick/quicktestvisitors.h b/src/plugins/autotest/quick/quicktestvisitors.h index e4af8661c2f..5aff62f4581 100644 --- a/src/plugins/autotest/quick/quicktestvisitors.h +++ b/src/plugins/autotest/quick/quicktestvisitors.h @@ -65,6 +65,8 @@ public: bool visit(QmlJS::AST::FunctionDeclaration *ast) override; bool visit(QmlJS::AST::StringLiteral *ast) override; + void throwRecursionDepthError() override; + QVector<QuickTestCaseSpec> testCases() const { return m_testCases; } bool isValid() const { return !m_testCases.isEmpty(); } |