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

Astyle fix

This commit is contained in:
Reijo Tomperi 2009-03-08 09:49:04 +02:00
parent 5be85d71a0
commit 765da17132
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/preprocessor.cpp
View File

@ -449,16 +449,16 @@ std::string Preprocessor::getcode(const std::string &filedata, std::string cfg)
} }
if (line.find("#file \"") == 0 || if (line.find("#file \"") == 0 ||
line.find("#endfile") == 0 ) line.find("#endfile") == 0)
{ {
// We must not remove #file tags or line numbers // We must not remove #file tags or line numbers
// are corrupted. File tags are removed by the tokenizer. // are corrupted. File tags are removed by the tokenizer.
} }
else if (!match || else if (!match ||
line.find("#if") == 0 || line.find("#if") == 0 ||
line.find("#else") == 0 || line.find("#else") == 0 ||
line.find("#elif") == 0 || line.find("#elif") == 0 ||
line.find("#endif") == 0) line.find("#endif") == 0)
line = ""; line = "";
ret << line << "\n"; ret << line << "\n";

6
test/testpreprocessor.cpp
View File

@ -342,10 +342,10 @@ private:
preprocessor.preprocess(istr, actual, "file.c"); preprocessor.preprocess(istr, actual, "file.c");
Tokenizer tok; Tokenizer tok;
std::istringstream codeStream( actual[""] ); std::istringstream codeStream(actual[""]);
tok.tokenize( codeStream, "main.cpp" ); tok.tokenize(codeStream, "main.cpp");
ASSERT_EQUALS( "\n\n##file 0\n1:\n2:\n3:\n4: int main ( ) { }\n", tok.tokens()->stringifyList() ); ASSERT_EQUALS("\n\n##file 0\n1:\n2:\n3:\n4: int main ( ) { }\n", tok.tokens()->stringifyList());
// Expected configurations: "" and "ABC" // Expected configurations: "" and "ABC"
ASSERT_EQUALS(2, static_cast<unsigned int>(actual.size())); ASSERT_EQUALS(2, static_cast<unsigned int>(actual.size()));