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

preprocessor: fixed handling of tabs and spaces

This commit is contained in:
Daniel Marjamäki 2008-12-03 18:35:58 +00:00
parent 17cb374ce2
commit d3a2a32a58
2 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
preprocessor.cpp
View File

@ -146,17 +146,26 @@ void Preprocessor::preprocess(std::istream &istr, std::map<std::string, std::str
std::string codestr( code.str() ); std::string codestr( code.str() );
// Replace all tabs with spaces..
std::string::size_type loc = 0;
while ( (loc = codestr.find("\t", loc)) != std::string::npos )
codestr[loc] = ' ';
// Remove all indentation.. // Remove all indentation..
if ( !codestr.empty() && codestr[0] == ' ' ) if ( !codestr.empty() && codestr[0] == ' ' )
codestr.erase( 0, codestr.find_first_not_of(" ") ); codestr.erase( 0, codestr.find_first_not_of(" ") );
std::string::size_type loc = 0; loc = 0;
while ( (loc = codestr.find("\n ", loc)) != std::string::npos ) while ( (loc = codestr.find("\n ", loc)) != std::string::npos )
codestr.erase( 1 + loc, 1 ); codestr.erase( 1 + loc, 1 );
// Remove all trailing spaces.. // Remove all trailing spaces..
loc = 0; loc = 0;
while ( (loc = codestr.find(" \n", loc)) != std::string::npos ) while ( (loc = codestr.find(" \n", loc)) != std::string::npos )
{
codestr.erase( loc, 1 ); codestr.erase( loc, 1 );
if ( loc > 0 )
--loc;
}
// Using the backslash at the end of a line.. // Using the backslash at the end of a line..
while ( (loc = codestr.rfind("\\\n")) != std::string::npos ) while ( (loc = codestr.rfind("\\\n")) != std::string::npos )

6
testpreprocessor.cpp
View File

@ -152,9 +152,9 @@ private:
{ {
const char filedata[] = "#ifdef WIN32 \n" const char filedata[] = "#ifdef WIN32 \n"
" abcdef\n" " abcdef\n"
"#else\n" "#else \n"
" qwerty\n" " qwerty\n"
"#endif\n"; "#endif \n";
// Expected result.. // Expected result..
std::map<std::string, std::string> expected; std::map<std::string, std::string> expected;
@ -224,7 +224,7 @@ private:
{ {
const char filedata[] = "#ifdef ABC\n" const char filedata[] = "#ifdef ABC\n"
"A\n" "A\n"
"#endif\n" "#endif\t\n"
"#ifdef ABC\n" "#ifdef ABC\n"
"A\n" "A\n"
"#endif\n"; "#endif\n";