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

Don't emit end-of-file diagnostics like "unterminated conditional" or 

"unterminated string" when we're performing code completion.

llvm-svn: 110933
This commit is contained in:
Douglas Gregor 2010-08-12 17:04:55 +00:00
parent ca4930b445
commit 02690ba643
4 changed files with 43 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -962,7 +962,8 @@ void Lexer::LexStringLiteral(Token &Result, const char *CurPtr, bool Wide) {
if (C == '\n' || C == '\r' || // Newline.
(C == 0 && CurPtr-1 == BufferEnd)) { // End of file.
if (!isLexingRawMode() && !Features.AsmPreprocessor)
if (!isLexingRawMode() && !Features.AsmPreprocessor &&
!PP->isCodeCompletionFile(FileLoc))
Diag(BufferPtr, diag::err_unterminated_string);
FormTokenWithChars(Result, CurPtr-1, tok::unknown);
return;
@ -1039,7 +1040,8 @@ void Lexer::LexCharConstant(Token &Result, const char *CurPtr) {
C = getAndAdvanceChar(CurPtr, Result);
} else if (C == '\n' || C == '\r' || // Newline.
(C == 0 && CurPtr-1 == BufferEnd)) { // End of file.
if (!isLexingRawMode() && !Features.AsmPreprocessor)
if (!isLexingRawMode() && !Features.AsmPreprocessor &&
!PP->isCodeCompletionFile(FileLoc))
Diag(BufferPtr, diag::err_unterminated_char);
FormTokenWithChars(Result, CurPtr-1, tok::unknown);
return;
@ -1564,8 +1566,9 @@ bool Lexer::LexEndOfFile(Token &Result, const char *CurPtr) {
// If we are in a #if directive, emit an error.
while (!ConditionalStack.empty()) {
PP->Diag(ConditionalStack.back().IfLoc,
diag::err_pp_unterminated_conditional);
if (!PP->isCodeCompletionFile(FileLoc))
PP->Diag(ConditionalStack.back().IfLoc,
diag::err_pp_unterminated_conditional);
ConditionalStack.pop_back();
}

5
clang/lib/Lex/PPDirectives.cpp
View File

@ -171,8 +171,9 @@ void Preprocessor::SkipExcludedConditionalBlock(SourceLocation IfTokenLoc,
// Emit errors for each unterminated conditional on the stack, including
// the current one.
while (!CurPPLexer->ConditionalStack.empty()) {
Diag(CurPPLexer->ConditionalStack.back().IfLoc,
diag::err_pp_unterminated_conditional);
if (!isCodeCompletionFile(Tok.getLocation()))
Diag(CurPPLexer->ConditionalStack.back().IfLoc,
diag::err_pp_unterminated_conditional);
CurPPLexer->ConditionalStack.pop_back();
}

5
clang/lib/Lex/PTHLexer.cpp
View File

@ -146,8 +146,9 @@ bool PTHLexer::LexEndOfFile(Token &Result) {
// If we are in a #if directive, emit an error.
while (!ConditionalStack.empty()) {
PP->Diag(ConditionalStack.back().IfLoc,
diag::err_pp_unterminated_conditional);
if (!PP->isCodeCompletionFile(FileStartLoc))
PP->Diag(ConditionalStack.back().IfLoc,
diag::err_pp_unterminated_conditional);
ConditionalStack.pop_back();
}

30
clang/test/Index/complete-unterminated.c Normal file
View File

@ -0,0 +1,30 @@
typedef int Integer;
#if 0
#endif
/* blah */
void f0(const char*);
void f1(char);
const char *hello = "Hello, world";
const char a = 'a';
#define FOO(a, b) a b
FOO(int, x);
// RUN: c-index-test -code-completion-at=%s:5:1 -pedantic %s 2> %t.err | FileCheck %s
// RUN: not grep error %t.err
// CHECK: {TypedText Integer}
// RUN: c-index-test -code-completion-at=%s:8:6 -pedantic %s 2> %t.err
// RUN: not grep error %t.err
// RUN: c-index-test -code-completion-at=%s:10:28 -pedantic %s 2> %t.err
// RUN: not grep unterminated %t.err
// RUN: c-index-test -code-completion-at=%s:11:17 -pedantic %s 2> %t.err
// RUN: not grep unterminated %t.err
// RUN: c-index-test -code-completion-at=%s:18:10 -pedantic %s 2> %t.err
// RUN: not grep unterminated %t.err