maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

simpler fix for rdar://8044135 - escaped newlines have already 

been processed, so they don't have to be tip-toed around.

llvm-svn: 105182
This commit is contained in:
Chris Lattner 2010-05-30 23:27:38 +00:00
parent fe4a4107d8
commit 52d96ac930
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
clang/lib/Lex/Lexer.cpp
View File

@ -752,24 +752,21 @@ void Lexer::LexStringLiteral(Token &Result, const char *CurPtr, bool Wide) {
char C = getAndAdvanceChar(CurPtr, Result);
while (C != '"') {
// Skip escaped characters.
bool Escaped = false;
if (C == '\\') {
// Skip the escaped character.
// Skip escaped characters. Escaped newlines will already be processed by
// getAndAdvanceChar.
if (C == '\\')
C = getAndAdvanceChar(CurPtr, Result);
Escaped = true;
}
if ((!Escaped && (C == '\n' || C == '\r')) || // Newline.
if (C == '\n' || C == '\r' || // Newline.
(C == 0 && CurPtr-1 == BufferEnd)) { // End of file.
if (!isLexingRawMode() && !Features.AsmPreprocessor)
Diag(BufferPtr, diag::err_unterminated_string);
FormTokenWithChars(Result, CurPtr-1, tok::unknown);
return;
} else if (C == 0) {
NulCharacter = CurPtr-1;
}
if (C == 0)
NulCharacter = CurPtr-1;
C = getAndAdvanceChar(CurPtr, Result);
}