From d4635d4865af76bcc305a3ac34eab8f88856f720 Mon Sep 17 00:00:00 2001 From: Argyrios Kyrtzidis Date: Fri, 21 Dec 2012 01:51:12 +0000 Subject: [libclang] Follow-up to r170824, provide the correct number of arguments for a not-fully-formed macro invocation during code-completion. llvm-svn: 170833 --- clang/lib/Lex/PPMacroExpansion.cpp | 11 +++++++++++ clang/test/Index/complete-macro-args.c | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) 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) { diff --git a/clang/test/Index/complete-macro-args.c b/clang/test/Index/complete-macro-args.c index 2f3833d989e..62a42ffa217 100644 --- a/clang/test/Index/complete-macro-args.c +++ b/clang/test/Index/complete-macro-args.c @@ -12,7 +12,7 @@ void test(struct Point *p) { MACRO(p->x); } -#define MACRO3(x,y,z) x +#define MACRO3(x,y,z) x;y;z void test(struct Point *p) { MACRO3(p->x); -- cgit v1.2.3