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

preprocessor: Refactoring

This commit is contained in:
Daniel Marjamäki 2008-10-27 07:47:48 +00:00
parent ccab3e3bb4
commit 5e25e706ea
3 changed files with 160 additions and 119 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
preprocessor.cpp
View File

@ -1,4 +1,4 @@
/* /*
* c++check - c/c++ syntax checking * c++check - c/c++ syntax checking
* Copyright (C) 2007 Daniel Marjamäki * Copyright (C) 2007 Daniel Marjamäki
* *
@ -125,6 +125,42 @@ void preprocess(std::istream &istr, std::map<std::string, std::string> &result)
// Get the DEF in this line: "#ifdef DEF"
static std::string getdef(std::string line, bool def)
{
// Replace tabs with spaces..
while ( line.find("\t") != std::string::npos )
line[ line.find("\t") ] = 0;
// Trim off any leading spaces..
while (line[0] == ' ')
line.erase(0, 1);
// If def is true, the line must start with "#ifdef"
if ( def && line.find("#ifdef ") != 0 )
{
return "";
}
// If def is false, the line must start with "#ifndef"
if ( !def && line.find("#ifndef ") != 0 )
{
return "";
}
// Remove the "#ifdef" or "#ifndef"
line.erase( 0, line.find(" ") );
// Remove all spaces.
while ( line.find(" ") != std::string::npos )
line.erase( line.find(" "), 1 );
// The remaining string is our result.
return line;
}
static std::list<std::string> getcfgs( const std::string &filedata ) static std::list<std::string> getcfgs( const std::string &filedata )
{ {
std::list<std::string> ret; std::list<std::string> ret;
@ -134,9 +170,9 @@ static std::list<std::string> getcfgs( const std::string &filedata )
std::string line; std::string line;
while ( getline(istr, line) ) while ( getline(istr, line) )
{ {
if ( line.find("#ifdef ")==0 || line.find("#ifndef ")==0 ) std::string def = getdef(line, true) + getdef(line, false);
if (!def.empty())
{ {
std::string def( line.substr(line.find(" ") + 1) );
if (std::find(ret.begin(), ret.end(), def) == ret.end()) if (std::find(ret.begin(), ret.end(), def) == ret.end())
ret.push_back( def ); ret.push_back( def );
} }
@ -158,11 +194,14 @@ static std::string getcode(const std::string &filedata, std::string cfg)
std::string line; std::string line;
while ( getline(istr, line) ) while ( getline(istr, line) )
{ {
if ( line.find("#ifdef ") == 0 ) std::string def = getdef( line, true );
matching_ifdef.push_back( !cfg.empty() && line.find(cfg) != std::string::npos ); std::string ndef = getdef( line, false );
else if ( line.find("#ifndef ") == 0 ) if ( ! def.empty() )
matching_ifdef.push_back( cfg.empty() || line.find(cfg) == std::string::npos ); matching_ifdef.push_back( cfg == def );
else if ( ! ndef.empty() )
matching_ifdef.push_back( cfg != ndef );
else if ( line.find("#else") == 0) else if ( line.find("#else") == 0)
matching_ifdef.back() = ! matching_ifdef.back(); matching_ifdef.back() = ! matching_ifdef.back();

2
preprocessor.h
View File

@ -1,4 +1,4 @@
/* /*
* c++check - c/c++ syntax checking * c++check - c/c++ syntax checking
* Copyright (C) 2007 Daniel Marjamäki * Copyright (C) 2007 Daniel Marjamäki
* *

224
testpreprocessor.cpp
View File

@ -1,111 +1,113 @@
/* /*
* c++check - c/c++ syntax checking * c++check - c/c++ syntax checking
* Copyright (C) 2007 Daniel Marjamäki * Copyright (C) 2007 Daniel Marjamäki
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or * the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version. * (at your option) any later version.
* *
* This program is distributed in the hope that it will be useful, * This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/ * along with this program. If not, see <http://www.gnu.org/licenses/
*/ */
// The preprocessor that c++check uses is a bit special. Instead of generating // The preprocessor that c++check uses is a bit special. Instead of generating
// the code for a known configuration, it generates the code for each configuration. // the code for a known configuration, it generates the code for each configuration.
#include "testsuite.h" #include "testsuite.h"
#include "preprocessor.h" #include "preprocessor.h"
#include <map> #include <map>
#include <string> #include <string>
class TestPreprocessor : public TestFixture class TestPreprocessor : public TestFixture
{ {
public: public:
TestPreprocessor() : TestFixture("TestPreprocessor") TestPreprocessor() : TestFixture("TestPreprocessor")
{ } { }
private: private:
void run() void run()
{ {
TEST_CASE( test1 ); TEST_CASE( test1 );
TEST_CASE( test2 ); TEST_CASE( test2 );
TEST_CASE( comments1 ); TEST_CASE( comments1 );
} }
void check(const char filedata[], const std::map<std::string,std::string> &expected) void check(const char filedata[], const std::map<std::string,std::string> &expected)
{ {
std::istringstream istr(filedata); std::istringstream istr(filedata);
std::map<std::string, std::string> actual; std::map<std::string, std::string> actual;
preprocess( istr, actual ); preprocess( istr, actual );
ASSERT_EQUALS( expected.size(), actual.size() ); ASSERT_EQUALS( expected.size(), actual.size() );
for ( std::map<std::string,std::string>::const_iterator it = actual.begin(); it != actual.end(); ++it ) for ( std::map<std::string,std::string>::const_iterator it = actual.begin(); it != actual.end(); ++it )
{ {
std::map<std::string,std::string>::const_iterator it2 = expected.find(it->first); std::map<std::string,std::string>::const_iterator it2 = expected.find(it->first);
if ( it2 == expected.end() ) if ( it2 == expected.end() )
assertFail(__FILE__, __LINE__); assertFail(__FILE__, __LINE__);
else else
{ {
std::string s1 = it->second; std::string s1 = it->second;
std::string s2 = it2->second; std::string s2 = it2->second;
ASSERT_EQUALS( it->second, it2->second ); ASSERT_EQUALS( it->second, it2->second );
} }
} }
} }
void test1() void test1()
{ {
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";
std::map<std::string, std::string> expected; std::map<std::string, std::string> expected;
expected[""] = "\n\n\n qwerty\n\n"; expected[""] = "\n\n\n qwerty\n\n";
expected["WIN32"] = "\n abcdef\n\n\n\n"; expected["WIN32"] = "\n abcdef\n\n\n\n";
check( filedata, expected ); check( filedata, expected );
} }
void test2() void test2()
{ {
const char filedata[] = "#ifndef WIN32\n" const char filedata[] = "#ifndef WIN32\n"
" abcdef\n" " abcdef\n"
"#else\n" "#else\n"
" qwerty\n" " qwerty\n"
"#endif\n"; "#endif\n";
std::map<std::string, std::string> expected; std::map<std::string, std::string> expected;
expected[""] = "\n abcdef\n\n\n\n"; expected[""] = "\n abcdef\n\n\n\n";
expected["WIN32"] = "\n\n\n qwerty\n\n"; expected["WIN32"] = "\n\n\n qwerty\n\n";
check( filedata, expected ); check( filedata, expected );
} }
void comments1()
{
const char filedata[] = "/*\n" void comments1()
"#ifdef WIN32\n" {
"#endif\n" const char filedata[] = "/*\n"
"*/\n"; "#ifdef WIN32\n"
"#endif\n"
std::map<std::string, std::string> expected; "*/\n";
expected[""] = "\n\n\n\n";
check( filedata, expected ); std::map<std::string, std::string> expected;
} expected[""] = "\n\n\n\n";
check( filedata, expected );
}; }
REGISTER_TEST( TestPreprocessor ) };
REGISTER_TEST( TestPreprocessor )