diff options
author | Chris Lattner <sabre@nondot.org> | 2009-05-28 05:39:39 +0000 |
---|---|---|
committer | Chris Lattner <sabre@nondot.org> | 2009-05-28 05:39:39 +0000 |
commit | 3c17b8a4306b84c05454168128bc705b33a79ca3 (patch) | |
tree | 7c1b0100ef22f56e67d48ef051b7d900aead78bf /lib/Lex/TokenLexer.cpp | |
parent | 6b73568bc3d44ac6e6d62437cba0e307cf8900d6 (diff) |
fix the "pasting formed 'a]', an invalid preprocessing token"
diagnostic to include the full instantiation location for the
invalid paste. For:
#define foo(a, b) a ## b
#define bar(x) foo(x, ])
bar(a)
bar(zdy)
Instead of:
t.c:3:22: error: pasting formed 'a]', an invalid preprocessing token
#define foo(a, b) a ## b
^
t.c:3:22: error: pasting formed 'zdy]', an invalid preprocessing token
we now produce:
t.c:7:1: error: pasting formed 'a]', an invalid preprocessing token
bar(a)
^
t.c:4:16: note: instantiated from:
#define bar(x) foo(x, ])
^
t.c:3:22: note: instantiated from:
#define foo(a, b) a ## b
^
t.c:8:1: error: pasting formed 'zdy]', an invalid preprocessing token
bar(zdy)
^
t.c:4:16: note: instantiated from:
#define bar(x) foo(x, ])
^
t.c:3:22: note: instantiated from:
#define foo(a, b) a ## b
^
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@72519 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Lex/TokenLexer.cpp')
-rw-r--r-- | lib/Lex/TokenLexer.cpp | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/lib/Lex/TokenLexer.cpp b/lib/Lex/TokenLexer.cpp index 318c57cc5f..f9f93867c8 100644 --- a/lib/Lex/TokenLexer.cpp +++ b/lib/Lex/TokenLexer.cpp @@ -471,9 +471,16 @@ bool TokenLexer::PasteTokens(Token &Tok) { } // Do not emit the warning when preprocessing assembler code. - if (!PP.getLangOptions().AsmPreprocessor) - PP.Diag(PasteOpLoc, diag::err_pp_bad_paste) + if (!PP.getLangOptions().AsmPreprocessor) { + // Explicitly convert the token location to have proper instantiation + // information so that the user knows where it came from. + SourceManager &SM = PP.getSourceManager(); + SourceLocation Loc = + SM.createInstantiationLoc(PasteOpLoc, InstantiateLocStart, + InstantiateLocEnd, 2); + PP.Diag(Loc, diag::err_pp_bad_paste) << std::string(Buffer.begin(), Buffer.end()); + } // Do not consume the RHS. --CurToken; |