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

Fix ticket #332 (White space between macro name and '(' causes macro simplification to fail) 

http://apps.sourceforge.net/trac/cppcheck/ticket/332
This commit is contained in:
Reijo Tomperi 2009-05-24 23:57:12 +03:00
parent d53eb9e303
commit 977e31786d
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/preprocessor.cpp
View File

@ -1111,6 +1111,9 @@ std::string Preprocessor::expandMacros(std::string code, const std::string &file
if (macro.params().size()) if (macro.params().size())
{ {
if (code[pos2] == ' ')
pos2++;
if (code[pos2] != '(') if (code[pos2] != '(')
continue; continue;

8
test/testpreprocessor.cpp
View File

@ -597,12 +597,20 @@ private:
void macro_simple1() void macro_simple1()
{
{ {
const char filedata[] = "#define AAA(aa) f(aa)\n" const char filedata[] = "#define AAA(aa) f(aa)\n"
"AAA(5);\n"; "AAA(5);\n";
ASSERT_EQUALS("\nf(5);\n", OurPreprocessor::expandMacros(filedata)); ASSERT_EQUALS("\nf(5);\n", OurPreprocessor::expandMacros(filedata));
} }
{
const char filedata[] = "#define AAA(aa) f(aa)\n"
"AAA (5);\n";
ASSERT_EQUALS("\nf(5);\n", OurPreprocessor::expandMacros(filedata));
}
}
void macro_simple2() void macro_simple2()
{ {
const char filedata[] = "#define min(x,y) x<y?x:y\n" const char filedata[] = "#define min(x,y) x<y?x:y\n"