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

preprocessor: Activated the include handling

This commit is contained in:
Daniel Marjamäki 2009-01-19 17:47:43 +00:00
parent 835fa1f007
commit af87fececa
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/preprocessor.cpp
View File

@ -256,7 +256,7 @@ void Preprocessor::preprocess(std::istream &istr, std::string &processedFile, st
// Remove space characters that are after or before new line character // Remove space characters that are after or before new line character
processedFile = removeSpaceNearNL(processedFile); processedFile = removeSpaceNearNL(processedFile);
// processedFile = handleIncludes(processedFile); processedFile = handleIncludes(processedFile);
processedFile = replaceIfDefined(processedFile); processedFile = replaceIfDefined(processedFile);
@ -472,7 +472,6 @@ std::string Preprocessor::handleIncludes(std::string code)
while ((pos = code.find("#include", pos)) != std::string::npos) while ((pos = code.find("#include", pos)) != std::string::npos)
{ {
// Accept only includes that are at the start of a line // Accept only includes that are at the start of a line
// TODO, multi line strings can contain includes that break this
if (pos > 0 && code[pos-1] != '\n') if (pos > 0 && code[pos-1] != '\n')
continue; continue;
@ -500,7 +499,7 @@ std::string Preprocessor::handleIncludes(std::string code)
// Remove space characters that are after or before new line character // Remove space characters that are after or before new line character
processedFile = removeSpaceNearNL(processedFile); processedFile = removeSpaceNearNL(processedFile);
processedFile = "#file \"" + filename + "\"\n" + processedFile + "#endfile"; processedFile = "#file \"" + filename + "\"\n" + processedFile + "\n#endfile";
code.insert(pos, processedFile); code.insert(pos, processedFile);
} }
} }