Skip to content

Commit 9b685ba

Browse files
PKEuSdanmar
PKEuS
authored and
danmar
committed
Code cleanup
1 parent 7d12951 commit 9b685ba

12 files changed

Lines changed: 6 additions & 30 deletions

‎lib/checkassignif.cpp‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -136,8 +136,11 @@ void CheckAssignIf::multiCondition()
136136
if (!_settings->isEnabled("style"))
137137
return;
138138

139-
for (const Token *tok = _tokenizer->tokens(); tok; tok = tok->next()) {
140-
if (Token::Match(tok, "if ( %var% & %num% ) {")) {
139+
const SymbolDatabase* const symbolDatabase = _tokenizer->getSymbolDatabase();
140+
141+
for (std::list<Scope>::const_iterator i = symbolDatabase->scopeList.begin(); i != symbolDatabase->scopeList.end(); ++i) {
142+
if (i->type == Scope::eIf && Token::Match(i->classDef, "if ( %var% & %num% ) {")) {
143+
const Token* const tok = i->classDef;
141144
const unsigned int varid(tok->tokAt(2)->varId());
142145
if (varid == 0)
143146
continue;

‎test/test64bit.cpp‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@ class Test64BitPortability : public TestFixture {
5151
Tokenizer tokenizer(&settings, this);
5252
std::istringstream istr(code);
5353
tokenizer.tokenize(istr, "test.cpp");
54-
tokenizer.setVarId();
5554

5655
// Check char variable usage..
5756
Check64BitPortability check64BitPortability(&tokenizer, &settings, this);

‎test/testassignif.cpp‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ class TestAssignIf : public TestFixture {
4949
Tokenizer tokenizer(&settings, this);
5050
std::istringstream istr(code);
5151
tokenizer.tokenize(istr, "test.cpp");
52-
tokenizer.setVarId();
5352
tokenizer.simplifyTokenList();
5453

5554
// Check char variable usage..

‎test/testautovariables.cpp‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,6 @@ class TestAutoVariables : public TestFixture {
5151

5252
tokenizer.simplifyTokenList();
5353

54-
// Assign variable ids
55-
tokenizer.setVarId();
56-
5754
// Check auto variables
5855
checkAutoVariables.autoVariables();
5956
checkAutoVariables.returnPointerToLocalArray();

‎test/testcharvar.cpp‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@ class TestCharVar : public TestFixture {
5454
Tokenizer tokenizer(&settings, this);
5555
std::istringstream istr(code);
5656
tokenizer.tokenize(istr, "test.cpp");
57-
tokenizer.setVarId();
5857

5958
// Check char variable usage..
6059
CheckOther checkOther(&tokenizer, &settings, this);

‎test/testmemleak.cpp‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ class TestMemleak : private TestFixture {
4848
Tokenizer tokenizer(&settings, this);
4949
std::istringstream istr(code);
5050
tokenizer.tokenize(istr, "test.cpp");
51-
tokenizer.setVarId();
5251

5352
return ((const CheckMemoryLeak *)0)->functionReturnType(tokenizer.tokens());
5453
}
@@ -132,7 +131,6 @@ class TestMemleakInFunction : public TestFixture {
132131
Tokenizer tokenizer(&settings, this);
133132
std::istringstream istr(code);
134133
tokenizer.tokenize(istr, "test.cpp");
135-
tokenizer.setVarId();
136134
tokenizer.simplifyTokenList();
137135

138136
// Check for memory leaks..
@@ -3077,7 +3075,6 @@ class TestMemleakInFunction : public TestFixture {
30773075
Tokenizer tokenizer(&settings, this);
30783076
std::istringstream istr(code);
30793077
tokenizer.tokenize(istr, "test.cpp");
3080-
tokenizer.setVarId();
30813078
tokenizer.simplifyTokenList();
30823079

30833080
// Check for memory leaks..
@@ -3784,7 +3781,6 @@ class TestMemleakInClass : public TestFixture {
37843781
Tokenizer tokenizer(&settings, this);
37853782
std::istringstream istr(code);
37863783
tokenizer.tokenize(istr, "test.cpp");
3787-
tokenizer.setVarId();
37883784
tokenizer.simplifyTokenList();
37893785

37903786
// Check for memory leaks..

‎test/testnonreentrantfunctions.cpp‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,6 @@ class TestNonReentrantFunctions : public TestFixture {
5151
tokenizer.tokenize(istr, "test.cpp");
5252
tokenizer.simplifyTokenList();
5353

54-
// Assign variable ids
55-
tokenizer.setVarId();
56-
5754
// Check for non reentrant functions..
5855
CheckNonReentrantFunctions checkNonReentrantFunctions(&tokenizer, &settings, this);
5956
checkNonReentrantFunctions.nonReentrantFunctions();

‎test/testobsoletefunctions.cpp‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ class TestObsoleteFunctions : public TestFixture {
3838
TEST_CASE(testgethostbyaddr);
3939
TEST_CASE(testusleep);
4040
TEST_CASE(testindex);
41-
TEST_CASE(test_qt_index); // FP when using the Qt function 'index'?
41+
TEST_CASE(test_qt_index); // FP when using the Qt function 'index'?
4242
TEST_CASE(testrindex);
4343

4444
// no false positives for variables
@@ -83,9 +83,6 @@ class TestObsoleteFunctions : public TestFixture {
8383
tokenizer.tokenize(istr, "test.cpp");
8484
tokenizer.simplifyTokenList();
8585

86-
// Assign variable ids
87-
tokenizer.setVarId();
88-
8986
// Check for obsolete functions..
9087
CheckObsoleteFunctions checkObsoleteFunctions(&tokenizer, &settings, this);
9188
checkObsoleteFunctions.obsoleteFunctions();

‎test/testother.cpp‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -371,7 +371,6 @@ class TestOther : public TestFixture {
371371
Tokenizer tokenizer(&settings, this);
372372
std::istringstream istr(code);
373373
tokenizer.tokenize(istr, "test.cpp");
374-
tokenizer.setVarId();
375374

376375
//tokenizer.tokens()->printOut( "tokens" );
377376

@@ -437,7 +436,6 @@ class TestOther : public TestFixture {
437436
Tokenizer tokenizer(&settings, this);
438437
std::istringstream istr(code);
439438
tokenizer.tokenize(istr, "test.cpp");
440-
tokenizer.setVarId();
441439

442440
// Check for redundant code..
443441
CheckOther checkOther(&tokenizer, &settings, this);
@@ -718,12 +716,10 @@ class TestOther : public TestFixture {
718716
Tokenizer tokenizerCpp(&settings, this);
719717
std::istringstream istr(code);
720718
tokenizerCpp.tokenize(istr, "test.cpp");
721-
tokenizerCpp.setVarId();
722719

723720
Tokenizer tokenizerC(&settings, this);
724721
std::istringstream istr2(code);
725722
tokenizerC.tokenize(istr2, "test.c");
726-
tokenizerC.setVarId();
727723

728724
CheckOther checkOtherCpp(&tokenizerCpp, &settings, this);
729725
checkOtherCpp.warningOldStylePointerCast();

‎test/testpostfixoperator.cpp‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,6 @@ class TestPostfixOperator : public TestFixture {
4848
tokenizer.tokenize(istr, "test.cpp");
4949
tokenizer.simplifyTokenList();
5050

51-
// Assign variable ids
52-
tokenizer.setVarId();
53-
5451
// Check for postfix operators..
5552
CheckPostfixOperator checkPostfixOperator(&tokenizer, &settings, this);
5653
checkPostfixOperator.postfixOperator();

0 commit comments

Comments
 (0)