llvmbot wrote:
<!--LLVM PR SUMMARY COMMENT--> @llvm/pr-subscribers-clang-format Author: John Mitchell (fauxprogrammer) <details> <summary>Changes</summary> C23 language standard has added support for the C++ tick mark as a numeric separator. Add support to clang-format so that when formatting configured for LK_C this code path is enabled. Fixes #<!-- -->179686 --- Full diff: https://github.com/llvm/llvm-project/pull/182296.diff 3 Files Affected: - (modified) clang/docs/ClangFormatStyleOptions.rst (+2-2) - (modified) clang/lib/Format/IntegerLiteralSeparatorFixer.cpp (+3) - (modified) clang/unittests/Format/IntegerLiteralSeparatorTest.cpp (+63-56) ``````````diff diff --git a/clang/docs/ClangFormatStyleOptions.rst b/clang/docs/ClangFormatStyleOptions.rst index 437f559fc0395..e3005759deeda 100644 --- a/clang/docs/ClangFormatStyleOptions.rst +++ b/clang/docs/ClangFormatStyleOptions.rst @@ -4751,8 +4751,8 @@ the configuration (without a prefix: ``Auto``). .. _IntegerLiteralSeparator: **IntegerLiteralSeparator** (``IntegerLiteralSeparatorStyle``) :versionbadge:`clang-format 16` :ref:`¶ <IntegerLiteralSeparator>` - Format integer literal separators (``'`` for C++ and ``_`` for C#, Java, - and JavaScript). + Format integer literal separators (``'`` for C, C++ and ``_`` for C#, Java, + and JavaScript). Note that using the separator with C requires a C23+ compiler. Nested configuration flags: diff --git a/clang/lib/Format/IntegerLiteralSeparatorFixer.cpp b/clang/lib/Format/IntegerLiteralSeparatorFixer.cpp index a283884b6c341..1256925bf6d7d 100644 --- a/clang/lib/Format/IntegerLiteralSeparatorFixer.cpp +++ b/clang/lib/Format/IntegerLiteralSeparatorFixer.cpp @@ -50,6 +50,9 @@ IntegerLiteralSeparatorFixer::process(const Environment &Env, case FormatStyle::LK_JavaScript: Separator = '_'; break; + case FormatStyle::LK_C: + Separator = '\''; + break; case FormatStyle::LK_Cpp: case FormatStyle::LK_ObjC: if (Style.Standard >= FormatStyle::LS_Cpp14) { diff --git a/clang/unittests/Format/IntegerLiteralSeparatorTest.cpp b/clang/unittests/Format/IntegerLiteralSeparatorTest.cpp index 21cdab2187d90..8401c1994a1e3 100644 --- a/clang/unittests/Format/IntegerLiteralSeparatorTest.cpp +++ b/clang/unittests/Format/IntegerLiteralSeparatorTest.cpp @@ -24,65 +24,72 @@ TEST_F(IntegerLiteralSeparatorTest, SingleQuoteAsSeparator) { EXPECT_EQ(Style.IntegerLiteralSeparator.Decimal, 0); EXPECT_EQ(Style.IntegerLiteralSeparator.Hex, 0); - constexpr StringRef Binary("b = 0b10011'11'0110'1u;"); - verifyFormat(Binary, Style); - Style.IntegerLiteralSeparator.Binary = -1; - verifyFormat("b = 0b100111101101u;", Binary, Style); - Style.IntegerLiteralSeparator.Binary = 1; - verifyFormat("b = 0b1'0'0'1'1'1'1'0'1'1'0'1u;", Binary, Style); - Style.IntegerLiteralSeparator.Binary = 4; - verifyFormat("b = 0b1001'1110'1101u;", Binary, Style); - - constexpr StringRef Decimal("d = 184467'440737'0'95505'92Ull;"); - verifyFormat(Decimal, Style); - Style.IntegerLiteralSeparator.Decimal = -1; - verifyFormat("d = 18446744073709550592Ull;", Decimal, Style); - Style.IntegerLiteralSeparator.Decimal = 3; - verifyFormat("d = 18'446'744'073'709'550'592Ull;", Decimal, Style); - - constexpr StringRef Hex("h = 0xDEAD'BEEF'DE'AD'BEE'Fuz;"); - verifyFormat(Hex, Style); - Style.IntegerLiteralSeparator.Hex = -1; - verifyFormat("h = 0xDEADBEEFDEADBEEFuz;", Hex, Style); - Style.IntegerLiteralSeparator.Hex = 2; - verifyFormat("h = 0xDE'AD'BE'EF'DE'AD'BE'EFuz;", Hex, Style); - - verifyFormat("o0 = 0;\n" - "o1 = 07;\n" - "o5 = 012345;", - Style); - - verifyFormat("bi = 0b1'0000i;\n" - "dif = 1'234if;\n" - "hil = 0xA'BCil;", - "bi = 0b10000i;\n" - "dif = 1234if;\n" - "hil = 0xABCil;", - Style); + auto TestSingleQuote = [&](auto Language) { + Style.Language = Language; + + constexpr StringRef Binary("b = 0b10011'11'0110'1u;"); + verifyFormat(Binary, Style); + Style.IntegerLiteralSeparator.Binary = -1; + verifyFormat("b = 0b100111101101u;", Binary, Style); + Style.IntegerLiteralSeparator.Binary = 1; + verifyFormat("b = 0b1'0'0'1'1'1'1'0'1'1'0'1u;", Binary, Style); + Style.IntegerLiteralSeparator.Binary = 4; + verifyFormat("b = 0b1001'1110'1101u;", Binary, 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); + constexpr StringRef Decimal("d = 184467'440737'0'95505'92Ull;"); + verifyFormat(Decimal, Style); + Style.IntegerLiteralSeparator.Decimal = -1; + verifyFormat("d = 18446744073709550592Ull;", Decimal, Style); + Style.IntegerLiteralSeparator.Decimal = 3; + verifyFormat("d = 18'446'744'073'709'550'592Ull;", Decimal, Style); - verifyFormat("hd = 0xAB'Cd;", "hd = 0xABCd;", Style); + constexpr StringRef Hex("h = 0xDEAD'BEEF'DE'AD'BEE'Fuz;"); + verifyFormat(Hex, Style); + Style.IntegerLiteralSeparator.Hex = -1; + verifyFormat("h = 0xDEADBEEFDEADBEEFuz;", Hex, Style); + Style.IntegerLiteralSeparator.Hex = 2; + verifyFormat("h = 0xDE'AD'BE'EF'DE'AD'BE'EFuz;", Hex, Style); + + verifyFormat("o0 = 0;\n" + "o1 = 07;\n" + "o5 = 012345;", + Style); + + verifyFormat("bi = 0b1'0000i;\n" + "dif = 1'234if;\n" + "hil = 0xA'BCil;", + "bi = 0b10000i;\n" + "dif = 1234if;\n" + "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" + "h = 0xDEF_u16;", + Style); + }; - verifyFormat("d = 5'678_km;\n" - "h = 0xD'EF_u16;", - "d = 5678_km;\n" - "h = 0xDEF_u16;", - Style); + TestSingleQuote(FormatStyle::LK_C); + TestSingleQuote(FormatStyle::LK_Cpp); Style.Standard = FormatStyle::LS_Cpp11; verifyFormat("ld = 1234L;", Style); `````````` </details> https://github.com/llvm/llvm-project/pull/182296 _______________________________________________ cfe-commits mailing list [email protected] https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
