Skip to content

Commit 443c9ca

Browse files
firewavefirewave
committed
fixed #13906 - ErrorMessage::FileLocation did not simplify did not simplify the file in all cases
1 parent 51f6d91 commit 443c9ca

5 files changed

Lines changed: 119 additions & 20 deletions

File tree

‎lib/errorlogger.cpp‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -701,13 +701,20 @@ std::string ErrorLogger::callStackToString(const std::list<ErrorMessage::FileLoc
701701
return str;
702702
}
703703

704+
ErrorMessage::FileLocation::FileLocation(const std::string &file, int line, unsigned int column)
705+
: fileIndex(0), line(line), column(column), mOrigFileName(file), mFileName(Path::simplifyPath(file))
706+
{}
707+
708+
ErrorMessage::FileLocation::FileLocation(const std::string &file, std::string info, int line, unsigned int column)
709+
: fileIndex(0), line(line), column(column), mOrigFileName(file), mFileName(Path::simplifyPath(file)), mInfo(std::move(info))
710+
{}
704711

705712
ErrorMessage::FileLocation::FileLocation(const Token* tok, const TokenList* tokenList)
706-
: fileIndex(tok->fileIndex()), line(tok->linenr()), column(tok->column()), mOrigFileName(tokenList->getOrigFile(tok)), mFileName(tokenList->file(tok))
713+
: fileIndex(tok->fileIndex()), line(tok->linenr()), column(tok->column()), mOrigFileName(tokenList->getOrigFile(tok)), mFileName(Path::simplifyPath(tokenList->file(tok)))
707714
{}
708715

709716
ErrorMessage::FileLocation::FileLocation(const Token* tok, std::string info, const TokenList* tokenList)
710-
: fileIndex(tok->fileIndex()), line(tok->linenr()), column(tok->column()), mOrigFileName(tokenList->getOrigFile(tok)), mFileName(tokenList->file(tok)), mInfo(std::move(info))
717+
: fileIndex(tok->fileIndex()), line(tok->linenr()), column(tok->column()), mOrigFileName(tokenList->getOrigFile(tok)), mFileName(Path::simplifyPath(tokenList->file(tok))), mInfo(std::move(info))
711718
{}
712719

713720
std::string ErrorMessage::FileLocation::getfile(bool convert) const
@@ -726,7 +733,6 @@ std::string ErrorMessage::FileLocation::getOrigFile(bool convert) const
726733

727734
void ErrorMessage::FileLocation::setfile(std::string file)
728735
{
729-
// TODO: consistently simplify mFileName
730736
mFileName = Path::simplifyPath(std::move(file));
731737
}
732738

‎lib/errorlogger.h‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -57,12 +57,8 @@ class CPPCHECKLIB ErrorMessage {
5757
*/
5858
class CPPCHECKLIB WARN_UNUSED FileLocation {
5959
public:
60-
FileLocation(const std::string &file, int line, unsigned int column)
61-
: fileIndex(0), line(line), column(column), mOrigFileName(file), mFileName(file) {}
62-
63-
FileLocation(const std::string &file, std::string info, int line, unsigned int column)
64-
: fileIndex(0), line(line), column(column), mOrigFileName(file), mFileName(file), mInfo(std::move(info)) {}
65-
60+
FileLocation(const std::string &file, int line, unsigned int column);
61+
FileLocation(const std::string &file, std::string info, int line, unsigned int column);
6662
FileLocation(const Token* tok, const TokenList* tokenList);
6763
FileLocation(const Token* tok, std::string info, const TokenList* tokenList);
6864

‎lib/tokenlist.cpp‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,11 +86,14 @@ void TokenList::deallocateTokens()
8686
mTokensFrontBack->front = nullptr;
8787
mTokensFrontBack->back = nullptr;
8888
}
89+
// TODO: clear mOrigFiles?
8990
mFiles.clear();
9091
}
9192

93+
// TODO: also update mOrigFiles?
9294
int TokenList::appendFileIfNew(std::string fileName)
9395
{
96+
assert(mTokensFrontBack->front == nullptr); // has no effect if tokens have already been created
9497
assert(!fileName.empty());
9598

9699
// Has this file been tokenized already?
@@ -347,8 +350,10 @@ void TokenList::createTokens(simplecpp::TokenList&& tokenList)
347350
// TODO: this points to mFiles when called from createTokens(std::istream &, const std::string&)
348351
mOrigFiles = mFiles = tokenList.getFiles();
349352
}
350-
else
353+
else {
354+
// TODO: clear mOrigFiles?
351355
mFiles.clear();
356+
}
352357

353358
for (const simplecpp::Token *tok = tokenList.cfront(); tok;) {
354359

‎test/helpers.h‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,16 @@ class SimpleTokenList
106106
throw std::runtime_error("creating tokens failed");
107107
}
108108

109+
template<size_t size>
110+
explicit SimpleTokenList(const char (&code)[size], const std::string& file0, Standards::Language lang = Standards::Language::CPP)
111+
: list{settings, lang}
112+
{
113+
std::istringstream iss(code);
114+
list.appendFileIfNew(file0);
115+
if (!list.createTokens(iss))
116+
throw std::runtime_error("creating tokens failed");
117+
}
118+
109119
Token* front() {
110120
return list.front();
111121
}
@@ -114,6 +124,10 @@ class SimpleTokenList
114124
return list.front();
115125
}
116126

127+
const TokenList& get() const {
128+
return list;
129+
}
130+
117131
private:
118132
const Settings settings;
119133
TokenList list;

‎test/testerrorlogger.cpp‎

Lines changed: 88 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
#include "errorlogger.h"
2222
#include "errortypes.h"
2323
#include "fixture.h"
24+
#include "helpers.h"
2425
#include "suppressions.h"
2526

2627
#include <list>
@@ -43,6 +44,7 @@ class TestErrorLogger : public TestFixture {
4344
void run() override {
4445
TEST_CASE(PatternSearchReplace);
4546
TEST_CASE(FileLocationConstruct);
47+
TEST_CASE(FileLocationConstructFile);
4648
TEST_CASE(FileLocationSetFile);
4749
TEST_CASE(FileLocationSetFile2);
4850
TEST_CASE(ErrorMessageConstruct);
@@ -55,7 +57,7 @@ class TestErrorLogger : public TestFixture {
5557
TEST_CASE(CustomFormatLocations);
5658
TEST_CASE(ToXmlV2);
5759
TEST_CASE(ToXmlV2RemarkComment);
58-
TEST_CASE(ToXmlV2Locations);
60+
TEST_CASE(ToXmlLocations);
5961
TEST_CASE(ToXmlV2Encoding);
6062
TEST_CASE(FromXmlV2);
6163
TEST_CASE(ToXmlV3);
@@ -115,13 +117,89 @@ class TestErrorLogger : public TestFixture {
115117
}
116118

117119
void FileLocationConstruct() const {
118-
const ErrorMessage::FileLocation loc("foo.cpp", 1, 2);
119-
ASSERT_EQUALS("foo.cpp", loc.getOrigFile());
120-
ASSERT_EQUALS("foo.cpp", loc.getfile());
121-
ASSERT_EQUALS(1, loc.line);
122-
ASSERT_EQUALS(2, loc.column);
123-
ASSERT_EQUALS("[foo.cpp:1]", loc.stringify(false));
124-
ASSERT_EQUALS("[foo.cpp:1:2]", loc.stringify(true));
120+
{
121+
const ErrorMessage::FileLocation loc("foo.cpp", 1, 2);
122+
ASSERT_EQUALS("foo.cpp", loc.getOrigFile());
123+
ASSERT_EQUALS("foo.cpp", loc.getfile());
124+
ASSERT_EQUALS(1, loc.line);
125+
ASSERT_EQUALS(2, loc.column);
126+
ASSERT_EQUALS("[foo.cpp:1]", loc.stringify(false));
127+
ASSERT_EQUALS("[foo.cpp:1:2]", loc.stringify(true));
128+
ASSERT_EQUALS("", loc.getinfo());
129+
}
130+
{
131+
const ErrorMessage::FileLocation loc("foo.cpp", "info", 1, 2);
132+
ASSERT_EQUALS("foo.cpp", loc.getOrigFile());
133+
ASSERT_EQUALS("foo.cpp", loc.getfile());
134+
ASSERT_EQUALS(1, loc.line);
135+
ASSERT_EQUALS(2, loc.column);
136+
ASSERT_EQUALS("[foo.cpp:1]", loc.stringify(false));
137+
ASSERT_EQUALS("[foo.cpp:1:2]", loc.stringify(true));
138+
ASSERT_EQUALS("info", loc.getinfo());
139+
}
140+
{
141+
SimpleTokenList tokenlist("a", "dir/a.cpp");
142+
{
143+
const ErrorMessage::FileLocation loc(tokenlist.front(), &tokenlist.get());
144+
ASSERT_EQUALS("dir/a.cpp", loc.getOrigFile());
145+
ASSERT_EQUALS("dir/a.cpp", loc.getfile());
146+
ASSERT_EQUALS(1, loc.line);
147+
ASSERT_EQUALS(1, loc.column);
148+
ASSERT_EQUALS("[dir/a.cpp:1]", loc.stringify(false));
149+
ASSERT_EQUALS("[dir/a.cpp:1:1]", loc.stringify(true));
150+
ASSERT_EQUALS("", loc.getinfo());
151+
}
152+
{
153+
const ErrorMessage::FileLocation loc(tokenlist.front(), "info", &tokenlist.get());
154+
ASSERT_EQUALS("dir/a.cpp", loc.getOrigFile());
155+
ASSERT_EQUALS("dir/a.cpp", loc.getfile());
156+
ASSERT_EQUALS(1, loc.line);
157+
ASSERT_EQUALS(1, loc.column);
158+
ASSERT_EQUALS("[dir/a.cpp:1]", loc.stringify(false));
159+
ASSERT_EQUALS("[dir/a.cpp:1:1]", loc.stringify(true));
160+
ASSERT_EQUALS("info", loc.getinfo());
161+
}
162+
}
163+
{
164+
const SimpleTokenList tokenlist("a", "dir\\a.cpp");
165+
{
166+
const ErrorMessage::FileLocation loc(tokenlist.front(), &tokenlist.get());
167+
ASSERT_EQUALS("dir/a.cpp", loc.getOrigFile());
168+
ASSERT_EQUALS("dir/a.cpp", loc.getfile());
169+
ASSERT_EQUALS(1, loc.line);
170+
ASSERT_EQUALS(1, loc.column);
171+
ASSERT_EQUALS("[dir/a.cpp:1]", loc.stringify(false));
172+
ASSERT_EQUALS("[dir/a.cpp:1:1]", loc.stringify(true));
173+
ASSERT_EQUALS("", loc.getinfo());
174+
}
175+
{
176+
const ErrorMessage::FileLocation loc(tokenlist.front(), "info", &tokenlist.get());
177+
ASSERT_EQUALS("dir/a.cpp", loc.getOrigFile());
178+
ASSERT_EQUALS("dir/a.cpp", loc.getfile());
179+
ASSERT_EQUALS(1, loc.line);
180+
ASSERT_EQUALS(1, loc.column);
181+
ASSERT_EQUALS("[dir/a.cpp:1]", loc.stringify(false));
182+
ASSERT_EQUALS("[dir/a.cpp:1:1]", loc.stringify(true));
183+
ASSERT_EQUALS("info", loc.getinfo());
184+
}
185+
}
186+
}
187+
188+
void FileLocationConstructFile() const {
189+
ASSERT_EQUALS("dir/a.cpp", ErrorMessage::FileLocation("dir/a.cpp", 1, 1).getfile());
190+
ASSERT_EQUALS("dir/a.cpp", ErrorMessage::FileLocation("dir\\a.cpp", 1, 1).getfile());
191+
ASSERT_EQUALS("dir/a.cpp", ErrorMessage::FileLocation("dir/a.cpp", "info", 1, 1).getfile());
192+
ASSERT_EQUALS("dir/a.cpp", ErrorMessage::FileLocation("dir\\a.cpp", "info", 1, 1).getfile());
193+
{
194+
const SimpleTokenList tokenlist("a", "dir/a.cpp");
195+
ASSERT_EQUALS("dir/a.cpp", ErrorMessage::FileLocation(tokenlist.front(), &tokenlist.get()).getfile());
196+
ASSERT_EQUALS("dir/a.cpp", ErrorMessage::FileLocation(tokenlist.front(), "info", &tokenlist.get()).getfile());
197+
}
198+
{
199+
const SimpleTokenList tokenlist("a", "dir\\a.cpp");
200+
ASSERT_EQUALS("dir/a.cpp", ErrorMessage::FileLocation(tokenlist.front(), &tokenlist.get()).getfile());
201+
ASSERT_EQUALS("dir/a.cpp", ErrorMessage::FileLocation(tokenlist.front(), "info", &tokenlist.get()).getfile());
202+
}
125203
}
126204

127205
void FileLocationSetFile() const {
@@ -295,7 +373,7 @@ class TestErrorLogger : public TestFixture {
295373
ASSERT_EQUALS(" <error id=\"id\" severity=\"warning\" msg=\"\" verbose=\"\" remark=\"remark\"/>", msg.toXML());
296374
}
297375

298-
void ToXmlV2Locations() const {
376+
void ToXmlLocations() const {
299377
const ErrorMessage::FileLocation dir1loc{"dir1/a.cpp", 1, 1};
300378
const ErrorMessage::FileLocation dir2loc{"dir2\\a.cpp", 1, 1};
301379
ErrorMessage::FileLocation dir3loc{"dir/a.cpp", 1, 1};
@@ -310,7 +388,7 @@ class TestErrorLogger : public TestFixture {
310388
message += " <location file=\"bar.cpp\" line=\"8\" column=\"1\" info=\"\\303\\244\"/>\n";
311389
message += " <location file=\"foo.cpp\" line=\"5\" column=\"1\"/>\n";
312390
message += " <location file=\"dir1/a.cpp\" line=\"1\" column=\"1\"/>\n";
313-
message += " <location file=\"dir2\\a.cpp\" line=\"1\" column=\"1\"/>\n";
391+
message += " <location file=\"dir2/a.cpp\" line=\"1\" column=\"1\"/>\n";
314392
message += " <location file=\"dir3/a.cpp\" line=\"1\" column=\"1\"/>\n";
315393
message += " <location file=\"dir4/a.cpp\" line=\"1\" column=\"1\"/>\n";
316394
message += " </error>";

0 commit comments

Comments
 (0)