Skip to content

Commit 1cd7299

Browse files
firewavefirewave
authored
moved TokenList reference out of TokenFrontBack / some cleanups (danmar#7454)
1 parent b4bddb7 commit 1cd7299

File tree

10 files changed

+170
-175
lines changed

10 files changed

+170
-175
lines changed

‎lib/checkunusedfunctions.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -417,15 +417,15 @@ void CheckUnusedFunctions::unusedFunctionError(ErrorLogger& errorLogger,
417417
}
418418

419419
CheckUnusedFunctions::FunctionDecl::FunctionDecl(const Function *f)
420-
: functionName(f->name()), fileName(f->token->fileName()), lineNumber(f->token->linenr())
420+
: functionName(f->name()), fileIndex(f->token->fileIndex()), lineNumber(f->token->linenr())
421421
{}
422422

423-
std::string CheckUnusedFunctions::analyzerInfo() const
423+
std::string CheckUnusedFunctions::analyzerInfo(const Tokenizer &tokenizer) const
424424
{
425425
std::ostringstream ret;
426426
for (const FunctionDecl &functionDecl : mFunctionDecl) {
427427
ret << " <functiondecl"
428-
<< " file=\"" << ErrorLogger::toxml(functionDecl.fileName) << '\"'
428+
<< " file=\"" << ErrorLogger::toxml(tokenizer.list.getFiles()[functionDecl.fileIndex]) << '\"'
429429
<< " functionName=\"" << ErrorLogger::toxml(functionDecl.functionName) << '\"'
430430
<< " lineNumber=\"" << functionDecl.lineNumber << "\"/>\n";
431431
}

‎lib/checkunusedfunctions.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ class CPPCHECKLIB CheckUnusedFunctions {
5252
// * What functions are declared
5353
void parseTokens(const Tokenizer &tokenizer, const Settings &settings);
5454

55-
std::string analyzerInfo() const;
55+
std::string analyzerInfo(const Tokenizer &tokenizer) const;
5656

5757
static void analyseWholeProgram(const Settings &settings, ErrorLogger& errorLogger, const std::string &buildDir);
5858

@@ -86,7 +86,7 @@ class CPPCHECKLIB CheckUnusedFunctions {
8686
public:
8787
explicit FunctionDecl(const Function *f);
8888
std::string functionName;
89-
std::string fileName;
89+
nonneg int fileIndex;
9090
unsigned int lineNumber;
9191
};
9292
std::list<FunctionDecl> mFunctionDecl;

‎lib/cppcheck.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -931,7 +931,7 @@ unsigned int CppCheck::checkFile(const FileWithDetails& file, const std::string
931931

932932
std::list<ErrorMessage> errors;
933933
analyzerInformation->analyzeFile(mSettings.buildDir, file.spath(), cfgname, hash, errors);
934-
analyzerInformation->setFileInfo("CheckUnusedFunctions", mUnusedFunctionsCheck->analyzerInfo());
934+
analyzerInformation->setFileInfo("CheckUnusedFunctions", mUnusedFunctionsCheck->analyzerInfo(tokenizer));
935935
analyzerInformation->close();
936936
}
937937
}
@@ -1389,7 +1389,7 @@ void CppCheck::checkNormalTokens(const Tokenizer &tokenizer, AnalyzerInformation
13891389
}
13901390

13911391
if (mSettings.checks.isEnabled(Checks::unusedFunction) && analyzerInformation) {
1392-
analyzerInformation->setFileInfo("CheckUnusedFunctions", unusedFunctionsChecker.analyzerInfo());
1392+
analyzerInformation->setFileInfo("CheckUnusedFunctions", unusedFunctionsChecker.analyzerInfo(tokenizer));
13931393
}
13941394

13951395
#ifdef HAVE_RULES

‎lib/token.cpp‎

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -60,16 +60,17 @@ namespace {
6060
const std::list<ValueFlow::Value> TokenImpl::mEmptyValueList;
6161
const std::string Token::mEmptyString;
6262

63-
Token::Token(TokensFrontBack &tokensFrontBack)
64-
: mTokensFrontBack(tokensFrontBack)
65-
, mIsC(mTokensFrontBack.list.isC())
66-
, mIsCpp(mTokensFrontBack.list.isCPP())
63+
Token::Token(const TokenList& tokenlist, TokensFrontBack &tokensFrontBack)
64+
: mList(tokenlist)
65+
, mTokensFrontBack(tokensFrontBack)
66+
, mIsC(mList.isC())
67+
, mIsCpp(mList.isCPP())
6768
{
6869
mImpl = new TokenImpl();
6970
}
7071

7172
Token::Token(const Token* tok)
72-
: Token(const_cast<Token*>(tok)->mTokensFrontBack)
73+
: Token(tok->mList, const_cast<Token*>(tok)->mTokensFrontBack)
7374
{
7475
fileIndex(tok->fileIndex());
7576
linenr(tok->linenr());
@@ -134,7 +135,7 @@ void Token::update_property_info()
134135
else if (std::isalpha(static_cast<unsigned char>(mStr[0])) || mStr[0] == '_' || mStr[0] == '$') { // Name
135136
if (mImpl->mVarId)
136137
tokType(eVariable);
137-
else if (mTokensFrontBack.list.isKeyword(mStr)) {
138+
else if (mList.isKeyword(mStr)) {
138139
tokType(eKeyword);
139140
update_property_isStandardType();
140141
if (mTokType != eType) // cannot be a control-flow keyword when it is a type
@@ -1065,7 +1066,7 @@ Token* Token::insertToken(const std::string& tokenStr, const std::string& origin
10651066
if (mStr.empty())
10661067
newToken = this;
10671068
else
1068-
newToken = new Token(mTokensFrontBack);
1069+
newToken = new Token(mList, mTokensFrontBack);
10691070
newToken->str(tokenStr);
10701071
if (!originalNameStr.empty())
10711072
newToken->originalName(originalNameStr);
@@ -1738,7 +1739,7 @@ std::string Token::astStringZ3() const
17381739
return "(" + str() + " " + astOperand1()->astStringZ3() + " " + astOperand2()->astStringZ3() + ")";
17391740
}
17401741

1741-
void Token::printValueFlow(bool xml, std::ostream &out) const
1742+
void Token::printValueFlow(const std::vector<std::string>& files, bool xml, std::ostream &out) const
17421743
{
17431744
std::string outs;
17441745

@@ -1765,7 +1766,7 @@ void Token::printValueFlow(bool xml, std::ostream &out) const
17651766
else {
17661767
if (fileIndex != tok->fileIndex()) {
17671768
outs += "File ";
1768-
outs += tok->mTokensFrontBack.list.getFiles()[tok->fileIndex()];
1769+
outs += files[tok->fileIndex()];
17691770
outs += '\n';
17701771
line = 0;
17711772
}
@@ -2720,7 +2721,3 @@ Token* findLambdaEndScope(Token* tok)
27202721
const Token* findLambdaEndScope(const Token* tok) {
27212722
return findLambdaEndScope(const_cast<Token*>(tok));
27222723
}
2723-
2724-
const std::string& Token::fileName() const {
2725-
return mTokensFrontBack.list.getFiles()[mImpl->mFileIndex];
2726-
}

‎lib/token.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ class Variable;
5252
class ConstTokenRange;
5353
class Token;
5454
struct TokensFrontBack;
55+
class TokenList;
5556

5657
struct ScopeInfo2 {
5758
ScopeInfo2(std::string name_, const Token *bodyEnd_, std::set<std::string> usingNamespaces_ = std::set<std::string>()) : name(std::move(name_)), bodyEnd(bodyEnd_), usingNamespaces(std::move(usingNamespaces_)) {}
@@ -165,6 +166,7 @@ class CPPCHECKLIB Token {
165166
friend class TestToken;
166167

167168
private:
169+
const TokenList& mList;
168170
TokensFrontBack& mTokensFrontBack;
169171

170172
static const std::string mEmptyString;
@@ -184,7 +186,7 @@ class CPPCHECKLIB Token {
184186
eNone
185187
};
186188

187-
explicit Token(TokensFrontBack &tokensFrontBack);
189+
Token(const TokenList& tokenlist, TokensFrontBack &tokensFrontBack);
188190
// for usage in CheckIO::ArgumentInfo only
189191
explicit Token(const Token *tok);
190192
~Token();
@@ -891,8 +893,6 @@ class CPPCHECKLIB Token {
891893
static int multiCompare(const Token *tok, const char *haystack, nonneg int varid);
892894

893895
public:
894-
const std::string& fileName() const;
895-
896896
nonneg int fileIndex() const {
897897
return mImpl->mFileIndex;
898898
}
@@ -1561,7 +1561,7 @@ class CPPCHECKLIB Token {
15611561

15621562
void printAst(bool verbose, bool xml, const std::vector<std::string> &fileNames, std::ostream &out) const;
15631563

1564-
void printValueFlow(bool xml, std::ostream &out) const;
1564+
void printValueFlow(const std::vector<std::string>& files, bool xml, std::ostream &out) const;
15651565

15661566
void scopeInfo(std::shared_ptr<ScopeInfo2> newScopeInfo);
15671567
std::shared_ptr<ScopeInfo2> scopeInfo() const;

‎lib/tokenize.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5918,7 +5918,7 @@ void Tokenizer::printDebugOutput(int simplification, std::ostream &out) const
59185918
if (mSettings.verbose)
59195919
list.front()->printAst(mSettings.verbose, xml, list.getFiles(), out);
59205920

5921-
list.front()->printValueFlow(xml, out);
5921+
list.front()->printValueFlow(list.getFiles(), xml, out);
59225922

59235923
if (xml)
59245924
out << "</debug>" << std::endl;
@@ -6180,7 +6180,7 @@ void Tokenizer::dump(std::ostream &out) const
61806180
}
61816181

61826182
if (list.front())
6183-
list.front()->printValueFlow(true, out);
6183+
list.front()->printValueFlow(list.getFiles(), true, out);
61846184

61856185
outs += dumpTypedefInfo();
61866186

‎lib/tokenlist.cpp‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ static constexpr int AST_MAX_DEPTH = 150;
6161

6262

6363
TokenList::TokenList(const Settings* settings)
64-
: mTokensFrontBack(*this)
64+
: mTokensFrontBack()
6565
, mSettings(settings)
6666
{
6767
if (mSettings && (mSettings->enforcedLang != Standards::Language::None)) {
@@ -174,7 +174,7 @@ void TokenList::addtoken(const std::string& str, const nonneg int lineno, const
174174
if (mTokensFrontBack.back) {
175175
mTokensFrontBack.back->insertToken(str);
176176
} else {
177-
mTokensFrontBack.front = new Token(mTokensFrontBack);
177+
mTokensFrontBack.front = new Token(*this, mTokensFrontBack);
178178
mTokensFrontBack.back = mTokensFrontBack.front;
179179
mTokensFrontBack.back->str(str);
180180
}
@@ -192,7 +192,7 @@ void TokenList::addtoken(const std::string& str, const Token *locationTok)
192192
if (mTokensFrontBack.back) {
193193
mTokensFrontBack.back->insertToken(str);
194194
} else {
195-
mTokensFrontBack.front = new Token(mTokensFrontBack);
195+
mTokensFrontBack.front = new Token(*this, mTokensFrontBack);
196196
mTokensFrontBack.back = mTokensFrontBack.front;
197197
mTokensFrontBack.back->str(str);
198198
}
@@ -210,7 +210,7 @@ void TokenList::addtoken(const Token * tok, const nonneg int lineno, const nonne
210210
if (mTokensFrontBack.back) {
211211
mTokensFrontBack.back->insertToken(tok->str(), tok->originalName());
212212
} else {
213-
mTokensFrontBack.front = new Token(mTokensFrontBack);
213+
mTokensFrontBack.front = new Token(*this, mTokensFrontBack);
214214
mTokensFrontBack.back = mTokensFrontBack.front;
215215
mTokensFrontBack.back->str(tok->str());
216216
if (!tok->originalName().empty())
@@ -231,7 +231,7 @@ void TokenList::addtoken(const Token *tok, const Token *locationTok)
231231
if (mTokensFrontBack.back) {
232232
mTokensFrontBack.back->insertToken(tok->str(), tok->originalName());
233233
} else {
234-
mTokensFrontBack.front = new Token(mTokensFrontBack);
234+
mTokensFrontBack.front = new Token(*this, mTokensFrontBack);
235235
mTokensFrontBack.back = mTokensFrontBack.front;
236236
mTokensFrontBack.back->str(tok->str());
237237
if (!tok->originalName().empty())
@@ -252,7 +252,7 @@ void TokenList::addtoken(const Token *tok)
252252
if (mTokensFrontBack.back) {
253253
mTokensFrontBack.back->insertToken(tok->str(), tok->originalName(), tok->getMacroName());
254254
} else {
255-
mTokensFrontBack.front = new Token(mTokensFrontBack);
255+
mTokensFrontBack.front = new Token(*this, mTokensFrontBack);
256256
mTokensFrontBack.back = mTokensFrontBack.front;
257257
mTokensFrontBack.back->str(tok->str());
258258
if (!tok->originalName().empty())
@@ -398,7 +398,7 @@ void TokenList::createTokens(simplecpp::TokenList&& tokenList)
398398
if (mTokensFrontBack.back) {
399399
mTokensFrontBack.back->insertToken(str);
400400
} else {
401-
mTokensFrontBack.front = new Token(mTokensFrontBack);
401+
mTokensFrontBack.front = new Token(*this, mTokensFrontBack);
402402
mTokensFrontBack.back = mTokensFrontBack.front;
403403
mTokensFrontBack.back->str(str);
404404
}

‎lib/tokenlist.h‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,8 @@ namespace simplecpp {
4444
* @brief This struct stores pointers to the front and back tokens of the list this token is in.
4545
*/
4646
struct TokensFrontBack {
47-
explicit TokensFrontBack(const TokenList& list) : list(list) {}
4847
Token *front{};
4948
Token* back{};
50-
const TokenList& list;
5149
};
5250

5351
class CPPCHECKLIB TokenList {

‎test/testmathlib.cpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -410,8 +410,8 @@ class TestMathLib : public TestFixture {
410410
{
411411
TokenList list{&settingsDefault};
412412
list.appendFileIfNew("test.c");
413-
TokensFrontBack tokensFrontBack(list);
414-
auto *tok = new Token(tokensFrontBack);
413+
TokensFrontBack tokensFrontBack;
414+
auto *tok = new Token(list, tokensFrontBack);
415415
tok->str("invalid");
416416
ASSERT_THROW_INTERNAL_EQUALS(MathLib::toBigNumber(tok), INTERNAL, "Internal Error. MathLib::toBigNumber: invalid_argument: invalid");
417417
ASSERT_THROW_INTERNAL_EQUALS(MathLib::toBigNumber("invalid", tok), INTERNAL, "Internal Error. MathLib::toBigNumber: invalid_argument: invalid");
@@ -586,8 +586,8 @@ class TestMathLib : public TestFixture {
586586
{
587587
TokenList list{&settingsDefault};
588588
list.appendFileIfNew("test.c");
589-
TokensFrontBack tokensFrontBack(list);
590-
auto *tok = new Token(tokensFrontBack);
589+
TokensFrontBack tokensFrontBack;
590+
auto *tok = new Token(list, tokensFrontBack);
591591
tok->str("invalid");
592592
ASSERT_THROW_INTERNAL_EQUALS(MathLib::toBigUNumber(tok), INTERNAL, "Internal Error. MathLib::toBigUNumber: invalid_argument: invalid");
593593
ASSERT_THROW_INTERNAL_EQUALS(MathLib::toBigUNumber("invalid", tok), INTERNAL, "Internal Error. MathLib::toBigUNumber: invalid_argument: invalid");
@@ -716,8 +716,8 @@ class TestMathLib : public TestFixture {
716716
{
717717
TokenList list{&settingsDefault};
718718
list.appendFileIfNew("test.c");
719-
TokensFrontBack tokensFrontBack(list);
720-
auto *tok = new Token(tokensFrontBack);
719+
TokensFrontBack tokensFrontBack;
720+
auto *tok = new Token(list, tokensFrontBack);
721721
tok->str("invalid");
722722
ASSERT_THROW_INTERNAL_EQUALS(MathLib::toDoubleNumber(tok), INTERNAL, "Internal Error. MathLib::toDoubleNumber: conversion failed: invalid");
723723
ASSERT_THROW_INTERNAL_EQUALS(MathLib::toDoubleNumber("invalid", tok), INTERNAL, "Internal Error. MathLib::toDoubleNumber: conversion failed: invalid");

0 commit comments

Comments
 (0)