diff options
| author | Argyrios Kyrtzidis <akyrtzi@gmail.com> | 2012-12-21 01:51:12 +0000 |
|---|---|---|
| committer | Argyrios Kyrtzidis <akyrtzi@gmail.com> | 2012-12-21 01:51:12 +0000 |
| commit | d4635d4865af76bcc305a3ac34eab8f88856f720 (patch) | |
| tree | ecf498466051ac25f6d6f2efe8fa08dd330bb45e /clang/lib | |
| parent | 9747febba90c40829ee428e0cd2ac2338cf64c91 (diff) | |
| download | bcm5719-llvm-d4635d4865af76bcc305a3ac34eab8f88856f720.tar.gz bcm5719-llvm-d4635d4865af76bcc305a3ac34eab8f88856f720.zip | |
[libclang] Follow-up to r170824, provide the correct number of arguments for
a not-fully-formed macro invocation during code-completion.
llvm-svn: 170833
Diffstat (limited to 'clang/lib')
| -rw-r--r-- | clang/lib/Lex/PPMacroExpansion.cpp | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/clang/lib/Lex/PPMacroExpansion.cpp b/clang/lib/Lex/PPMacroExpansion.cpp index a523612fbdb..b7ea30e83cf 100644 --- a/clang/lib/Lex/PPMacroExpansion.cpp +++ b/clang/lib/Lex/PPMacroExpansion.cpp @@ -619,6 +619,17 @@ MacroArgs *Preprocessor::ReadFunctionLikeMacroArgs(Token &MacroName, // See MacroArgs instance var for description of this. bool isVarargsElided = false; + if (ContainsCodeCompletionTok) { + // Recover from not-fully-formed macro invocation during code-completion. + Token EOFTok; + EOFTok.startToken(); + EOFTok.setKind(tok::eof); + EOFTok.setLocation(Tok.getLocation()); + EOFTok.setLength(0); + for (; NumActuals < MinArgsExpected; ++NumActuals) + ArgTokens.push_back(EOFTok); + } + if (NumActuals < MinArgsExpected) { // There are several cases where too few arguments is ok, handle them now. if (NumActuals == 0 && MinArgsExpected == 1) { |
