https://github.com/gedare updated https://github.com/llvm/llvm-project/pull/201703
>From 89642c6b01aa8cf9594ccf7ef75b1be2236d2a83 Mon Sep 17 00:00:00 2001 From: Gedare Bloom <[email protected]> Date: Thu, 4 Jun 2026 15:39:06 -0600 Subject: [PATCH] [clang-format] annotate inline assembly parens Annotate the opening and closing parens of inline assembly. This will make other improvements related to inline assembly easier. --- clang/lib/Format/FormatToken.h | 1 + clang/lib/Format/TokenAnnotator.cpp | 2 + clang/lib/Format/UnwrappedLineParser.cpp | 38 +++++++++++++++---- clang/unittests/Format/TokenAnnotatorTest.cpp | 12 ++++++ 4 files changed, 46 insertions(+), 7 deletions(-) diff --git a/clang/lib/Format/FormatToken.h b/clang/lib/Format/FormatToken.h index 556bb0f3dd0af..ed9ce435ea765 100644 --- a/clang/lib/Format/FormatToken.h +++ b/clang/lib/Format/FormatToken.h @@ -99,6 +99,7 @@ namespace format { TYPE(InheritanceComma) \ TYPE(InlineASMBrace) \ TYPE(InlineASMColon) \ + TYPE(InlineASMParen) \ TYPE(InlineASMSymbolicNameLSquare) \ TYPE(JavaAnnotation) \ TYPE(JsAndAndEqual) \ diff --git a/clang/lib/Format/TokenAnnotator.cpp b/clang/lib/Format/TokenAnnotator.cpp index 43e4f6796b6dd..3403b9dcdbeb0 100644 --- a/clang/lib/Format/TokenAnnotator.cpp +++ b/clang/lib/Format/TokenAnnotator.cpp @@ -2540,6 +2540,8 @@ class AnnotatingParser { } else if (Current.is(tok::r_paren)) { if (rParenEndsCast(Current)) Current.setType(TT_CastRParen); + if (Current.MatchingParen && Current.MatchingParen->is(TT_InlineASMParen)) + Current.setType(TT_InlineASMParen); if (Current.MatchingParen && Current.Next && !Current.Next->isBinaryOperator() && Current.Next->isNoneOf( diff --git a/clang/lib/Format/UnwrappedLineParser.cpp b/clang/lib/Format/UnwrappedLineParser.cpp index f73fe0fce4a9e..fbd3b3d506e66 100644 --- a/clang/lib/Format/UnwrappedLineParser.cpp +++ b/clang/lib/Format/UnwrappedLineParser.cpp @@ -1487,23 +1487,47 @@ void UnwrappedLineParser::parseStructuralElement( return; } switch (FormatTok->Tok.getKind()) { - case tok::kw_asm: + case tok::kw_asm: { + bool DoNotFormat = false; + tok::TokenKind OpenType; + tok::TokenKind CloseType; nextToken(); - if (FormatTok->is(tok::l_brace)) { + while (FormatTok && + FormatTok->isOneOf(tok::kw_volatile, tok::kw_inline, tok::kw_goto)) { + nextToken(); + } + if (FormatTok && FormatTok->is(tok::l_brace)) { FormatTok->setFinalizedType(TT_InlineASMBrace); + OpenType = tok::l_brace; + CloseType = tok::r_brace; + DoNotFormat = true; + } else if (FormatTok && FormatTok->is(tok::l_paren)) { + OpenType = tok::l_paren; + CloseType = tok::r_paren; + FormatTok->setFinalizedType(TT_InlineASMParen); + } + if (DoNotFormat) { + FormatToken *OpenTok = FormatTok; + int NestLevel = 0; nextToken(); while (FormatTok && !eof()) { - if (FormatTok->is(tok::r_brace)) { - FormatTok->setFinalizedType(TT_InlineASMBrace); - nextToken(); - addUnwrappedLine(); - break; + if (FormatTok->is(OpenType)) { + ++NestLevel; + } else if (FormatTok->is(CloseType)) { + --NestLevel; + if (NestLevel < 1) { + FormatTok->setFinalizedType(OpenTok->getType()); + nextToken(); + addUnwrappedLine(); + break; + } } FormatTok->Finalized = true; nextToken(); } } break; + } case tok::kw_namespace: parseNamespace(); return; diff --git a/clang/unittests/Format/TokenAnnotatorTest.cpp b/clang/unittests/Format/TokenAnnotatorTest.cpp index 48ae9e144cc2a..99758966106f3 100644 --- a/clang/unittests/Format/TokenAnnotatorTest.cpp +++ b/clang/unittests/Format/TokenAnnotatorTest.cpp @@ -1930,9 +1930,11 @@ TEST_F(TokenAnnotatorTest, UnderstandsAsm) { ":);"); ASSERT_EQ(Tokens.size(), 10u) << Tokens; EXPECT_TOKEN(Tokens[0], tok::kw_asm, TT_Unknown); + EXPECT_TOKEN(Tokens[1], tok::l_paren, TT_InlineASMParen); EXPECT_TOKEN(Tokens[3], tok::colon, TT_InlineASMColon); EXPECT_TOKEN(Tokens[4], tok::colon, TT_InlineASMColon); EXPECT_TOKEN(Tokens[6], tok::colon, TT_InlineASMColon); + EXPECT_TOKEN(Tokens[7], tok::r_paren, TT_InlineASMParen); Tokens = annotate("asm volatile (\n" "\"a_label:\"\n" @@ -1941,9 +1943,11 @@ TEST_F(TokenAnnotatorTest, UnderstandsAsm) { ":);"); ASSERT_EQ(Tokens.size(), 11u) << Tokens; EXPECT_TOKEN(Tokens[0], tok::kw_asm, TT_Unknown); + EXPECT_TOKEN(Tokens[2], tok::l_paren, TT_InlineASMParen); EXPECT_TOKEN(Tokens[4], tok::colon, TT_InlineASMColon); EXPECT_TOKEN(Tokens[5], tok::colon, TT_InlineASMColon); EXPECT_TOKEN(Tokens[7], tok::colon, TT_InlineASMColon); + EXPECT_TOKEN(Tokens[8], tok::r_paren, TT_InlineASMParen); Tokens = annotate("__asm__(\n" "\"a_label:\"\n" @@ -1952,9 +1956,11 @@ TEST_F(TokenAnnotatorTest, UnderstandsAsm) { ": y);"); ASSERT_EQ(Tokens.size(), 11u) << Tokens; EXPECT_TOKEN(Tokens[0], tok::kw_asm, TT_Unknown); + EXPECT_TOKEN(Tokens[1], tok::l_paren, TT_InlineASMParen); EXPECT_TOKEN(Tokens[3], tok::colon, TT_InlineASMColon); EXPECT_TOKEN(Tokens[5], tok::colon, TT_InlineASMColon); EXPECT_TOKEN(Tokens[6], tok::colon, TT_InlineASMColon); + EXPECT_TOKEN(Tokens[8], tok::r_paren, TT_InlineASMParen); Tokens = annotate("__asm volatile (\n" "\"a_label:\"\n" @@ -1964,9 +1970,11 @@ TEST_F(TokenAnnotatorTest, UnderstandsAsm) { ":);"); ASSERT_EQ(Tokens.size(), 12u) << Tokens; EXPECT_TOKEN(Tokens[0], tok::kw_asm, TT_Unknown); + EXPECT_TOKEN(Tokens[2], tok::l_paren, TT_InlineASMParen); EXPECT_TOKEN(Tokens[5], tok::colon, TT_InlineASMColon); EXPECT_TOKEN(Tokens[6], tok::colon, TT_InlineASMColon); EXPECT_TOKEN(Tokens[8], tok::colon, TT_InlineASMColon); + EXPECT_TOKEN(Tokens[9], tok::r_paren, TT_InlineASMParen); Tokens = annotate("asm(\n" "\"insn\"\n" @@ -1975,9 +1983,11 @@ TEST_F(TokenAnnotatorTest, UnderstandsAsm) { ": \"memory\");"); ASSERT_EQ(Tokens.size(), 19u) << Tokens; EXPECT_TOKEN(Tokens[0], tok::kw_asm, TT_Unknown); + EXPECT_TOKEN(Tokens[1], tok::l_paren, TT_InlineASMParen); EXPECT_TOKEN(Tokens[3], tok::colon, TT_InlineASMColon); EXPECT_TOKEN(Tokens[13], tok::colon, TT_InlineASMColon); EXPECT_TOKEN(Tokens[14], tok::colon, TT_InlineASMColon); + EXPECT_TOKEN(Tokens[16], tok::r_paren, TT_InlineASMParen); Tokens = annotate("__asm__ volatile (\n" "\"ldr r1, [r0, %%[sym]]\"\n" @@ -1986,9 +1996,11 @@ TEST_F(TokenAnnotatorTest, UnderstandsAsm) { ");"); ASSERT_EQ(Tokens.size(), 21u) << Tokens; EXPECT_TOKEN(Tokens[0], tok::kw_asm, TT_Unknown); + EXPECT_TOKEN(Tokens[2], tok::l_paren, TT_InlineASMParen); EXPECT_TOKEN(Tokens[4], tok::colon, TT_InlineASMColon); EXPECT_TOKEN(Tokens[5], tok::colon, TT_InlineASMColon); EXPECT_TOKEN(Tokens[6], tok::l_square, TT_InlineASMSymbolicNameLSquare); + EXPECT_TOKEN(Tokens[18], tok::r_paren, TT_InlineASMParen); } TEST_F(TokenAnnotatorTest, UnderstandsObjCBlock) { _______________________________________________ cfe-commits mailing list [email protected] https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
