Author: Owen Pan Date: 2023-05-16T13:17:31-07:00 New Revision: a72b064acf9546ee41c67c77ed8662d5d3b2fadc
URL: https://github.com/llvm/llvm-project/commit/a72b064acf9546ee41c67c77ed8662d5d3b2fadc DIFF: https://github.com/llvm/llvm-project/commit/a72b064acf9546ee41c67c77ed8662d5d3b2fadc.diff LOG: [clang-format] Handle <chrono> ud suffixes in IntegerLiteralSeparator Fixes #62679. Differential Revision: https://reviews.llvm.org/D150539 Added: Modified: clang/lib/Format/IntegerLiteralSeparatorFixer.cpp clang/unittests/Format/IntegerLiteralSeparatorTest.cpp Removed: ################################################################################ diff --git a/clang/lib/Format/IntegerLiteralSeparatorFixer.cpp b/clang/lib/Format/IntegerLiteralSeparatorFixer.cpp index 583cc3d682a79..87823ae32b113 100644 --- a/clang/lib/Format/IntegerLiteralSeparatorFixer.cpp +++ b/clang/lib/Format/IntegerLiteralSeparatorFixer.cpp @@ -113,7 +113,11 @@ IntegerLiteralSeparatorFixer::process(const Environment &Env, continue; } if (Style.isCpp()) { - if (const auto Pos = Text.find_first_of("_i"); Pos != StringRef::npos) { + // Hex alpha digits a-f/A-F must be at the end of the string literal. + StringRef Suffixes = "_himnsuyd"; + if (const auto Pos = + Text.find_first_of(IsBase16 ? Suffixes.drop_back() : Suffixes); + Pos != StringRef::npos) { Text = Text.substr(0, Pos); Length = Pos; } diff --git a/clang/unittests/Format/IntegerLiteralSeparatorTest.cpp b/clang/unittests/Format/IntegerLiteralSeparatorTest.cpp index 27fc6d76f3c49..b1e42e924e05c 100644 --- a/clang/unittests/Format/IntegerLiteralSeparatorTest.cpp +++ b/clang/unittests/Format/IntegerLiteralSeparatorTest.cpp @@ -60,6 +60,24 @@ TEST_F(IntegerLiteralSeparatorTest, SingleQuoteAsSeparator) { "hil = 0xABCil;", Style); + verifyFormat("bd = 0b1'0000d;\n" + "dh = 1'234h;\n" + "dmin = 1'234min;\n" + "dns = 1'234ns;\n" + "ds = 1'234s;\n" + "dus = 1'234us;\n" + "hy = 0xA'BCy;", + "bd = 0b10000d;\n" + "dh = 1234h;\n" + "dmin = 1234min;\n" + "dns = 1234ns;\n" + "ds = 1234s;\n" + "dus = 1234us;\n" + "hy = 0xABCy;", + Style); + + verifyFormat("hd = 0xAB'Cd;", "hd = 0xABCd;", Style); + verifyFormat("d = 5'678_km;\n" "h = 0xD'EF_u16;", "d = 5678_km;\n" _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits