Skip to content

Commit 79ffe1d

Browse files
danmardanmar
committed
Rename _tokenizer, _settings, _errorLogger
1 parent 8209c4a commit 79ffe1d

40 files changed

Lines changed: 1013 additions & 1013 deletions

‎lib/check.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
//---------------------------------------------------------------------------
2626

2727
Check::Check(const std::string &aname)
28-
: _tokenizer(nullptr), _settings(nullptr), _errorLogger(nullptr), _name(aname)
28+
: mTokenizer(nullptr), mSettings(nullptr), mErrorLogger(nullptr), _name(aname)
2929
{
3030
for (std::list<Check*>::iterator i = instances().begin(); i != instances().end(); ++i) {
3131
if ((*i)->name() > aname) {

‎lib/check.h‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -52,11 +52,11 @@ class CPPCHECKLIB Check {
5252

5353
/** This constructor is used when running checks. */
5454
Check(const std::string &aname, const Tokenizer *tokenizer, const Settings *settings, ErrorLogger *errorLogger)
55-
: _tokenizer(tokenizer), _settings(settings), _errorLogger(errorLogger), _name(aname) {
55+
: mTokenizer(tokenizer), mSettings(settings), mErrorLogger(errorLogger), _name(aname) {
5656
}
5757

5858
virtual ~Check() {
59-
if (!_tokenizer)
59+
if (!mTokenizer)
6060
instances().remove(this);
6161
}
6262

@@ -118,9 +118,9 @@ class CPPCHECKLIB Check {
118118
}
119119

120120
protected:
121-
const Tokenizer * const _tokenizer;
122-
const Settings * const _settings;
123-
ErrorLogger * const _errorLogger;
121+
const Tokenizer * const mTokenizer;
122+
const Settings * const mSettings;
123+
ErrorLogger * const mErrorLogger;
124124

125125
/** report an error */
126126
template<typename T, typename U>
@@ -144,17 +144,17 @@ class CPPCHECKLIB Check {
144144
/** report an error */
145145
template<typename T, typename U>
146146
void reportError(const std::list<const Token *> &callstack, Severity::SeverityType severity, const T id, const U msg, const CWE &cwe, bool inconclusive) {
147-
const ErrorLogger::ErrorMessage errmsg(callstack, _tokenizer ? &_tokenizer->list : nullptr, severity, id, msg, cwe, inconclusive);
148-
if (_errorLogger)
149-
_errorLogger->reportErr(errmsg);
147+
const ErrorLogger::ErrorMessage errmsg(callstack, mTokenizer ? &mTokenizer->list : nullptr, severity, id, msg, cwe, inconclusive);
148+
if (mErrorLogger)
149+
mErrorLogger->reportErr(errmsg);
150150
else
151151
reportError(errmsg);
152152
}
153153

154154
void reportError(const ErrorPath &errorPath, Severity::SeverityType severity, const char id[], const std::string &msg, const CWE &cwe, bool inconclusive) {
155-
const ErrorLogger::ErrorMessage errmsg(errorPath, _tokenizer ? &_tokenizer->list : nullptr, severity, id, msg, cwe, inconclusive);
156-
if (_errorLogger)
157-
_errorLogger->reportErr(errmsg);
155+
const ErrorLogger::ErrorMessage errmsg(errorPath, mTokenizer ? &mTokenizer->list : nullptr, severity, id, msg, cwe, inconclusive);
156+
if (mErrorLogger)
157+
mErrorLogger->reportErr(errmsg);
158158
else
159159
reportError(errmsg);
160160
}
@@ -163,7 +163,7 @@ class CPPCHECKLIB Check {
163163
ErrorPath errorPath;
164164
if (!value) {
165165
errorPath.emplace_back(errtok,bug);
166-
} else if (_settings->verbose || _settings->xml || !_settings->templateLocation.empty()) {
166+
} else if (mSettings->verbose || mSettings->xml || !mSettings->templateLocation.empty()) {
167167
errorPath = value->errorPath;
168168
errorPath.emplace_back(errtok,bug);
169169
} else {

‎lib/check64bit.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,10 @@ namespace {
4343

4444
void Check64BitPortability::pointerassignment()
4545
{
46-
if (!_settings->isEnabled(Settings::PORTABILITY))
46+
if (!mSettings->isEnabled(Settings::PORTABILITY))
4747
return;
4848

49-
const SymbolDatabase *symbolDatabase = _tokenizer->getSymbolDatabase();
49+
const SymbolDatabase *symbolDatabase = mTokenizer->getSymbolDatabase();
5050

5151
// Check return values
5252
for (const Scope * scope : symbolDatabase->functionScopes) {

‎lib/checkassert.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,10 @@ namespace {
4141

4242
void CheckAssert::assertWithSideEffects()
4343
{
44-
if (!_settings->isEnabled(Settings::WARNING))
44+
if (!mSettings->isEnabled(Settings::WARNING))
4545
return;
4646

47-
for (const Token* tok = _tokenizer->list.front(); tok; tok = tok->next()) {
47+
for (const Token* tok = mTokenizer->list.front(); tok; tok = tok->next()) {
4848
if (!Token::simpleMatch(tok, "assert ("))
4949
continue;
5050

‎lib/checkautovariables.cpp‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -179,12 +179,12 @@ static bool variableIsUsedInScope(const Token* start, unsigned int varId, const
179179

180180
void CheckAutoVariables::assignFunctionArg()
181181
{
182-
const bool printStyle = _settings->isEnabled(Settings::STYLE);
183-
const bool printWarning = _settings->isEnabled(Settings::WARNING);
182+
const bool printStyle = mSettings->isEnabled(Settings::STYLE);
183+
const bool printWarning = mSettings->isEnabled(Settings::WARNING);
184184
if (!printStyle && !printWarning)
185185
return;
186186

187-
const SymbolDatabase *symbolDatabase = _tokenizer->getSymbolDatabase();
187+
const SymbolDatabase *symbolDatabase = mTokenizer->getSymbolDatabase();
188188
for (const Scope * scope : symbolDatabase->functionScopes) {
189189
for (const Token *tok = scope->bodyStart; tok && tok != scope->bodyEnd; tok = tok->next()) {
190190
// TODO: What happens if this is removed?
@@ -224,8 +224,8 @@ static bool reassignedGlobalPointer(const Token *vartok, unsigned int pointerVar
224224

225225
void CheckAutoVariables::autoVariables()
226226
{
227-
const bool printInconclusive = _settings->inconclusive;
228-
const SymbolDatabase *symbolDatabase = _tokenizer->getSymbolDatabase();
227+
const bool printInconclusive = mSettings->inconclusive;
228+
const SymbolDatabase *symbolDatabase = mTokenizer->getSymbolDatabase();
229229
for (const Scope * scope : symbolDatabase->functionScopes) {
230230
for (const Token *tok = scope->bodyStart; tok && tok != scope->bodyEnd; tok = tok->next()) {
231231
// Critical assignment
@@ -235,7 +235,7 @@ void CheckAutoVariables::autoVariables()
235235
} else if (Token::Match(tok, "[;{}] * %var% = & %var%") && isPtrArg(tok->tokAt(2)) && isAutoVar(tok->tokAt(5))) {
236236
if (checkRvalueExpression(tok->tokAt(5)))
237237
errorAutoVariableAssignment(tok->next(), false);
238-
} else if (_settings->isEnabled(Settings::WARNING) && Token::Match(tok, "[;{}] %var% = &| %var% ;") && isGlobalPtr(tok->next())) {
238+
} else if (mSettings->isEnabled(Settings::WARNING) && Token::Match(tok, "[;{}] %var% = &| %var% ;") && isGlobalPtr(tok->next())) {
239239
const Token * const pointer = tok->next();
240240
if (isAutoVarArray(tok->tokAt(3))) {
241241
const Token * const array = tok->tokAt(3);
@@ -281,7 +281,7 @@ void CheckAutoVariables::autoVariables()
281281
for (std::list<ValueFlow::Value>::const_iterator it = values.begin(); it != values.end(); ++it) {
282282
if (!it->isTokValue())
283283
continue;
284-
if (!_settings->inconclusive && it->isInconclusive())
284+
if (!mSettings->inconclusive && it->isInconclusive())
285285
continue;
286286
if (!Token::Match(it->tokvalue->previous(), "= & %var%"))
287287
continue;
@@ -306,13 +306,13 @@ void CheckAutoVariables::autoVariables()
306306
}
307307
}
308308
// Invalid pointer deallocation
309-
else if ((Token::Match(tok, "%name% ( %var% ) ;") && _settings->library.dealloc(tok)) ||
310-
(_tokenizer->isCPP() && Token::Match(tok, "delete [| ]| (| %var% !!["))) {
309+
else if ((Token::Match(tok, "%name% ( %var% ) ;") && mSettings->library.dealloc(tok)) ||
310+
(mTokenizer->isCPP() && Token::Match(tok, "delete [| ]| (| %var% !!["))) {
311311
tok = Token::findmatch(tok->next(), "%var%");
312312
if (isAutoVarArray(tok))
313313
errorInvalidDeallocation(tok);
314-
} else if ((Token::Match(tok, "%name% ( & %var% ) ;") && _settings->library.dealloc(tok)) ||
315-
(_tokenizer->isCPP() && Token::Match(tok, "delete [| ]| (| & %var% !!["))) {
314+
} else if ((Token::Match(tok, "%name% ( & %var% ) ;") && mSettings->library.dealloc(tok)) ||
315+
(mTokenizer->isCPP() && Token::Match(tok, "delete [| ]| (| & %var% !!["))) {
316316
tok = Token::findmatch(tok->next(), "%var%");
317317
if (isAutoVar(tok))
318318
errorInvalidDeallocation(tok);
@@ -325,7 +325,7 @@ void CheckAutoVariables::autoVariables()
325325

326326
void CheckAutoVariables::returnPointerToLocalArray()
327327
{
328-
const SymbolDatabase *symbolDatabase = _tokenizer->getSymbolDatabase();
328+
const SymbolDatabase *symbolDatabase = mTokenizer->getSymbolDatabase();
329329

330330
for (const Scope * scope : symbolDatabase->functionScopes) {
331331
if (!scope->function)
@@ -506,10 +506,10 @@ static bool astHasAutoResult(const Token *tok)
506506

507507
void CheckAutoVariables::returnReference()
508508
{
509-
if (_tokenizer->isC())
509+
if (mTokenizer->isC())
510510
return;
511511

512-
const SymbolDatabase *symbolDatabase = _tokenizer->getSymbolDatabase();
512+
const SymbolDatabase *symbolDatabase = mTokenizer->getSymbolDatabase();
513513

514514
for (const Scope * scope : symbolDatabase->functionScopes) {
515515
if (!scope->function)

‎lib/checkbool.cpp‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -54,10 +54,10 @@ static bool isNonBoolStdType(const Variable* var)
5454
//---------------------------------------------------------------------------
5555
void CheckBool::checkIncrementBoolean()
5656
{
57-
if (!_settings->isEnabled(Settings::STYLE))
57+
if (!mSettings->isEnabled(Settings::STYLE))
5858
return;
5959

60-
const SymbolDatabase *symbolDatabase = _tokenizer->getSymbolDatabase();
60+
const SymbolDatabase *symbolDatabase = mTokenizer->getSymbolDatabase();
6161
for (const Scope * scope : symbolDatabase->functionScopes) {
6262
for (const Token* tok = scope->bodyStart->next(); tok != scope->bodyEnd; tok = tok->next()) {
6363
if (Token::Match(tok, "%var% ++")) {
@@ -87,15 +87,15 @@ void CheckBool::incrementBooleanError(const Token *tok)
8787
//---------------------------------------------------------------------------
8888
void CheckBool::checkBitwiseOnBoolean()
8989
{
90-
if (!_settings->isEnabled(Settings::STYLE))
90+
if (!mSettings->isEnabled(Settings::STYLE))
9191
return;
9292

9393
// danmar: this is inconclusive because I don't like that there are
9494
// warnings for calculations. Example: set_flag(a & b);
95-
if (!_settings->inconclusive)
95+
if (!mSettings->inconclusive)
9696
return;
9797

98-
const SymbolDatabase *symbolDatabase = _tokenizer->getSymbolDatabase();
98+
const SymbolDatabase *symbolDatabase = mTokenizer->getSymbolDatabase();
9999
for (const Scope * scope : symbolDatabase->functionScopes) {
100100
for (const Token* tok = scope->bodyStart->next(); tok != scope->bodyEnd; tok = tok->next()) {
101101
if (Token::Match(tok, "(|.|return|&&|%oror%|throw|, %var% [&|]")) {
@@ -129,10 +129,10 @@ void CheckBool::bitwiseOnBooleanError(const Token *tok, const std::string &varna
129129

130130
void CheckBool::checkComparisonOfBoolWithInt()
131131
{
132-
if (!_settings->isEnabled(Settings::WARNING) || !_tokenizer->isCPP())
132+
if (!mSettings->isEnabled(Settings::WARNING) || !mTokenizer->isCPP())
133133
return;
134134

135-
const SymbolDatabase* const symbolDatabase = _tokenizer->getSymbolDatabase();
135+
const SymbolDatabase* const symbolDatabase = mTokenizer->getSymbolDatabase();
136136
for (const Scope * scope : symbolDatabase->functionScopes) {
137137
for (const Token* tok = scope->bodyStart->next(); tok != scope->bodyEnd; tok = tok->next()) {
138138
const Token* const left = tok->astOperand1();
@@ -178,13 +178,13 @@ static bool tokenIsFunctionReturningBool(const Token* tok)
178178

179179
void CheckBool::checkComparisonOfFuncReturningBool()
180180
{
181-
if (!_settings->isEnabled(Settings::STYLE))
181+
if (!mSettings->isEnabled(Settings::STYLE))
182182
return;
183183

184-
if (!_tokenizer->isCPP())
184+
if (!mTokenizer->isCPP())
185185
return;
186186

187-
const SymbolDatabase * const symbolDatabase = _tokenizer->getSymbolDatabase();
187+
const SymbolDatabase * const symbolDatabase = mTokenizer->getSymbolDatabase();
188188

189189
for (const Scope * scope : symbolDatabase->functionScopes) {
190190
for (const Token* tok = scope->bodyStart->next(); tok != scope->bodyEnd; tok = tok->next()) {
@@ -237,16 +237,16 @@ void CheckBool::checkComparisonOfBoolWithBool()
237237
{
238238
// FIXME: This checking is "experimental" because of the false positives
239239
// when self checking lib/tokenize.cpp (#2617)
240-
if (!_settings->experimental)
240+
if (!mSettings->experimental)
241241
return;
242242

243-
if (!_settings->isEnabled(Settings::STYLE))
243+
if (!mSettings->isEnabled(Settings::STYLE))
244244
return;
245245

246-
if (!_tokenizer->isCPP())
246+
if (!mTokenizer->isCPP())
247247
return;
248248

249-
const SymbolDatabase* const symbolDatabase = _tokenizer->getSymbolDatabase();
249+
const SymbolDatabase* const symbolDatabase = mTokenizer->getSymbolDatabase();
250250

251251
for (const Scope * scope : symbolDatabase->functionScopes) {
252252
for (const Token* tok = scope->bodyStart->next(); tok != scope->bodyEnd; tok = tok->next()) {
@@ -289,7 +289,7 @@ void CheckBool::comparisonOfBoolWithBoolError(const Token *tok, const std::strin
289289
//-----------------------------------------------------------------------------
290290
void CheckBool::checkAssignBoolToPointer()
291291
{
292-
const SymbolDatabase *symbolDatabase = _tokenizer->getSymbolDatabase();
292+
const SymbolDatabase *symbolDatabase = mTokenizer->getSymbolDatabase();
293293
for (const Scope * scope : symbolDatabase->functionScopes) {
294294
for (const Token* tok = scope->bodyStart; tok != scope->bodyEnd; tok = tok->next()) {
295295
if (tok->str() == "=" && astIsBool(tok->astOperand2())) {
@@ -315,10 +315,10 @@ void CheckBool::assignBoolToPointerError(const Token *tok)
315315
//-----------------------------------------------------------------------------
316316
void CheckBool::checkComparisonOfBoolExpressionWithInt()
317317
{
318-
if (!_settings->isEnabled(Settings::WARNING))
318+
if (!mSettings->isEnabled(Settings::WARNING))
319319
return;
320320

321-
const SymbolDatabase* symbolDatabase = _tokenizer->getSymbolDatabase();
321+
const SymbolDatabase* symbolDatabase = mTokenizer->getSymbolDatabase();
322322

323323
for (const Scope * scope : symbolDatabase->functionScopes) {
324324
for (const Token* tok = scope->bodyStart->next(); tok != scope->bodyEnd; tok = tok->next()) {
@@ -359,7 +359,7 @@ void CheckBool::checkComparisonOfBoolExpressionWithInt()
359359
: Token::Match(tok, ">|==|!=")))
360360
continue;
361361
comparisonOfBoolExpressionWithIntError(tok, true);
362-
} else if (isNonBoolStdType(numTok->variable()) && _tokenizer->isCPP())
362+
} else if (isNonBoolStdType(numTok->variable()) && mTokenizer->isCPP())
363363
comparisonOfBoolExpressionWithIntError(tok, false);
364364
}
365365
}
@@ -378,7 +378,7 @@ void CheckBool::comparisonOfBoolExpressionWithIntError(const Token *tok, bool n0
378378

379379
void CheckBool::pointerArithBool()
380380
{
381-
const SymbolDatabase* symbolDatabase = _tokenizer->getSymbolDatabase();
381+
const SymbolDatabase* symbolDatabase = mTokenizer->getSymbolDatabase();
382382

383383
for (const Scope &scope : symbolDatabase->scopeList) {
384384
if (scope.type != Scope::eIf && scope.type != Scope::eWhile && scope.type != Scope::eDo && scope.type != Scope::eFor)
@@ -429,11 +429,11 @@ void CheckBool::pointerArithBoolError(const Token *tok)
429429

430430
void CheckBool::checkAssignBoolToFloat()
431431
{
432-
if (!_tokenizer->isCPP())
432+
if (!mTokenizer->isCPP())
433433
return;
434-
if (!_settings->isEnabled(Settings::STYLE))
434+
if (!mSettings->isEnabled(Settings::STYLE))
435435
return;
436-
const SymbolDatabase *symbolDatabase = _tokenizer->getSymbolDatabase();
436+
const SymbolDatabase *symbolDatabase = mTokenizer->getSymbolDatabase();
437437
for (const Scope * scope : symbolDatabase->functionScopes) {
438438
for (const Token* tok = scope->bodyStart; tok != scope->bodyEnd; tok = tok->next()) {
439439
if (tok->str() == "=" && astIsBool(tok->astOperand2())) {

‎lib/checkboost.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ static const CWE CWE664(664);
3333

3434
void CheckBoost::checkBoostForeachModification()
3535
{
36-
const SymbolDatabase *symbolDatabase = _tokenizer->getSymbolDatabase();
36+
const SymbolDatabase *symbolDatabase = mTokenizer->getSymbolDatabase();
3737
for (const Scope * scope : symbolDatabase->functionScopes) {
3838
for (const Token *tok = scope->bodyStart->next(); tok && tok != scope->bodyEnd; tok = tok->next()) {
3939
if (!Token::simpleMatch(tok, "BOOST_FOREACH ("))

0 commit comments

Comments
 (0)