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

preprocessor: handle the \newline in strings

This commit is contained in:
Daniel Marjamäki 2009-01-10 07:07:51 +00:00
parent febdc3fe6e
commit cd9323ca62
1 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/preprocessor.cpp
View File

@ -101,21 +101,29 @@ std::string Preprocessor::read(std::istream &istr)
// String constants..
else if (ch == '\"')
{
int newlines = 0;
code << "\"";
do
{
ch = (char)istr.get();
code << std::string(1, ch);
if (ch == '\\')
if ( ch == '\\' )
{
ch = (char)istr.get();
code << std::string(1, ch);
// Avoid exiting loop if string contains "-characters
ch = 0;
char chNext = (char)istr.get();
if ( chNext == '\n' )
++newlines;
else
{
code << std::string(1, ch);
code << std::string(1, chNext);
}
}
else
code << std::string(1, ch);
}
while (istr.good() && ch != '\"');
// Insert extra newlines after the string in case the string contained \newline sequences
code << std::string(newlines, '\n');
}
// char constants..
@ -418,8 +426,14 @@ std::string Preprocessor::expandMacros(std::string code)
{
// Search for macros and expand them..
std::string::size_type defpos = 0;
while ((defpos = code.find("#define", defpos)) != std::string::npos)
while ((defpos = code.find("#define ", defpos)) != std::string::npos)
{
if ( defpos > 0 && code[defpos-1] != '\n' )
{
defpos += 6;
continue;
}
// Get macro..
std::string::size_type endpos = code.find("\n", defpos + 6);
while (endpos != std::string::npos && code[endpos-1] == '\\')