aboutsummaryrefslogtreecommitdiffstats
path: root/src/lib/corelib/parser
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/corelib/parser')
-rw-r--r--src/lib/corelib/parser/qmljsast_p.h14
-rw-r--r--src/lib/corelib/parser/qmljsastvisitor.cpp8
-rw-r--r--src/lib/corelib/parser/qmljsengine_p.cpp7
-rw-r--r--src/lib/corelib/parser/qmljsengine_p.h9
-rw-r--r--src/lib/corelib/parser/qmljslexer.cpp30
-rw-r--r--src/lib/corelib/parser/qmljslexer_p.h2
-rw-r--r--src/lib/corelib/parser/qmljsmemorypool_p.h4
-rw-r--r--src/lib/corelib/parser/qmljsparser.cpp14
8 files changed, 42 insertions, 46 deletions
diff --git a/src/lib/corelib/parser/qmljsast_p.h b/src/lib/corelib/parser/qmljsast_p.h
index 8c6f32140..dcee233da 100644
--- a/src/lib/corelib/parser/qmljsast_p.h
+++ b/src/lib/corelib/parser/qmljsast_p.h
@@ -221,7 +221,7 @@ public:
// NOTE: node destructors are never called,
// instead we block free the memory
// (see the NodePool class)
- virtual ~Node() {}
+ virtual ~Node() = default;
virtual ExpressionNode *expressionCast();
virtual BinaryExpression *binaryExpressionCast();
@@ -245,7 +245,7 @@ public:
class QML_PARSER_EXPORT ExpressionNode: public Node
{
public:
- ExpressionNode() {}
+ ExpressionNode() = default;
ExpressionNode *expressionCast() override;
};
@@ -253,7 +253,7 @@ public:
class QML_PARSER_EXPORT Statement: public Node
{
public:
- Statement() {}
+ Statement() = default;
Statement *statementCast() override;
};
@@ -2303,7 +2303,7 @@ public:
return imports->firstSourceLocation();
else if (members)
return members->firstSourceLocation();
- return SourceLocation();
+ return {};
}
SourceLocation lastSourceLocation() const override
@@ -2312,7 +2312,7 @@ public:
return members->lastSourceLocation();
else if (imports)
return imports->lastSourceLocation();
- return SourceLocation();
+ return {};
}
// attributes
@@ -2519,7 +2519,7 @@ public:
else if (const auto varStmt = cast<const VariableStatement *>(sourceElement))
return varStmt->firstSourceLocation();
- return SourceLocation();
+ return {};
}
SourceLocation lastSourceLocation() const override
@@ -2529,7 +2529,7 @@ public:
else if (const auto varStmt = cast<const VariableStatement *>(sourceElement))
return varStmt->lastSourceLocation();
- return SourceLocation();
+ return {};
}
void accept0(Visitor *visitor) override;
diff --git a/src/lib/corelib/parser/qmljsastvisitor.cpp b/src/lib/corelib/parser/qmljsastvisitor.cpp
index fcb84ec7e..f034a147e 100644
--- a/src/lib/corelib/parser/qmljsastvisitor.cpp
+++ b/src/lib/corelib/parser/qmljsastvisitor.cpp
@@ -42,13 +42,9 @@
namespace QbsQmlJS {
namespace AST {
-Visitor::Visitor()
-{
-}
+Visitor::Visitor() = default;
-Visitor::~Visitor()
-{
-}
+Visitor::~Visitor() = default;
} // namespace AST
} // namespace QbsQmlJS
diff --git a/src/lib/corelib/parser/qmljsengine_p.cpp b/src/lib/corelib/parser/qmljsengine_p.cpp
index 211743190..92ac6452a 100644
--- a/src/lib/corelib/parser/qmljsengine_p.cpp
+++ b/src/lib/corelib/parser/qmljsengine_p.cpp
@@ -117,12 +117,9 @@ double integerFromString(const QString &str, int radix)
}
-Engine::Engine()
- : _lexer(nullptr), _directives(nullptr)
-{ }
+Engine::Engine() = default;
-Engine::~Engine()
-{ }
+Engine::~Engine() = default;
void Engine::setCode(const QString &code)
{ _code = code; }
diff --git a/src/lib/corelib/parser/qmljsengine_p.h b/src/lib/corelib/parser/qmljsengine_p.h
index 6ff53a6e9..c55d525f8 100644
--- a/src/lib/corelib/parser/qmljsengine_p.h
+++ b/src/lib/corelib/parser/qmljsengine_p.h
@@ -59,6 +59,7 @@
#include <QtCore/qstring.h>
#include <set>
+#include <utility>
namespace QbsQmlJS {
@@ -74,8 +75,8 @@ public:
DiagnosticMessage()
: kind(Error) {}
- DiagnosticMessage(Kind kind, const AST::SourceLocation &loc, const QString &message)
- : kind(kind), loc(loc), message(message) {}
+ DiagnosticMessage(Kind kind, const AST::SourceLocation &loc, QString message)
+ : kind(kind), loc(loc), message(std::move(message)) {}
bool isWarning() const
{ return kind == Warning; }
@@ -90,8 +91,8 @@ public:
class QBS_AUTOTEST_EXPORT Engine
{
- Lexer *_lexer;
- Directives *_directives;
+ Lexer *_lexer{nullptr};
+ Directives *_directives{nullptr};
MemoryPool _pool;
QList<AST::SourceLocation> _comments;
QString _extraCode;
diff --git a/src/lib/corelib/parser/qmljslexer.cpp b/src/lib/corelib/parser/qmljslexer.cpp
index dc6ac8a0f..815f1ef0d 100644
--- a/src/lib/corelib/parser/qmljslexer.cpp
+++ b/src/lib/corelib/parser/qmljslexer.cpp
@@ -78,8 +78,8 @@ static QChar convertHex(QChar c1, QChar c2)
static QChar convertUnicode(QChar c1, QChar c2, QChar c3, QChar c4)
{
- return QChar((convertHex(c3.unicode()) << 4) + convertHex(c4.unicode()),
- (convertHex(c1.unicode()) << 4) + convertHex(c2.unicode()));
+ return {uchar((convertHex(c3.unicode()) << 4) + convertHex(c4.unicode())),
+ uchar((convertHex(c1.unicode()) << 4) + convertHex(c2.unicode()))};
}
Lexer::Lexer(Engine *engine)
@@ -178,7 +178,7 @@ int Lexer::lex()
_tokenSpell = QStringRef();
_tokenKind = scanToken();
- _tokenLength = _codePtr - _tokenStartPtr - 1;
+ _tokenLength = int(_codePtr - _tokenStartPtr - 1);
_delimited = false;
_restrictedKeyword = false;
@@ -397,7 +397,8 @@ again:
scanChar();
if (_engine) {
- _engine->addComment(tokenOffset() + 2, _codePtr - _tokenStartPtr - 1 - 4,
+ _engine->addComment(tokenOffset() + 2,
+ int(_codePtr - _tokenStartPtr - 1 - 4),
tokenStartLine(), tokenStartColumn() + 2);
}
@@ -412,7 +413,7 @@ again:
scanChar();
}
if (_engine) {
- _engine->addComment(tokenOffset() + 2, _codePtr - _tokenStartPtr - 1 - 2,
+ _engine->addComment(tokenOffset() + 2, int(_codePtr - _tokenStartPtr - 1 - 2),
tokenStartLine(), tokenStartColumn() + 2);
}
goto again;
@@ -554,7 +555,8 @@ again:
if (_char == QLatin1Char('\n') || _char == QLatin1Char('\\')) {
break;
} else if (_char == quote) {
- _tokenSpell = _engine->midRef(startCode - _code.unicode() - 1, _codePtr - startCode);
+ _tokenSpell = _engine->midRef(
+ int(startCode - _code.unicode() - 1), int(_codePtr - startCode));
scanChar();
return T_STRING_LITERAL;
@@ -706,7 +708,7 @@ again:
if (! identifierWithEscapeChars) {
identifierWithEscapeChars = true;
_tokenText.resize(0);
- _tokenText.insert(0, _tokenStartPtr, _codePtr - _tokenStartPtr - 1);
+ _tokenText.insert(0, _tokenStartPtr, int(_codePtr - _tokenStartPtr - 1));
_validTokenText = true;
}
@@ -719,7 +721,7 @@ again:
return T_ERROR;
}
} else {
- _tokenLength = _codePtr - _tokenStartPtr - 1;
+ _tokenLength = int(_codePtr - _tokenStartPtr - 1);
int kind = T_IDENTIFIER;
@@ -727,10 +729,12 @@ again:
kind = classify(_tokenStartPtr, _tokenLength, _qmlMode);
if (_engine) {
- if (kind == T_IDENTIFIER && identifierWithEscapeChars)
+ if (kind == T_IDENTIFIER && identifierWithEscapeChars) {
_tokenSpell = _engine->newStringRef(_tokenText);
- else
- _tokenSpell = _engine->midRef(_tokenStartPtr - _code.unicode(), _tokenLength);
+ } else {
+ _tokenSpell = _engine->midRef(
+ int(_tokenStartPtr - _code.unicode()), _tokenLength);
+ }
}
return kind;
@@ -891,7 +895,7 @@ bool Lexer::scanRegExp(RegExpBodyPrefix prefix)
scanChar();
}
- _tokenLength = _codePtr - _tokenStartPtr - 1;
+ _tokenLength = int(_codePtr - _tokenStartPtr - 1);
return true;
case '\\':
@@ -995,7 +999,7 @@ int Lexer::tokenEndLine() const
int Lexer::tokenEndColumn() const
{
- return _codePtr - _lastLinePtr;
+ return int(_codePtr - _lastLinePtr);
}
QString Lexer::tokenText() const
diff --git a/src/lib/corelib/parser/qmljslexer_p.h b/src/lib/corelib/parser/qmljslexer_p.h
index e9dff1dd4..cf41fb255 100644
--- a/src/lib/corelib/parser/qmljslexer_p.h
+++ b/src/lib/corelib/parser/qmljslexer_p.h
@@ -62,7 +62,7 @@ class Engine;
class QML_PARSER_EXPORT Directives {
public:
- virtual ~Directives() {}
+ virtual ~Directives() = default;
virtual void pragmaLibrary()
{
diff --git a/src/lib/corelib/parser/qmljsmemorypool_p.h b/src/lib/corelib/parser/qmljsmemorypool_p.h
index 897348712..f7de7bbfb 100644
--- a/src/lib/corelib/parser/qmljsmemorypool_p.h
+++ b/src/lib/corelib/parser/qmljsmemorypool_p.h
@@ -154,8 +154,8 @@ class QML_PARSER_EXPORT Managed
void operator = (const Managed &other);
public:
- Managed() {}
- ~Managed() {}
+ Managed() = default;
+ ~Managed() = default;
void *operator new(size_t size, MemoryPool *pool) { return pool->allocate(size); }
void operator delete(void *) {}
diff --git a/src/lib/corelib/parser/qmljsparser.cpp b/src/lib/corelib/parser/qmljsparser.cpp
index 6390c8a9d..d2c87c7cb 100644
--- a/src/lib/corelib/parser/qmljsparser.cpp
+++ b/src/lib/corelib/parser/qmljsparser.cpp
@@ -40,7 +40,7 @@
#include <QtCore/qdebug.h>
#include <QtCore/qcoreapplication.h>
-#include <string.h>
+#include <cstring>
#include "qmljsengine_p.h"
#include "qmljslexer_p.h"
@@ -328,7 +328,7 @@ case 26: {
} break;
case 27: {
- const auto node = new (pool) AST::UiObjectInitializer((AST::UiObjectMemberList*)0);
+ const auto node = new (pool) AST::UiObjectInitializer(nullptr);
node->lbraceToken = loc(1);
node->rbraceToken = loc(2);
sym(1).Node = node;
@@ -614,7 +614,7 @@ case 80: {
} break;
case 81: {
- const auto node = new (pool) AST::ArrayLiteral((AST::Elision *) 0);
+ const auto node = new (pool) AST::ArrayLiteral(static_cast<AST::Elision *>(nullptr));
node->lbracketToken = loc(1);
node->rbracketToken = loc(2);
sym(1).Node = node;
@@ -635,8 +635,7 @@ case 83: {
} break;
case 84: {
- const auto node = new (pool) AST::ArrayLiteral(sym(2).ElementList->finish (),
- (AST::Elision *) 0);
+ const auto node = new (pool) AST::ArrayLiteral(sym(2).ElementList->finish (), nullptr);
node->lbracketToken = loc(1);
node->commaToken = loc(3);
node->rbracketToken = loc(4);
@@ -700,7 +699,7 @@ case 89: {
} break;
case 90: {
- sym(1).Node = new (pool) AST::ElementList((AST::Elision *) 0, sym(1).Expression);
+ sym(1).Node = new (pool) AST::ElementList(nullptr, sym(1).Expression);
} break;
case 91: {
@@ -708,8 +707,7 @@ case 91: {
} break;
case 92: {
- const auto node = new (pool) AST::ElementList(sym(1).ElementList,
- (AST::Elision *) 0, sym(3).Expression);
+ const auto node = new (pool) AST::ElementList(sym(1).ElementList, nullptr, sym(3).Expression);
node->commaToken = loc(2);
sym(1).Node = node;
} break;
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-10 22:36:15 +0000