summaryrefslogtreecommitdiff
path: root/src/libs/qmljs/parser/qmljsparser.cpp
diff options
context:
space:
mode:
authorEike Ziller <eike.ziller@qt.io>2020-09-16 15:08:57 +0200
committerEike Ziller <eike.ziller@qt.io>2020-09-17 09:37:23 +0000
commitcf2a651c3bb9f7c4497f4a6085f5e91e3ea39150 (patch)
tree2b2e9df15c9f6ade48555292428a86e50160f7e9 /src/libs/qmljs/parser/qmljsparser.cpp
parent5ad724c61bc78cad19b265b177635c1e48bcbbaf (diff)
downloadqt-creator-cf2a651c3bb9f7c4497f4a6085f5e91e3ea39150.tar.gz
Make QmlJS(Tools) build with Qt5 & Qt6
Port from QStringRef to QStringView Change-Id: I472d16f20e40ca52b8e5d481850a6bd8a1a38f3b Reviewed-by: hjk <hjk@qt.io>
Diffstat (limited to 'src/libs/qmljs/parser/qmljsparser.cpp')
-rw-r--r--src/libs/qmljs/parser/qmljsparser.cpp36
1 files changed, 24 insertions, 12 deletions
diff --git a/src/libs/qmljs/parser/qmljsparser.cpp b/src/libs/qmljs/parser/qmljsparser.cpp
index c9b79e7f47..57b03b6cfb 100644
--- a/src/libs/qmljs/parser/qmljsparser.cpp
+++ b/src/libs/qmljs/parser/qmljsparser.cpp
@@ -102,7 +102,7 @@ static inline SourceLocation location(Lexer *lexer)
AST::UiQualifiedId *Parser::reparseAsQualifiedId(AST::ExpressionNode *expr)
{
- QVarLengthArray<QStringRef, 4> nameIds;
+ QVarLengthArray<QStringView, 4> nameIds;
QVarLengthArray<SourceLocation, 4> locations;
AST::ExpressionNode *it = expr;
@@ -2655,7 +2655,7 @@ case 241: {
#line 3625 "qmljs.g"
case 483: {
- AST::BreakStatement *node = new (pool) AST::BreakStatement(QStringRef());
+ AST::BreakStatement *node = new (pool) AST::BreakStatement(QStringView());
node->breakToken = loc(1);
node->semicolonToken = loc(2);
sym(1).Node = node;
@@ -2893,8 +2893,11 @@ case 241: {
case 512: {
if (!ensureNoFunctionTypeAnnotations(sym(5).TypeAnnotation, sym(3).FormalParameterList))
return false;
- AST::FunctionDeclaration *node = new (pool) AST::FunctionDeclaration(QStringRef(), sym(3).FormalParameterList, sym(7).StatementList,
- /*type annotation*/nullptr);
+ AST::FunctionDeclaration *node = new (pool)
+ AST::FunctionDeclaration(QStringView(),
+ sym(3).FormalParameterList,
+ sym(7).StatementList,
+ /*type annotation*/ nullptr);
node->functionToken = loc(1);
node->lparenToken = loc(2);
node->rparenToken = loc(4);
@@ -2925,8 +2928,11 @@ case 241: {
case 514: {
if (!ensureNoFunctionTypeAnnotations(sym(5).TypeAnnotation, sym(3).FormalParameterList))
return false;
- AST::FunctionExpression *node = new (pool) AST::FunctionExpression(QStringRef(), sym(3).FormalParameterList, sym(7).StatementList,
- /*type annotation*/nullptr);
+ AST::FunctionExpression *node = new (pool)
+ AST::FunctionExpression(QStringView(),
+ sym(3).FormalParameterList,
+ sym(7).StatementList,
+ /*type annotation*/ nullptr);
node->functionToken = loc(1);
node->lparenToken = loc(2);
node->rparenToken = loc(4);
@@ -2998,7 +3004,8 @@ case 241: {
ret->returnToken = sym(4).Node->firstSourceLocation();
ret->semicolonToken = sym(4).Node->lastSourceLocation();
AST::StatementList *statements = (new (pool) AST::StatementList(ret))->finish();
- AST::FunctionExpression *f = new (pool) AST::FunctionExpression(QStringRef(), sym(1).FormalParameterList, statements);
+ AST::FunctionExpression *f = new (pool)
+ AST::FunctionExpression(QStringView(), sym(1).FormalParameterList, statements);
f->isArrowFunction = true;
f->functionToken = sym(1).Node ? sym(1).Node->firstSourceLocation() : loc(1);
f->lbraceToken = sym(4).Node->firstSourceLocation();
@@ -3011,7 +3018,8 @@ case 241: {
#line 4037 "qmljs.g"
case 530: {
- AST::FunctionExpression *f = new (pool) AST::FunctionExpression(QStringRef(), sym(1).FormalParameterList, sym(6).StatementList);
+ AST::FunctionExpression *f = new (pool)
+ AST::FunctionExpression(QStringView(), sym(1).FormalParameterList, sym(6).StatementList);
f->isArrowFunction = true;
f->functionToken = sym(1).Node ? sym(1).Node->firstSourceLocation() : loc(1);
f->lbraceToken = loc(6);
@@ -3150,7 +3158,8 @@ case 241: {
#line 4198 "qmljs.g"
case 544: {
- AST::FunctionDeclaration *node = new (pool) AST::FunctionDeclaration(QStringRef(), sym(3).FormalParameterList, sym(6).StatementList);
+ AST::FunctionDeclaration *node = new (pool)
+ AST::FunctionDeclaration(QStringView(), sym(3).FormalParameterList, sym(6).StatementList);
node->functionToken = loc(1);
node->lparenToken = loc(2);
node->rparenToken = loc(4);
@@ -3178,7 +3187,8 @@ case 241: {
#line 4228 "qmljs.g"
case 546: {
- AST::FunctionExpression *node = new (pool) AST::FunctionExpression(QStringRef(), sym(3).FormalParameterList, sym(6).StatementList);
+ AST::FunctionExpression *node = new (pool)
+ AST::FunctionExpression(QStringView(), sym(3).FormalParameterList, sym(6).StatementList);
node->functionToken = loc(1);
node->lparenToken = loc(2);
node->rparenToken = loc(4);
@@ -3244,7 +3254,8 @@ case 241: {
#line 4303 "qmljs.g"
case 556: {
- AST::ClassDeclaration *node = new (pool) AST::ClassDeclaration(QStringRef(), sym(2).Expression, sym(4).ClassElementList);
+ AST::ClassDeclaration *node = new (pool)
+ AST::ClassDeclaration(QStringView(), sym(2).Expression, sym(4).ClassElementList);
node->classToken = loc(1);
node->lbraceToken = loc(3);
node->rbraceToken = loc(5);
@@ -3254,7 +3265,8 @@ case 241: {
#line 4314 "qmljs.g"
case 557: {
- AST::ClassExpression *node = new (pool) AST::ClassExpression(QStringRef(), sym(2).Expression, sym(4).ClassElementList);
+ AST::ClassExpression *node = new (pool)
+ AST::ClassExpression(QStringView(), sym(2).Expression, sym(4).ClassElementList);
node->classToken = loc(1);
node->lbraceToken = loc(3);
node->rbraceToken = loc(5);