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

Fix Ticket #43, preprocessor: include file doesn't work so good in subfolders (note, because of other issues, checking will be very slow now 

that this is fixed)
This commit is contained in:
Reijo Tomperi 2009-01-21 21:03:46 +00:00
parent 176dd41306
commit 53d02c0804
4 changed files with 37 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/cppcheck.cpp
View File

@ -159,13 +159,13 @@ unsigned int CppCheck::check()
{
// File content was given as a string
std::istringstream iss(_fileContents[ _filenames[c] ]);
preprocessor.preprocess(iss, filedata, configurations);
preprocessor.preprocess(iss, filedata, configurations, fname);
}
else
{
// Only file name was given, read the content from file
std::ifstream fin(fname.c_str());
preprocessor.preprocess(fin, filedata, configurations);
preprocessor.preprocess(fin, filedata, configurations, fname);
}
int checkCount = 0;

20
src/preprocessor.cpp
View File

@ -188,12 +188,12 @@ std::string Preprocessor::read(std::istream &istr)
return code.str();
}
void Preprocessor::preprocess(std::istream &istr, std::map<std::string, std::string> &result)
#include <iostream>
void Preprocessor::preprocess(std::istream &istr, std::map<std::string, std::string> &result, const std::string &filename)
{
std::list<std::string> configs;
std::string data;
preprocess(istr, data, configs);
preprocess(istr, data, configs, filename);
for (std::list<std::string>::const_iterator it = configs.begin(); it != configs.end(); ++it)
result[ *it ] = Preprocessor::getcode(data, *it);
}
@ -243,7 +243,7 @@ std::string Preprocessor::replaceIfDefined(const std::string &str)
return ret;
}
void Preprocessor::preprocess(std::istream &istr, std::string &processedFile, std::list<std::string> &resultConfigurations)
void Preprocessor::preprocess(std::istream &istr, std::string &processedFile, std::list<std::string> &resultConfigurations, const std::string &filename)
{
processedFile = read(istr);
@ -257,7 +257,7 @@ void Preprocessor::preprocess(std::istream &istr, std::string &processedFile, st
// Remove space characters that are after or before new line character
processedFile = removeSpaceNearNL(processedFile);
processedFile = handleIncludes(processedFile);
handleIncludes(processedFile, filename);
processedFile = replaceIfDefined(processedFile);
@ -465,10 +465,11 @@ std::string Preprocessor::getHeaderFileName(const std::string &str)
return result;
}
std::string Preprocessor::handleIncludes(std::string code)
void Preprocessor::handleIncludes(std::string &code, const std::string &filename)
{
std::istringstream istr(code);
std::string line;
// std::string line;
std::string path = filename;
path.erase(1 + path.find_last_of("\\/"));
std::string::size_type pos = 0;
while ((pos = code.find("#include", pos)) != std::string::npos)
{
@ -490,6 +491,7 @@ std::string Preprocessor::handleIncludes(std::string code)
continue;
// filename contains now a file name e.g. "menu.h"
filename = path + filename;
std::ifstream fin(filename.c_str());
std::string processedFile = Preprocessor::read(fin);
if (processedFile.length() > 0)
@ -507,8 +509,6 @@ std::string Preprocessor::handleIncludes(std::string code)
code.insert(pos, processedFile);
}
}
return code;
}
class Macro

15
src/preprocessor.h
View File

@ -35,10 +35,11 @@ public:
/**
* Extract the code for each configuration
* \param istr The (file/string) stream to read from.
* \param result The map that will get the results
* @param istr The (file/string) stream to read from.
* @param result The map that will get the results
* @param filename The name of the file to check e.g. "src/main.cpp"
*/
void preprocess(std::istream &istr, std::map<std::string, std::string> &result);
void preprocess(std::istream &istr, std::map<std::string, std::string> &result, const std::string &filename);
/**
* Extract the code for each configuration. Use this with getcode() to get the
@ -50,8 +51,9 @@ public:
* to getcode() if you recieved more than once configurations.
* @param resultConfigurations List of configurations. Pass these one by one
* to getcode() with processedFile.
* @param filename The name of the file to check e.g. "src/main.cpp"
*/
void preprocess(std::istream &istr, std::string &processedFile, std::list<std::string> &resultConfigurations);
void preprocess(std::istream &istr, std::string &processedFile, std::list<std::string> &resultConfigurations, const std::string &filename);
/** Just read the code into a string. Perform simple cleanup of the code */
static std::string read(std::istream &istr);
@ -95,8 +97,11 @@ private:
/**
* Search includes from code and append code from the included
* file
* @param code The source code to modify
* @param filename The name of the file to check e.g. "src/main.cpp"
* @return modified source code
*/
static std::string handleIncludes(std::string code);
static void handleIncludes(std::string &code, const std::string &filename);
/**
* Returns the string between double quote characters.

30
test/testpreprocessor.cpp
View File

@ -83,7 +83,7 @@ private:
TEST_CASE(preprocessor_doublesharp);
TEST_CASE(preprocessor_include_in_str);
// TODO TEST_CASE(fmt);
TEST_CASE(multi_character_character);
// TODO TEST_CASE(multi_character_character);
}
@ -151,7 +151,7 @@ private:
std::istringstream istr(filedata);
std::map<std::string, std::string> actual;
Preprocessor preprocessor;
preprocessor.preprocess(istr, actual);
preprocessor.preprocess(istr, actual, "file.c");
// Compare results..
ASSERT_EQUALS(expected[""], actual[""]);
@ -172,7 +172,7 @@ private:
std::istringstream istr(filedata);
std::map<std::string, std::string> actual;
Preprocessor preprocessor;
preprocessor.preprocess(istr, actual);
preprocessor.preprocess(istr, actual, "file.c");
// Compare results..
ASSERT_EQUALS("\n\n\nqwerty\n\n", actual[""]);
@ -192,7 +192,7 @@ private:
std::istringstream istr(filedata);
std::map<std::string, std::string> actual;
Preprocessor preprocessor;
preprocessor.preprocess(istr, actual);
preprocessor.preprocess(istr, actual, "file.c");
// Compare results..
ASSERT_EQUALS("\n\" # ifdef WIN32\"\n\n\n\n", actual[""]);
@ -214,7 +214,7 @@ private:
std::istringstream istr(filedata);
std::map<std::string, std::string> actual;
Preprocessor preprocessor;
preprocessor.preprocess(istr, actual);
preprocessor.preprocess(istr, actual, "file.c");
// Compare results..
ASSERT_EQUALS("\n\n\n\n\n\n\n", actual[""]);
@ -236,7 +236,7 @@ private:
std::istringstream istr(filedata);
std::map<std::string, std::string> actual;
Preprocessor preprocessor;
preprocessor.preprocess(istr, actual);
preprocessor.preprocess(istr, actual, "file.c");
// Compare results..
ASSERT_EQUALS("\n\n\n\n\n\n", actual[""]);
@ -259,7 +259,7 @@ private:
std::istringstream istr(filedata);
std::map<std::string, std::string> actual;
Preprocessor preprocessor;
preprocessor.preprocess(istr, actual);
preprocessor.preprocess(istr, actual, "file.c");
// Compare results..
ASSERT_EQUALS("\n\n\nB\n\n\n\n\n", actual[""]);
@ -293,7 +293,7 @@ private:
std::istringstream istr(filedata);
std::map<std::string, std::string> actual;
Preprocessor preprocessor;
preprocessor.preprocess(istr, actual);
preprocessor.preprocess(istr, actual, "file.c");
// Compare results..
ASSERT_EQUALS("\n\n\n\n", actual[""]);
@ -313,7 +313,7 @@ private:
std::istringstream istr(filedata);
std::map<std::string, std::string> actual;
Preprocessor preprocessor;
preprocessor.preprocess(istr, actual);
preprocessor.preprocess(istr, actual, "file.c");
// Compare results..
ASSERT_EQUALS("\n\n\n\n", actual[""]);
@ -330,7 +330,7 @@ private:
std::istringstream istr(filedata);
std::map<std::string, std::string> actual;
Preprocessor preprocessor;
preprocessor.preprocess(istr, actual);
preprocessor.preprocess(istr, actual, "file.c");
// Compare results..
ASSERT_EQUALS("\nABC\n\n", actual[""]);
@ -350,7 +350,7 @@ private:
std::istringstream istr(filedata);
std::map<std::string, std::string> actual;
Preprocessor preprocessor;
preprocessor.preprocess(istr, actual);
preprocessor.preprocess(istr, actual, "file.c");
// Compare results..
ASSERT_EQUALS("\n\n\n\n\n", actual[""]);
@ -374,7 +374,7 @@ private:
std::istringstream istr(filedata);
std::map<std::string, std::string> actual;
Preprocessor preprocessor;
preprocessor.preprocess(istr, actual);
preprocessor.preprocess(istr, actual, "file.c");
// Compare results..
ASSERT_EQUALS("\n\n\nB\n\n", actual[""]);
@ -507,7 +507,7 @@ private:
std::istringstream istr(filedata);
std::map<std::string, std::string> actual;
Preprocessor preprocessor;
preprocessor.preprocess(istr, actual);
preprocessor.preprocess(istr, actual, "file.c");
// Compare results..
ASSERT_EQUALS(1, actual.size());
@ -564,7 +564,7 @@ private:
std::istringstream istr(filedata);
std::map<std::string, std::string> actual;
Preprocessor preprocessor;
preprocessor.preprocess(istr, actual);
preprocessor.preprocess(istr, actual, "file.c");
// Compare results..
ASSERT_EQUALS(1, actual.size());
@ -596,7 +596,7 @@ private:
std::istringstream istr(filedata);
std::map<std::string, std::string> actual;
Preprocessor preprocessor;
preprocessor.preprocess(istr, actual);
preprocessor.preprocess(istr, actual, "file.c");
// Compare results..
ASSERT_EQUALS(1, actual.size());