aboutsummaryrefslogtreecommitdiffstats
path: root/src/lib/corelib/parser
diff options
context:
space:
mode:
authorDenis Shienkov <denis.shienkov@gmail.com>2017-11-18 19:07:25 +0300
committerJake Petroules <jake.petroules@qt.io>2017-11-20 21:03:07 +0000
commit7494bf59c28570dcc6ed6019f979e5625956c8af (patch)
tree3fb1e7fab1d064ebda1e78ffb21b06bd83e5107f /src/lib/corelib/parser
parent95c1e81382246f5235322eeb6876f77f65b22c19 (diff)
Use nullptr to initialize the pointers
Change-Id: I59d743f585410cb5c00d36a7b6f9a3e9d696d19e Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'src/lib/corelib/parser')
-rw-r--r--src/lib/corelib/parser/qmlerror.cpp10
-rw-r--r--src/lib/corelib/parser/qmljsast.cpp8
-rw-r--r--src/lib/corelib/parser/qmljsast_p.h50
-rw-r--r--src/lib/corelib/parser/qmljsengine_p.cpp2
-rw-r--r--src/lib/corelib/parser/qmljslexer.cpp12
-rw-r--r--src/lib/corelib/parser/qmljsmemorypool_p.h10
-rw-r--r--src/lib/corelib/parser/qmljsparser.cpp52
-rw-r--r--src/lib/corelib/parser/qmljsparser_p.h6
8 files changed, 75 insertions, 75 deletions
diff --git a/src/lib/corelib/parser/qmlerror.cpp b/src/lib/corelib/parser/qmlerror.cpp
index 6556ba8a5..c6fd2e27c 100644
--- a/src/lib/corelib/parser/qmlerror.cpp
+++ b/src/lib/corelib/parser/qmlerror.cpp
@@ -94,7 +94,7 @@ QmlErrorPrivate::QmlErrorPrivate()
Creates an empty error object.
*/
QmlError::QmlError()
-: d(0)
+: d(nullptr)
{
}
@@ -102,7 +102,7 @@ QmlError::QmlError()
Creates a copy of \a other.
*/
QmlError::QmlError(const QmlError &other)
-: d(0)
+: d(nullptr)
{
*this = other;
}
@@ -114,7 +114,7 @@ QmlError &QmlError::operator=(const QmlError &other)
{
if (!other.d) {
delete d;
- d = 0;
+ d = nullptr;
} else {
if (!d) d = new QmlErrorPrivate;
d->url = other.d->url;
@@ -130,7 +130,7 @@ QmlError &QmlError::operator=(const QmlError &other)
*/
QmlError::~QmlError()
{
- delete d; d = 0;
+ delete d; d = nullptr;
}
/*!
@@ -138,7 +138,7 @@ QmlError::~QmlError()
*/
bool QmlError::isValid() const
{
- return d != 0;
+ return d != nullptr;
}
/*!
diff --git a/src/lib/corelib/parser/qmljsast.cpp b/src/lib/corelib/parser/qmljsast.cpp
index 1d0d87b2e..8c87f80b2 100644
--- a/src/lib/corelib/parser/qmljsast.cpp
+++ b/src/lib/corelib/parser/qmljsast.cpp
@@ -60,22 +60,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/lib/corelib/parser/qmljsast_p.h b/src/lib/corelib/parser/qmljsast_p.h
index 072c77521..d7b627a4b 100644
--- a/src/lib/corelib/parser/qmljsast_p.h
+++ b/src/lib/corelib/parser/qmljsast_p.h
@@ -110,10 +110,10 @@ namespace AST {
template <typename _T1, typename _T2>
_T1 cast(_T2 *ast)
{
- if (ast && ast->kind == static_cast<_T1>(0)->K)
+ if (ast && ast->kind == static_cast<_T1>(nullptr)->K)
return static_cast<_T1>(ast);
- return 0;
+ return nullptr;
}
class QML_PARSER_EXPORT Node: public Managed
@@ -448,11 +448,11 @@ public:
QMLJS_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):
@@ -481,7 +481,7 @@ public:
QMLJS_DECLARE_AST_NODE(ObjectLiteral)
ObjectLiteral():
- properties (0) { kind = K; }
+ properties (nullptr) { kind = K; }
ObjectLiteral(PropertyNameAndValueList *plist):
properties (plist) { kind = K; }
@@ -526,7 +526,7 @@ public:
inline Elision *finish ()
{
Elision *front = next;
- next = 0;
+ next = nullptr;
return front;
}
@@ -555,7 +555,7 @@ public:
inline ElementList *finish ()
{
ElementList *front = next;
- next = 0;
+ next = nullptr;
return front;
}
@@ -631,7 +631,7 @@ public:
inline PropertyNameAndValueList *finish ()
{
PropertyNameAndValueList *front = next;
- next = 0;
+ next = nullptr;
return front;
}
@@ -835,7 +835,7 @@ public:
inline ArgumentList *finish ()
{
ArgumentList *front = next;
- next = 0;
+ next = nullptr;
return front;
}
@@ -1199,7 +1199,7 @@ public:
inline StatementList *finish ()
{
StatementList *front = next;
- next = 0;
+ next = nullptr;
return front;
}
@@ -1287,10 +1287,10 @@ public:
inline VariableDeclarationList *finish (bool readOnly)
{
VariableDeclarationList *front = next;
- next = 0;
+ next = nullptr;
if (readOnly) {
VariableDeclarationList *vdl;
- for (vdl = front; vdl != 0; vdl = vdl->next)
+ for (vdl = front; vdl != nullptr; vdl = vdl->next)
vdl->declaration->readOnly = true;
}
return front;
@@ -1735,7 +1735,7 @@ public:
inline CaseClauses *finish ()
{
CaseClauses *front = next;
- next = 0;
+ next = nullptr;
return front;
}
@@ -1871,11 +1871,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; }
virtual void accept0(Visitor *visitor);
@@ -1969,7 +1969,7 @@ public:
inline FormalParameterList *finish ()
{
FormalParameterList *front = next;
- next = 0;
+ next = nullptr;
return front;
}
@@ -2017,7 +2017,7 @@ public:
inline SourceElements *finish ()
{
SourceElements *front = next;
- next = 0;
+ next = nullptr;
return front;
}
@@ -2151,7 +2151,7 @@ public:
UiQualifiedId *finish()
{
UiQualifiedId *head = next;
- next = 0;
+ next = nullptr;
return head;
}
@@ -2175,7 +2175,7 @@ public:
QMLJS_DECLARE_AST_NODE(UiImport)
UiImport(const QStringRef &fileName)
- : fileName(fileName), importUri(0)
+ : fileName(fileName), importUri(nullptr)
{ kind = K; }
UiImport(UiQualifiedId *uri)
@@ -2223,7 +2223,7 @@ public:
UiImportList *finish()
{
UiImportList *head = next;
- next = 0;
+ next = nullptr;
return head;
}
@@ -2277,7 +2277,7 @@ public:
UiObjectMemberList *finish()
{
UiObjectMemberList *head = next;
- next = 0;
+ next = nullptr;
return head;
}
@@ -2348,7 +2348,7 @@ public:
UiArrayMemberList *finish()
{
UiArrayMemberList *head = next;
- next = 0;
+ next = nullptr;
return head;
}
@@ -2409,7 +2409,7 @@ public:
inline UiParameterList *finish ()
{
UiParameterList *front = next;
- next = 0;
+ next = nullptr;
return front;
}
@@ -2429,13 +2429,13 @@ public:
UiPublicMember(const QStringRef &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(const QStringRef &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; }
virtual void accept0(Visitor *visitor);
diff --git a/src/lib/corelib/parser/qmljsengine_p.cpp b/src/lib/corelib/parser/qmljsengine_p.cpp
index 8a7b9dbc8..211743190 100644
--- a/src/lib/corelib/parser/qmljsengine_p.cpp
+++ b/src/lib/corelib/parser/qmljsengine_p.cpp
@@ -118,7 +118,7 @@ double integerFromString(const QString &str, int radix)
Engine::Engine()
- : _lexer(0), _directives(0)
+ : _lexer(nullptr), _directives(nullptr)
{ }
Engine::~Engine()
diff --git a/src/lib/corelib/parser/qmljslexer.cpp b/src/lib/corelib/parser/qmljslexer.cpp
index 43c52a474..2c96aa8cf 100644
--- a/src/lib/corelib/parser/qmljslexer.cpp
+++ b/src/lib/corelib/parser/qmljslexer.cpp
@@ -84,10 +84,10 @@ static QChar convertUnicode(QChar c1, QChar c2, QChar c3, QChar c4)
Lexer::Lexer(Engine *engine)
: _engine(engine)
- , _codePtr(0)
- , _lastLinePtr(0)
- , _tokenLinePtr(0)
- , _tokenStartPtr(0)
+ , _codePtr(nullptr)
+ , _lastLinePtr(nullptr)
+ , _tokenLinePtr(nullptr)
+ , _tokenStartPtr(nullptr)
, _char(QLatin1Char('\n'))
, _errorCode(NoError)
, _currentLineNumber(0)
@@ -455,7 +455,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);
@@ -845,7 +845,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/lib/corelib/parser/qmljsmemorypool_p.h b/src/lib/corelib/parser/qmljsmemorypool_p.h
index fa16ac409..897348712 100644
--- a/src/lib/corelib/parser/qmljsmemorypool_p.h
+++ b/src/lib/corelib/parser/qmljsmemorypool_p.h
@@ -68,11 +68,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()
@@ -101,7 +101,7 @@ public:
void reset()
{
_blockCount = -1;
- _ptr = _end = 0;
+ _ptr = _end = nullptr;
}
private:
@@ -118,7 +118,7 @@ private:
_blocks = (char **) realloc(_blocks, sizeof(char *) * _allocatedBlocks);
for (int index = _blockCount; index < _allocatedBlocks; ++index)
- _blocks[index] = 0;
+ _blocks[index] = nullptr;
}
char *&block = _blocks[_blockCount];
diff --git a/src/lib/corelib/parser/qmljsparser.cpp b/src/lib/corelib/parser/qmljsparser.cpp
index 963631b7d..10be751a8 100644
--- a/src/lib/corelib/parser/qmljsparser.cpp
+++ b/src/lib/corelib/parser/qmljsparser.cpp
@@ -77,13 +77,13 @@ 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),
- first_token(0),
- last_token(0)
+ sym_stack(nullptr),
+ state_stack(nullptr),
+ location_stack(nullptr),
+ string_stack(nullptr),
+ program(nullptr),
+ first_token(nullptr),
+ last_token(nullptr)
{
}
@@ -132,7 +132,7 @@ AST::UiQualifiedId *Parser::reparseAsQualifiedId(AST::ExpressionNode *expr)
return currentId->finish();
}
- return 0;
+ return nullptr;
}
bool Parser::parse(int startToken)
@@ -160,7 +160,7 @@ bool Parser::parse(int startToken)
}
tos = -1;
- program = 0;
+ program = nullptr;
do {
if (++tos == stack_size)
@@ -275,7 +275,7 @@ case 19: {
} break;
case 20: {
- 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);
@@ -298,7 +298,7 @@ case 20: {
} break;
case 21: {
- sym(1).Node = 0;
+ sym(1).Node = nullptr;
} break;
case 22: {
@@ -379,7 +379,7 @@ case 41:
} break;
case 45: {
- sym(1).Node = 0;
+ sym(1).Node = nullptr;
} break;
case 46: {
@@ -497,7 +497,7 @@ case 62: {
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());
@@ -519,7 +519,7 @@ case 63: {
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);
@@ -652,7 +652,7 @@ case 85: {
} break;
case 86: {
- AST::ObjectLiteral *node = 0;
+ AST::ObjectLiteral *node = nullptr;
if (sym(2).Node)
node = new (pool) AST::ObjectLiteral(
sym(2).PropertyNameAndValueList->finish ());
@@ -689,7 +689,7 @@ case 89: {
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")));
@@ -834,7 +834,7 @@ case 147: {
} break;
case 148: {
- sym(1).Node = 0;
+ sym(1).Node = nullptr;
} break;
case 149: {
@@ -1261,7 +1261,7 @@ case 242: {
} break;
case 243: {
- sym(1).Node = 0;
+ sym(1).Node = nullptr;
} break;
case 246: {
@@ -1271,7 +1271,7 @@ case 246: {
} break;
case 247: {
- sym(1).Node = 0;
+ sym(1).Node = nullptr;
} break;
case 264: {
@@ -1290,7 +1290,7 @@ case 266: {
} break;
case 267: {
- sym(1).Node = 0;
+ sym(1).Node = nullptr;
} break;
case 268: {
@@ -1350,7 +1350,7 @@ case 279: {
} break;
case 280: {
- sym(1).Node = 0;
+ sym(1).Node = nullptr;
} break;
case 282: {
@@ -1359,7 +1359,7 @@ case 282: {
} break;
case 283: {
- sym(1).Node = 0;
+ sym(1).Node = nullptr;
} break;
case 285: {
@@ -1530,7 +1530,7 @@ case 312: {
} break;
case 313: {
- sym(1).Node = 0;
+ sym(1).Node = nullptr;
} break;
case 314: {
@@ -1649,7 +1649,7 @@ case 332: {
} break;
case 333: {
- sym(1).Node = 0;
+ sym(1).Node = nullptr;
} break;
case 334: {
@@ -1657,7 +1657,7 @@ case 334: {
} break;
case 335: {
- sym(1).Node = 0;
+ sym(1).Node = nullptr;
} break;
case 337: {
@@ -1689,7 +1689,7 @@ case 344: {
} break;
case 346: {
- sym(1).Node = 0;
+ sym(1).Node = nullptr;
} break;
} // switch
diff --git a/src/lib/corelib/parser/qmljsparser_p.h b/src/lib/corelib/parser/qmljsparser_p.h
index fde61ea11..05e22074b 100644
--- a/src/lib/corelib/parser/qmljsparser_p.h
+++ b/src/lib/corelib/parser/qmljsparser_p.h
@@ -134,7 +134,7 @@ public:
AST::Statement *statement() const
{
if (! program)
- return 0;
+ return nullptr;
return program->statementCast();
}
@@ -142,7 +142,7 @@ public:
AST::ExpressionNode *expression() const
{
if (! program)
- return 0;
+ return nullptr;
return program->expressionCast();
}
@@ -150,7 +150,7 @@ public:
AST::UiObjectMember *uiObjectMember() const
{
if (! program)
- return 0;
+ return nullptr;
return program->uiObjectMemberCast();
}