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

Preprocessor: better handling of pragma asm and pragma endasm

This commit is contained in:
Daniel Marjamäki 2009-08-26 21:54:43 +02:00
parent 7c86a10a9d
commit ff9ed1d7aa
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/preprocessor.cpp
View File

@ -905,14 +905,14 @@ std::string Preprocessor::getcode(const std::string &filedata, std::string cfg,
std::string line;
while (getline(istr, line))
{
if (line == "#pragma asm")
if (line.substr(0, 11) == "#pragma asm")
{
ret << "\n";
bool found_end = false;
while (getline(istr, line))
{
ret << "\n";
if (line == "#pragma endasm")
if (line.substr(0, 14) == "#pragma endasm")
{
found_end = true;
break;

8
test/testpreprocessor.cpp
View File

@ -1101,7 +1101,11 @@ private:
const char filedata[] = "#pragma asm\n"
" mov r1, 11\n"
"#pragma endasm\n"
"aaa";
"aaa\n"
"#pragma asm foo\n"
" mov r1, 11\n"
"#pragma endasm bar\n"
"bbb";
// Preprocess => actual result..
std::istringstream istr(filedata);
@ -1111,7 +1115,7 @@ private:
// Compare results..
ASSERT_EQUALS(1, static_cast<unsigned int>(actual.size()));
ASSERT_EQUALS("\n\n\naaa\n", actual[""]);
ASSERT_EQUALS("\n\n\naaa\n\n\n\nbbb\n", actual[""]);
}
void endifsemicolon()