diff options
author | Shawn Rutledge <shawn.rutledge@qt.io> | 2018-02-21 10:41:54 +0100 |
---|---|---|
committer | Shawn Rutledge <shawn.rutledge@qt.io> | 2018-02-26 07:13:18 +0000 |
commit | 499ec43937e926e4f2fa57a9baa455fcb3862262 (patch) | |
tree | 206c90d47387f8322b68f5e3db613189397e1af3 /src/qml/parser | |
parent | 53d1e9ed21d25e65a2f13606af479838f5f21fe7 (diff) |
use nullptr consistently (clang-tidy)
From now on we prefer nullptr instead of 0 to clarify cases where
we are assigning or testing a pointer rather than a numeric zero.
Also, replaced cases where 0 was passed as Qt::KeyboardModifiers
with Qt::NoModifier (clang-tidy replaced them with nullptr, which
waas wrong, so it was just as well to make the tests more readable
rather than to revert those lines).
Change-Id: I4735d35e4d9f42db5216862ce091429eadc6e65d
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/qml/parser')
-rw-r--r-- | src/qml/parser/qqmljsast.cpp | 8 | ||||
-rw-r--r-- | src/qml/parser/qqmljsast_p.h | 56 | ||||
-rw-r--r-- | src/qml/parser/qqmljsengine_p.cpp | 2 | ||||
-rw-r--r-- | src/qml/parser/qqmljsgrammar.cpp | 6 | ||||
-rw-r--r-- | src/qml/parser/qqmljslexer.cpp | 16 | ||||
-rw-r--r-- | src/qml/parser/qqmljsmemorypool_p.h | 10 | ||||
-rw-r--r-- | src/qml/parser/qqmljsparser.cpp | 68 | ||||
-rw-r--r-- | src/qml/parser/qqmljsparser_p.h | 6 |
8 files changed, 86 insertions, 86 deletions
diff --git a/src/qml/parser/qqmljsast.cpp b/src/qml/parser/qqmljsast.cpp index 2433522f42..34657a7d48 100644 --- a/src/qml/parser/qqmljsast.cpp +++ b/src/qml/parser/qqmljsast.cpp @@ -61,22 +61,22 @@ void Node::accept(Node *node, Visitor *visitor) ExpressionNode *Node::expressionCast() { - return 0; + return nullptr; } BinaryExpression *Node::binaryExpressionCast() { - return 0; + return nullptr; } Statement *Node::statementCast() { - return 0; + return nullptr; } UiObjectMember *Node::uiObjectMemberCast() { - return 0; + return nullptr; } ExpressionNode *ExpressionNode::expressionCast() diff --git a/src/qml/parser/qqmljsast_p.h b/src/qml/parser/qqmljsast_p.h index 7291cf0d3d..acbd88d466 100644 --- a/src/qml/parser/qqmljsast_p.h +++ b/src/qml/parser/qqmljsast_p.h @@ -457,11 +457,11 @@ public: QQMLJS_DECLARE_AST_NODE(ArrayLiteral) ArrayLiteral(Elision *e): - elements (0), elision (e) + elements (nullptr), elision (e) { kind = K; } ArrayLiteral(ElementList *elts): - elements (elts), elision (0) + elements (elts), elision (nullptr) { kind = K; } ArrayLiteral(ElementList *elts, Elision *e): @@ -490,7 +490,7 @@ public: QQMLJS_DECLARE_AST_NODE(ObjectLiteral) ObjectLiteral(): - properties (0) { kind = K; } + properties (nullptr) { kind = K; } ObjectLiteral(PropertyAssignmentList *plist): properties (plist) { kind = K; } @@ -535,7 +535,7 @@ public: inline Elision *finish () { Elision *front = next; - next = 0; + next = nullptr; return front; } @@ -564,7 +564,7 @@ public: inline ElementList *finish () { ElementList *front = next; - next = 0; + next = nullptr; return front; } @@ -641,7 +641,7 @@ public: inline PropertyAssignmentList *finish () { PropertyAssignmentList *front = next; - next = 0; + next = nullptr; return front; } @@ -693,7 +693,7 @@ public: }; PropertyGetterSetter(PropertyName *n, FunctionBody *b) - : PropertyAssignment(n), type(Getter), formals(0), functionBody (b) + : PropertyAssignment(n), type(Getter), formals(nullptr), functionBody (b) { kind = K; } PropertyGetterSetter(PropertyName *n, FormalParameterList *f, FunctionBody *b) @@ -917,7 +917,7 @@ public: inline ArgumentList *finish () { ArgumentList *front = next; - next = 0; + next = nullptr; return front; } @@ -1281,7 +1281,7 @@ public: inline StatementList *finish () { StatementList *front = next; - next = 0; + next = nullptr; return front; } @@ -1377,9 +1377,9 @@ public: inline VariableDeclarationList *finish(VariableDeclaration::VariableScope s) { VariableDeclarationList *front = next; - next = 0; + next = nullptr; VariableDeclarationList *vdl; - for (vdl = front; vdl != 0; vdl = vdl->next) { + for (vdl = front; vdl != nullptr; vdl = vdl->next) { vdl->declaration->scope = s; } return front; @@ -1436,7 +1436,7 @@ class QML_PARSER_EXPORT IfStatement: public Statement public: QQMLJS_DECLARE_AST_NODE(IfStatement) - IfStatement(ExpressionNode *e, Statement *t, Statement *f = 0): + IfStatement(ExpressionNode *e, Statement *t, Statement *f = nullptr): expression (e), ok (t), ko (f) { kind = K; } @@ -1727,7 +1727,7 @@ class QML_PARSER_EXPORT CaseBlock: public Node public: QQMLJS_DECLARE_AST_NODE(CaseBlock) - CaseBlock(CaseClauses *c, DefaultClause *d = 0, CaseClauses *r = 0): + CaseBlock(CaseClauses *c, DefaultClause *d = nullptr, CaseClauses *r = nullptr): clauses (c), defaultClause (d), moreClauses (r) { kind = K; } @@ -1824,7 +1824,7 @@ public: inline CaseClauses *finish () { CaseClauses *front = next; - next = 0; + next = nullptr; return front; } @@ -1960,11 +1960,11 @@ public: { kind = K; } TryStatement(Statement *stmt, Finally *f): - statement (stmt), catchExpression (0), finallyExpression (f) + statement (stmt), catchExpression (nullptr), finallyExpression (f) { kind = K; } TryStatement(Statement *stmt, Catch *c): - statement (stmt), catchExpression (c), finallyExpression (0) + statement (stmt), catchExpression (c), finallyExpression (nullptr) { kind = K; } void accept0(Visitor *visitor) override; @@ -2058,7 +2058,7 @@ public: inline FormalParameterList *finish () { FormalParameterList *front = next; - next = 0; + next = nullptr; return front; } @@ -2106,7 +2106,7 @@ public: inline SourceElements *finish () { SourceElements *front = next; - next = 0; + next = nullptr; return front; } @@ -2240,7 +2240,7 @@ public: UiQualifiedId *finish() { UiQualifiedId *head = next; - next = 0; + next = nullptr; return head; } @@ -2264,7 +2264,7 @@ public: QQMLJS_DECLARE_AST_NODE(UiImport) UiImport(const QStringRef &fileName) - : fileName(fileName), importUri(0) + : fileName(fileName), importUri(nullptr) { kind = K; } UiImport(UiQualifiedId *uri) @@ -2328,7 +2328,7 @@ public: UiObjectMemberList *finish() { UiObjectMemberList *head = next; - next = 0; + next = nullptr; return head; } @@ -2357,7 +2357,7 @@ public: UiQualifiedPragmaId *finish() { UiQualifiedPragmaId *head = next; - next = 0; + next = nullptr; return head; } @@ -2430,7 +2430,7 @@ public: UiHeaderItemList *finish() { UiHeaderItemList *head = next; - next = 0; + next = nullptr; return head; } @@ -2509,7 +2509,7 @@ public: UiArrayMemberList *finish() { UiArrayMemberList *head = next; - next = 0; + next = nullptr; return head; } @@ -2570,7 +2570,7 @@ public: inline UiParameterList *finish () { UiParameterList *front = next; - next = 0; + next = nullptr; return front; } @@ -2590,13 +2590,13 @@ public: UiPublicMember(UiQualifiedId *memberType, const QStringRef &name) - : type(Property), memberType(memberType), name(name), statement(0), binding(0), isDefaultMember(false), isReadonlyMember(false), parameters(0) + : type(Property), memberType(memberType), name(name), statement(nullptr), binding(nullptr), isDefaultMember(false), isReadonlyMember(false), parameters(nullptr) { kind = K; } UiPublicMember(UiQualifiedId *memberType, const QStringRef &name, Statement *statement) - : type(Property), memberType(memberType), name(name), statement(statement), binding(0), isDefaultMember(false), isReadonlyMember(false), parameters(0) + : type(Property), memberType(memberType), name(name), statement(statement), binding(nullptr), isDefaultMember(false), isReadonlyMember(false), parameters(nullptr) { kind = K; } void accept0(Visitor *visitor) override; @@ -2825,7 +2825,7 @@ public: UiEnumMemberList *finish() { UiEnumMemberList *head = next; - next = 0; + next = nullptr; return head; } diff --git a/src/qml/parser/qqmljsengine_p.cpp b/src/qml/parser/qqmljsengine_p.cpp index 7a6d9c3826..b4f0debf85 100644 --- a/src/qml/parser/qqmljsengine_p.cpp +++ b/src/qml/parser/qqmljsengine_p.cpp @@ -120,7 +120,7 @@ double integerFromString(const QString &str, int radix) Engine::Engine() - : _lexer(0), _directives(0) + : _lexer(nullptr), _directives(nullptr) { } Engine::~Engine() diff --git a/src/qml/parser/qqmljsgrammar.cpp b/src/qml/parser/qqmljsgrammar.cpp index f345990ff9..2aaeb385e3 100644 --- a/src/qml/parser/qqmljsgrammar.cpp +++ b/src/qml/parser/qqmljsgrammar.cpp @@ -49,11 +49,11 @@ const char *const QQmlJSGrammar::spell [] = { "if", "in", "instanceof", "{", "[", "<=", "(", "<", "<<", "<<=", "-", "-=", "--", "new", "!", "!=", "!==", "numeric literal", "|", "|=", "||", "+", "+=", "++", "?", "}", "]", "%", "%=", "return", - ")", ";", 0, "*", "*=", "string literal", "property", "signal", "readonly", "switch", + ")", ";", nullptr, "*", "*=", "string literal", "property", "signal", "readonly", "switch", "this", "throw", "~", "try", "typeof", "var", "void", "while", "with", "^", "^=", "null", "true", "false", "const", "let", "debugger", "reserved word", "multiline string literal", "comment", - 0, "enum", "public", "import", "pragma", "as", "on", "get", "set", 0, - 0, 0, 0, 0, 0, 0, 0, 0 + nullptr, "enum", "public", "import", "pragma", "as", "on", "get", "set", nullptr, + nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr }; const short QQmlJSGrammar::lhs [] = { diff --git a/src/qml/parser/qqmljslexer.cpp b/src/qml/parser/qqmljslexer.cpp index bf56307e39..aab9025a08 100644 --- a/src/qml/parser/qqmljslexer.cpp +++ b/src/qml/parser/qqmljslexer.cpp @@ -85,11 +85,11 @@ static inline QChar convertUnicode(QChar c1, QChar c2, QChar c3, QChar c4) Lexer::Lexer(Engine *engine) : _engine(engine) - , _codePtr(0) - , _endPtr(0) - , _lastLinePtr(0) - , _tokenLinePtr(0) - , _tokenStartPtr(0) + , _codePtr(nullptr) + , _endPtr(nullptr) + , _lastLinePtr(nullptr) + , _tokenLinePtr(nullptr) + , _tokenStartPtr(nullptr) , _char(QLatin1Char('\n')) , _errorCode(NoError) , _currentLineNumber(0) @@ -589,7 +589,7 @@ again: chars.append('\0'); const char *begin = chars.constData(); - const char *end = 0; + const char *end = nullptr; bool ok = false; _tokenValue = qstrtod(begin, &end, &ok); @@ -915,7 +915,7 @@ int Lexer::scanNumber(QChar ch) scanChar(); } buf.append('\0'); - _tokenValue = strtod(buf.constData(), 0); + _tokenValue = strtod(buf.constData(), nullptr); return T_NUMERIC_LITERAL; } } else if (_char.isDigit() && !qmlMode()) { @@ -1010,7 +1010,7 @@ int Lexer::scanNumber(QChar ch) chars.append('\0'); const char *begin = chars.constData(); - const char *end = 0; + const char *end = nullptr; bool ok = false; _tokenValue = qstrtod(begin, &end, &ok); diff --git a/src/qml/parser/qqmljsmemorypool_p.h b/src/qml/parser/qqmljsmemorypool_p.h index 536f5d4239..5682d66f45 100644 --- a/src/qml/parser/qqmljsmemorypool_p.h +++ b/src/qml/parser/qqmljsmemorypool_p.h @@ -72,11 +72,11 @@ class QML_PARSER_EXPORT MemoryPool : public QSharedData public: MemoryPool() - : _blocks(0), + : _blocks(nullptr), _allocatedBlocks(0), _blockCount(-1), - _ptr(0), - _end(0) + _ptr(nullptr), + _end(nullptr) { } ~MemoryPool() @@ -105,7 +105,7 @@ public: void reset() { _blockCount = -1; - _ptr = _end = 0; + _ptr = _end = nullptr; } template <typename Tp> Tp *New() { return new (this->allocate(sizeof(Tp))) Tp(); } @@ -125,7 +125,7 @@ private: Q_CHECK_PTR(_blocks); for (int index = _blockCount; index < _allocatedBlocks; ++index) - _blocks[index] = 0; + _blocks[index] = nullptr; } char *&block = _blocks[_blockCount]; diff --git a/src/qml/parser/qqmljsparser.cpp b/src/qml/parser/qqmljsparser.cpp index df16a24bcc..f1beec6387 100644 --- a/src/qml/parser/qqmljsparser.cpp +++ b/src/qml/parser/qqmljsparser.cpp @@ -87,14 +87,14 @@ Parser::Parser(Engine *engine): pool(engine->pool()), tos(0), stack_size(0), - sym_stack(0), - state_stack(0), - location_stack(0), - string_stack(0), - program(0), + sym_stack(nullptr), + state_stack(nullptr), + location_stack(nullptr), + string_stack(nullptr), + program(nullptr), yylval(0), - first_token(0), - last_token(0) + first_token(nullptr), + last_token(nullptr) { } @@ -143,7 +143,7 @@ AST::UiQualifiedId *Parser::reparseAsQualifiedId(AST::ExpressionNode *expr) return currentId->finish(); } - return 0; + return nullptr; } AST::UiQualifiedPragmaId *Parser::reparseAsQualifiedPragmaId(AST::ExpressionNode *expr) @@ -155,7 +155,7 @@ AST::UiQualifiedPragmaId *Parser::reparseAsQualifiedPragmaId(AST::ExpressionNode return q->finish(); } - return 0; + return nullptr; } @@ -188,7 +188,7 @@ bool Parser::parse(int startToken) } tos = -1; - program = 0; + program = nullptr; do { if (++tos == stack_size) @@ -315,7 +315,7 @@ case 24: { } break; case 25: { - AST::UiPragma *node = 0; + AST::UiPragma *node = nullptr; if (AST::UiQualifiedPragmaId *qualifiedId = reparseAsQualifiedPragmaId(sym(2).Expression)) { node = new (pool) AST::UiPragma(qualifiedId); @@ -334,7 +334,7 @@ case 25: { } break; case 26: { - AST::UiImport *node = 0; + AST::UiImport *node = nullptr; if (AST::StringLiteral *importIdLiteral = AST::cast<AST::StringLiteral *>(sym(2).Expression)) { node = new (pool) AST::UiImport(importIdLiteral->value); @@ -357,7 +357,7 @@ case 26: { } break; case 27: { - sym(1).Node = 0; + sym(1).Node = nullptr; } break; case 28: { @@ -386,7 +386,7 @@ case 32: { } break; case 33: { - AST::UiObjectInitializer *node = new (pool) AST::UiObjectInitializer((AST::UiObjectMemberList*)0); + AST::UiObjectInitializer *node = new (pool) AST::UiObjectInitializer((AST::UiObjectMemberList*)nullptr); node->lbraceToken = loc(1); node->rbraceToken = loc(2); sym(1).Node = node; @@ -462,7 +462,7 @@ case 51: { } break; case 52: { - sym(1).Node = 0; + sym(1).Node = nullptr; } break; case 53: { @@ -594,7 +594,7 @@ case 71: { AST::UiQualifiedId *propertyName = new (pool) AST::UiQualifiedId(stringRef(6)); propertyName->identifierToken = loc(6); - propertyName->next = 0; + propertyName->next = nullptr; AST::UiArrayBinding *binding = new (pool) AST::UiArrayBinding( propertyName, sym(9).UiArrayMemberList->finish()); @@ -616,7 +616,7 @@ case 72: { AST::UiQualifiedId *propertyName = new (pool) AST::UiQualifiedId(stringRef(3)); propertyName->identifierToken = loc(3); - propertyName->next = 0; + propertyName->next = nullptr; AST::UiObjectBinding *binding = new (pool) AST::UiObjectBinding( propertyName, sym(5).UiQualifiedId, sym(6).UiObjectInitializer); @@ -638,7 +638,7 @@ case 73: { AST::UiQualifiedId *propertyName = new (pool) AST::UiQualifiedId(stringRef(4)); propertyName->identifierToken = loc(4); - propertyName->next = 0; + propertyName->next = nullptr; AST::UiObjectBinding *binding = new (pool) AST::UiObjectBinding( propertyName, sym(6).UiQualifiedId, sym(7).UiObjectInitializer); @@ -770,7 +770,7 @@ case 97: { } break; case 98: { - AST::ArrayLiteral *node = new (pool) AST::ArrayLiteral((AST::Elision *) 0); + AST::ArrayLiteral *node = new (pool) AST::ArrayLiteral((AST::Elision *) nullptr); node->lbracketToken = loc(1); node->rbracketToken = loc(2); sym(1).Node = node; @@ -792,7 +792,7 @@ case 100: { case 101: { AST::ArrayLiteral *node = new (pool) AST::ArrayLiteral(sym(2).ElementList->finish (), - (AST::Elision *) 0); + (AST::Elision *) nullptr); node->lbracketToken = loc(1); node->commaToken = loc(3); node->rbracketToken = loc(4); @@ -809,7 +809,7 @@ case 102: { } break; case 103: { - AST::ObjectLiteral *node = 0; + AST::ObjectLiteral *node = nullptr; if (sym(2).Node) node = new (pool) AST::ObjectLiteral( sym(2).PropertyAssignmentList->finish ()); @@ -846,7 +846,7 @@ case 106: { if (AST::UiQualifiedId *qualifiedId = reparseAsQualifiedId(sym(1).Expression)) { sym(1).UiQualifiedId = qualifiedId; } else { - sym(1).UiQualifiedId = 0; + sym(1).UiQualifiedId = nullptr; diagnostic_messages.append(DiagnosticMessage(DiagnosticMessage::Error, loc(1), QLatin1String("Expected a qualified name id"))); @@ -856,7 +856,7 @@ case 106: { } break; case 107: { - sym(1).Node = new (pool) AST::ElementList((AST::Elision *) 0, sym(1).Expression); + sym(1).Node = new (pool) AST::ElementList((AST::Elision *) nullptr, sym(1).Expression); } break; case 108: { @@ -865,7 +865,7 @@ case 108: { case 109: { AST::ElementList *node = new (pool) AST::ElementList(sym(1).ElementList, - (AST::Elision *) 0, sym(3).Expression); + (AST::Elision *) nullptr, sym(3).Expression); node->commaToken = loc(2); sym(1).Node = node; } break; @@ -1010,7 +1010,7 @@ case 167: { } break; case 168: { - sym(1).Node = 0; + sym(1).Node = nullptr; } break; case 169: { @@ -1437,7 +1437,7 @@ case 262: { } break; case 263: { - sym(1).Node = 0; + sym(1).Node = nullptr; } break; case 266: { @@ -1447,7 +1447,7 @@ case 266: { } break; case 267: { - sym(1).Node = 0; + sym(1).Node = nullptr; } break; case 284: { @@ -1466,7 +1466,7 @@ case 286: { } break; case 287: { - sym(1).Node = 0; + sym(1).Node = nullptr; } break; case 288: { @@ -1537,7 +1537,7 @@ case 300: { } break; case 301: { - sym(1).Node = 0; + sym(1).Node = nullptr; } break; case 303: { @@ -1546,7 +1546,7 @@ case 303: { } break; case 304: { - sym(1).Node = 0; + sym(1).Node = nullptr; } break; case 306: { @@ -1718,7 +1718,7 @@ case 334: { } break; case 335: { - sym(1).Node = 0; + sym(1).Node = nullptr; } break; case 336: { @@ -1840,7 +1840,7 @@ case 354: { } break; case 355: { - sym(1).Node = 0; + sym(1).Node = nullptr; } break; case 356: { @@ -1848,7 +1848,7 @@ case 356: { } break; case 357: { - sym(1).Node = 0; + sym(1).Node = nullptr; } break; case 359: { @@ -1876,7 +1876,7 @@ case 365: { } break; case 366: { - sym(1).Node = 0; + sym(1).Node = nullptr; } break; } // switch diff --git a/src/qml/parser/qqmljsparser_p.h b/src/qml/parser/qqmljsparser_p.h index 9dfee70f3a..b4aecd2f08 100644 --- a/src/qml/parser/qqmljsparser_p.h +++ b/src/qml/parser/qqmljsparser_p.h @@ -146,7 +146,7 @@ public: AST::Statement *statement() const { if (! program) - return 0; + return nullptr; return program->statementCast(); } @@ -154,7 +154,7 @@ public: AST::ExpressionNode *expression() const { if (! program) - return 0; + return nullptr; return program->expressionCast(); } @@ -162,7 +162,7 @@ public: AST::UiObjectMember *uiObjectMember() const { if (! program) - return 0; + return nullptr; return program->uiObjectMemberCast(); } |