walkero
/
cppcheck
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Improved handling of the __FILE__ macro

This commit is contained in:
Daniel Marjamäki 2013-08-14 06:36:03 +02:00
parent fd26bad6fa
commit f95b29db06
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/tokenize.cpp
View File

@ -2289,7 +2289,7 @@ void Tokenizer::simplifyFileAndLineMacro()
{ {
for (Token *tok = list.front(); tok; tok = tok->next()) { for (Token *tok = list.front(); tok; tok = tok->next()) {
if (tok->str() == "__FILE__") if (tok->str() == "__FILE__")
tok->str(list.file(tok)); tok->str("\"" + list.file(tok) + "\"");
else if (tok->str() == "__LINE__") else if (tok->str() == "__LINE__")
tok->str(MathLib::longToString(tok->linenr())); tok->str(MathLib::longToString(tok->linenr()));
} }

1
test/testtokenize.cpp
View File

@ -921,6 +921,7 @@ private:
} }
void simplifyFileAndLineMacro() { // tokenize 'return - __LINE__' correctly void simplifyFileAndLineMacro() { // tokenize 'return - __LINE__' correctly
ASSERT_EQUALS("\"test.cpp\"", tokenizeAndStringify("__FILE__"));
ASSERT_EQUALS("return -1 ;", tokenizeAndStringify("return - __LINE__;")); ASSERT_EQUALS("return -1 ;", tokenizeAndStringify("return - __LINE__;"));
} }