Skip to content

Commit 08bd742

Browse files
glankkglankk
committed
Fix clang-tidy issues
1 parent fd84870 commit 08bd742

3 files changed

Lines changed: 29 additions & 29 deletions

File tree

‎simplecpp.cpp‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3067,15 +3067,15 @@ simplecpp::FileData *simplecpp::FileDataCache::lookup(const std::string &sourcef
30673067
return nullptr;
30683068

30693069
if (isAbsolutePath(header)) {
3070-
std::string path = simplecpp::simplifyPath(header);
3070+
const std::string path = simplecpp::simplifyPath(header);
30713071
const auto name_it = mNameMap.find(path);
30723072

30733073
if (name_it != mNameMap.end())
30743074
return name_it->second;
30753075
}
30763076

30773077
if (!systemheader) {
3078-
std::string path = getRelativeFileName(sourcefile, header, true);
3078+
const std::string path = getRelativeFileName(sourcefile, header, true);
30793079
const auto name_it = mNameMap.find(path);
30803080

30813081
if (name_it != mNameMap.end())
@@ -3089,7 +3089,7 @@ simplecpp::FileData *simplecpp::FileDataCache::lookup(const std::string &sourcef
30893089
}
30903090

30913091
for (std::list<std::string>::const_iterator it = dui.includePaths.begin(); it != dui.includePaths.end(); ++it) {
3092-
std::string path = getIncludePathFileName(*it, header);
3092+
const std::string path = getIncludePathFileName(*it, header);
30933093
const auto name_it = mNameMap.find(path);
30943094

30953095
if (name_it != mNameMap.end())
@@ -3117,23 +3117,23 @@ std::pair<bool, simplecpp::FileData *> simplecpp::FileDataCache::load(const std:
31173117
mNameMap.insert(std::make_pair(std::move(path), id_it->second));
31183118

31193119
return std::make_pair(false, id_it->second);
3120-
} else {
3121-
FileData *data = new FileData {path, TokenList(f, filenames, path, outputList)};
3120+
}
31223121

3123-
if (dui.removeComments)
3124-
data->tokens.removeComments();
3122+
FileData *const data = new FileData {path, TokenList(f, filenames, path, outputList)};
31253123

3126-
mNameMap.insert(std::make_pair(std::move(path), data));
3127-
mIdMap.insert(std::make_pair(fileId, data));
3128-
mData.push_back(std::unique_ptr<FileData>(data));
3124+
if (dui.removeComments)
3125+
data->tokens.removeComments();
31293126

3130-
return std::make_pair(true, data);
3131-
}
3127+
mNameMap.insert(std::make_pair(std::move(path), data));
3128+
mIdMap.insert(std::make_pair(fileId, data));
3129+
mData.push_back(std::unique_ptr<FileData>(data));
3130+
3131+
return std::make_pair(true, data);
31323132
}
31333133

31343134
std::pair<bool, simplecpp::FileData *> simplecpp::FileDataCache::get(const std::string &sourcefile, const std::string &header, const simplecpp::DUI &dui, bool systemheader, std::vector<std::string> &filenames, simplecpp::OutputList *outputList)
31353135
{
3136-
FileData *data = lookup(sourcefile, header, dui, systemheader);
3136+
FileData *const data = lookup(sourcefile, header, dui, systemheader);
31373137

31383138
if (data != nullptr)
31393139
return std::make_pair(false, data);

‎simplecpp.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -417,7 +417,7 @@ namespace simplecpp {
417417
std::pair<bool, FileData *> get(const std::string &sourcefile, const std::string &header, const DUI &dui, bool systemheader, std::vector<std::string> &filenames, OutputList *outputList);
418418

419419
void insert(FileData data) {
420-
FileData *newdata = new FileData(std::move(data));
420+
FileData *const newdata = new FileData(std::move(data));
421421

422422
mData.push_back(std::unique_ptr<FileData>(newdata));
423423
mNameMap.insert(std::make_pair(newdata->filename, newdata));

‎test.cpp‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1925,7 +1925,7 @@ static void nestedInclude()
19251925
{
19261926
const char code[] = "#include \"test.h\"\n";
19271927
std::vector<std::string> files;
1928-
simplecpp::TokenList rawtokens = makeTokenList(code,files,"test.h");
1928+
const simplecpp::TokenList rawtokens = makeTokenList(code,files,"test.h");
19291929
simplecpp::FileDataCache cache;
19301930
cache.insert({"test.h", rawtokens});
19311931

@@ -1942,7 +1942,7 @@ static void systemInclude()
19421942
{
19431943
const char code[] = "#include <limits.h>\n";
19441944
std::vector<std::string> files;
1945-
simplecpp::TokenList rawtokens = makeTokenList(code,files,"local/limits.h");
1945+
const simplecpp::TokenList rawtokens = makeTokenList(code,files,"local/limits.h");
19461946
simplecpp::FileDataCache cache;
19471947
cache.insert({"include/limits.h", simplecpp::TokenList(files)});
19481948
cache.insert({"local/limits.h", rawtokens});
@@ -2120,8 +2120,8 @@ static void include3() // #16 - crash when expanding macro from header
21202120

21212121
std::vector<std::string> files;
21222122

2123-
simplecpp::TokenList rawtokens_c = makeTokenList(code_c, files, "A.c");
2124-
simplecpp::TokenList rawtokens_h = makeTokenList(code_h, files, "A.h");
2123+
const simplecpp::TokenList rawtokens_c = makeTokenList(code_c, files, "A.c");
2124+
const simplecpp::TokenList rawtokens_h = makeTokenList(code_h, files, "A.h");
21252125

21262126
ASSERT_EQUALS(2U, files.size());
21272127
ASSERT_EQUALS("A.c", files[0]);
@@ -2147,8 +2147,8 @@ static void include4() // #27 - -include
21472147

21482148
std::vector<std::string> files;
21492149

2150-
simplecpp::TokenList rawtokens_c = makeTokenList(code_c, files, "27.c");
2151-
simplecpp::TokenList rawtokens_h = makeTokenList(code_h, files, "27.h");
2150+
const simplecpp::TokenList rawtokens_c = makeTokenList(code_c, files, "27.c");
2151+
const simplecpp::TokenList rawtokens_h = makeTokenList(code_h, files, "27.h");
21522152

21532153
ASSERT_EQUALS(2U, files.size());
21542154
ASSERT_EQUALS("27.c", files[0]);
@@ -2174,8 +2174,8 @@ static void include5() // #3 - handle #include MACRO
21742174

21752175
std::vector<std::string> files;
21762176

2177-
simplecpp::TokenList rawtokens_c = makeTokenList(code_c, files, "3.c");
2178-
simplecpp::TokenList rawtokens_h = makeTokenList(code_h, files, "3.h");
2177+
const simplecpp::TokenList rawtokens_c = makeTokenList(code_c, files, "3.c");
2178+
const simplecpp::TokenList rawtokens_h = makeTokenList(code_h, files, "3.h");
21792179

21802180
ASSERT_EQUALS(2U, files.size());
21812181
ASSERT_EQUALS("3.c", files[0]);
@@ -2199,7 +2199,7 @@ static void include6() // #57 - incomplete macro #include MACRO(,)
21992199

22002200
std::vector<std::string> files;
22012201

2202-
simplecpp::TokenList rawtokens = makeTokenList(code, files, "57.c");
2202+
const simplecpp::TokenList rawtokens = makeTokenList(code, files, "57.c");
22032203

22042204
ASSERT_EQUALS(1U, files.size());
22052205
ASSERT_EQUALS("57.c", files[0]);
@@ -2220,8 +2220,8 @@ static void include7() // #include MACRO
22202220

22212221
std::vector<std::string> files;
22222222

2223-
simplecpp::TokenList rawtokens_c = makeTokenList(code_c, files, "3.c");
2224-
simplecpp::TokenList rawtokens_h = makeTokenList(code_h, files, "3.h");
2223+
const simplecpp::TokenList rawtokens_c = makeTokenList(code_c, files, "3.c");
2224+
const simplecpp::TokenList rawtokens_h = makeTokenList(code_h, files, "3.h");
22252225

22262226
ASSERT_EQUALS(2U, files.size());
22272227
ASSERT_EQUALS("3.c", files[0]);
@@ -2258,8 +2258,8 @@ static void include9()
22582258

22592259
std::vector<std::string> files;
22602260

2261-
simplecpp::TokenList rawtokens_c = makeTokenList(code_c, files, "1.c");
2262-
simplecpp::TokenList rawtokens_h = makeTokenList(code_h, files, "1.h");
2261+
const simplecpp::TokenList rawtokens_c = makeTokenList(code_c, files, "1.c");
2262+
const simplecpp::TokenList rawtokens_h = makeTokenList(code_h, files, "1.h");
22632263

22642264
ASSERT_EQUALS(2U, files.size());
22652265
ASSERT_EQUALS("1.c", files[0]);
@@ -2440,8 +2440,8 @@ static void stringify1()
24402440

24412441
std::vector<std::string> files;
24422442

2443-
simplecpp::TokenList rawtokens_c = makeTokenList(code_c, files, "A.c");
2444-
simplecpp::TokenList rawtokens_h = makeTokenList(code_h, files, "A.h");
2443+
const simplecpp::TokenList rawtokens_c = makeTokenList(code_c, files, "A.c");
2444+
const simplecpp::TokenList rawtokens_h = makeTokenList(code_h, files, "A.h");
24452445

24462446
ASSERT_EQUALS(2U, files.size());
24472447
ASSERT_EQUALS("A.c", files[0]);

0 commit comments

Comments
 (0)