fix #337 - Multiline comment not handled properly #431
Conversation
|
Here are the corresponding links about this issue: |
|
The PR title is misleading. The fix is to handle line splicing differently. simplecpp doesn't contain any uninitvar checking and there is no uninitialized variable usage I hope. #337 is much more proper. |
clock999
changed the title
| @@ -788,6 +788,35 @@ void simplecpp::TokenList::readfile(Stream &stream, const std::string &filename, | |||
| while (stream.good() && ch != '\r' && ch != '\n') { | |||
There was a problem hiding this comment.
I am thinking if something like this could work:
char lastChar = ' ';
while (stream.good() && (lastChar == '\\' || (ch != '\r' && ch != '\n')) {
currentToken += ch;
lastChar = ch;
ch = stream.readChar();
}
| @@ -434,7 +434,7 @@ static void comment_multiline() | |||
| const char code[] = "#define ABC {// \\\n" | |||
| "}\n" | |||
| "void f() ABC\n"; | |||
| ASSERT_EQUALS("\n\nvoid f ( ) { }", preprocess(code)); | |||
| ASSERT_EQUALS("\n\nvoid f ( ) {", preprocess(code)); | |||
There was a problem hiding this comment.
is this the only line splicing test we have?
I think we should test what happens when there are multiple newlines after the :
// x \\\n
\n
\n
...
and an explicit test for \r\n:
// x \\\r\n
...
and I wonder what the behavior (according to standard / according to gcc+msvc+etc) is if there is space after the backslash:
// x \\ \n
...
There was a problem hiding this comment.
I don't remember exactly how the location is adjusted right now. Will the locations below the line splicing comment be correct? i.e.:
// hello \
world
x=1;
will x=1; line number be 3?
| tmp_ch = stream.readChar(); | ||
| } | ||
| if(!stream.good()) { | ||
| if(!tmp.empty()) { |
There was a problem hiding this comment.
this if (!tmp.empty()) is redundant.
| } | ||
|
|
||
| ch = tmp_ch; | ||
| continue; |
| tmp_ch = stream.readChar(); | ||
| } | ||
| if(!stream.good()) { | ||
| break; |
There was a problem hiding this comment.
this break can be removed right since the outer loop will break if stream is not good.
To fix the issue:
#337