diff options
| author | Craig Topper <craig.topper@gmail.com> | 2015-11-12 07:36:50 +0000 |
|---|---|---|
| committer | Craig Topper <craig.topper@gmail.com> | 2015-11-12 07:36:50 +0000 |
| commit | 8b70fa6b492dcaef04bf7be45677e2224691b3be (patch) | |
| tree | d9a18bf336f1a2dd2cf49148796b53f3bf8b1840 | |
| parent | 60de3632d22ca52fab67d5d8b13af6824e16c98a (diff) | |
| download | clang-8b70fa6b492dcaef04bf7be45677e2224691b3be.tar.gz | |
Use %select to merge two diagnostics that only differ in one word and are emitted in the same place. NFC
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@252861 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | include/clang/Basic/DiagnosticLexKinds.td | 6 | ||||
| -rw-r--r-- | lib/Lex/LiteralSupport.cpp | 5 |
2 files changed, 4 insertions, 7 deletions
diff --git a/include/clang/Basic/DiagnosticLexKinds.td b/include/clang/Basic/DiagnosticLexKinds.td index 77090e9292..e6b2394dc5 100644 --- a/include/clang/Basic/DiagnosticLexKinds.td +++ b/include/clang/Basic/DiagnosticLexKinds.td @@ -157,10 +157,8 @@ def ext_unknown_escape : ExtWarn<"unknown escape sequence '\\%0'">, def err_invalid_decimal_digit : Error<"invalid digit '%0' in decimal constant">; def err_invalid_binary_digit : Error<"invalid digit '%0' in binary constant">; def err_invalid_octal_digit : Error<"invalid digit '%0' in octal constant">; -def err_invalid_suffix_integer_constant : Error< - "invalid suffix '%0' on integer constant">; -def err_invalid_suffix_float_constant : Error< - "invalid suffix '%0' on floating constant">; +def err_invalid_suffix_constant : Error< + "invalid suffix '%0' on %select{integer|floating}1 constant">; def warn_cxx11_compat_digit_separator : Warning< "digit separators are incompatible with C++ standards before C++14">, InGroup<CXXPre14Compat>, DefaultIgnore; diff --git a/lib/Lex/LiteralSupport.cpp b/lib/Lex/LiteralSupport.cpp index 1a1b281bd9..6a112d63b0 100644 --- a/lib/Lex/LiteralSupport.cpp +++ b/lib/Lex/LiteralSupport.cpp @@ -680,9 +680,8 @@ NumericLiteralParser::NumericLiteralParser(StringRef TokSpelling, // Report an error if there are any. PP.Diag(PP.AdvanceToTokenCharacter(TokLoc, SuffixBegin - ThisTokBegin), - isFPConstant ? diag::err_invalid_suffix_float_constant : - diag::err_invalid_suffix_integer_constant) - << StringRef(SuffixBegin, ThisTokEnd-SuffixBegin); + diag::err_invalid_suffix_constant) + << StringRef(SuffixBegin, ThisTokEnd-SuffixBegin) << isFPConstant; hadError = true; return; } |