sstwcw created this revision.
sstwcw added reviewers: HazardyKnusperkeks, MyDeveloperDay, curdeius, owenpan.
Herald added a project: All.
sstwcw requested review of this revision.
Herald added a project: clang.
Herald added a subscriber: cfe-commits.
Repository:
rG LLVM Github Monorepo
https://reviews.llvm.org/D142891
Files:
clang/lib/Format/TokenAnnotator.cpp
clang/lib/Format/WhitespaceManager.cpp
clang/unittests/Format/FormatTestVerilog.cpp
clang/unittests/Format/TokenAnnotatorTest.cpp
Index: clang/unittests/Format/TokenAnnotatorTest.cpp
===================================================================
--- clang/unittests/Format/TokenAnnotatorTest.cpp
+++ clang/unittests/Format/TokenAnnotatorTest.cpp
@@ -1247,6 +1247,21 @@
EXPECT_TOKEN(Tokens[5], tok::question, TT_ConditionalExpr);
EXPECT_TOKEN(Tokens[7], tok::colon, TT_ConditionalExpr);
EXPECT_TOKEN(Tokens[9], tok::colon, TT_GotoLabelColon);
+ // Non-blocking assignments.
+ Tokens = Annotate("a <= b;");
+ ASSERT_EQ(Tokens.size(), 5u);
+ EXPECT_TOKEN(Tokens[1], tok::lessequal, TT_BinaryOperator);
+ EXPECT_TOKEN_PRECEDENCE(Tokens[1], prec::Assignment);
+ Tokens = Annotate("if (a <= b) break;");
+ ASSERT_EQ(Tokens.size(), 9u);
+ EXPECT_TOKEN(Tokens[3], tok::lessequal, TT_BinaryOperator);
+ EXPECT_TOKEN_PRECEDENCE(Tokens[3], prec::Relational);
+ Tokens = Annotate("a <= b <= a;");
+ ASSERT_EQ(Tokens.size(), 7u);
+ EXPECT_TOKEN(Tokens[1], tok::lessequal, TT_BinaryOperator);
+ EXPECT_TOKEN_PRECEDENCE(Tokens[1], prec::Assignment);
+ EXPECT_TOKEN(Tokens[3], tok::lessequal, TT_BinaryOperator);
+ EXPECT_TOKEN_PRECEDENCE(Tokens[3], prec::Relational);
}
TEST_F(TokenAnnotatorTest, UnderstandConstructors) {
Index: clang/unittests/Format/FormatTestVerilog.cpp
===================================================================
--- clang/unittests/Format/FormatTestVerilog.cpp
+++ clang/unittests/Format/FormatTestVerilog.cpp
@@ -45,6 +45,58 @@
}
};
+TEST_F(FormatTestVerilog, Align) {
+ FormatStyle Style = getLLVMStyle(FormatStyle::LK_Verilog);
+ Style.AlignConsecutiveAssignments.Enabled = true;
+ verifyFormat("x <= x;\n"
+ "sfdbddfbdfbb <= x;\n"
+ "x = x;",
+ Style);
+ verifyFormat("x = x;\n"
+ "sfdbddfbdfbb = x;\n"
+ "x = x;",
+ Style);
+ // Compound assignments are not aligned by default. '<=' is not a compound
+ // assignment.
+ verifyFormat("x <= x;\n"
+ "sfdbddfbdfbb <= x;",
+ Style);
+ verifyFormat("x += x;\n"
+ "sfdbddfbdfbb <= x;",
+ Style);
+ verifyFormat("x <<= x;\n"
+ "sfdbddfbdfbb <= x;",
+ Style);
+ verifyFormat("x <<<= x;\n"
+ "sfdbddfbdfbb <= x;",
+ Style);
+ verifyFormat("x >>= x;\n"
+ "sfdbddfbdfbb <= x;",
+ Style);
+ verifyFormat("x >>>= x;\n"
+ "sfdbddfbdfbb <= x;",
+ Style);
+ Style.AlignConsecutiveAssignments.AlignCompound = true;
+ verifyFormat("x <= x;\n"
+ "sfdbddfbdfbb <= x;",
+ Style);
+ verifyFormat("x += x;\n"
+ "sfdbddfbdfbb <= x;",
+ Style);
+ verifyFormat("x <<= x;\n"
+ "sfdbddfbdfbb <= x;",
+ Style);
+ verifyFormat("x <<<= x;\n"
+ "sfdbddfbdfbb <= x;",
+ Style);
+ verifyFormat("x >>= x;\n"
+ "sfdbddfbdfbb <= x;",
+ Style);
+ verifyFormat("x >>>= x;\n"
+ "sfdbddfbdfbb <= x;",
+ Style);
+}
+
TEST_F(FormatTestVerilog, BasedLiteral) {
verifyFormat("x = '0;");
verifyFormat("x = '1;");
Index: clang/lib/Format/WhitespaceManager.cpp
===================================================================
--- clang/lib/Format/WhitespaceManager.cpp
+++ clang/lib/Format/WhitespaceManager.cpp
@@ -838,7 +838,12 @@
return Style.AlignConsecutiveAssignments.AlignCompound
? C.Tok->getPrecedence() == prec::Assignment
- : C.Tok->is(tok::equal);
+ : C.Tok->is(tok::equal) ||
+ // In Verilog the '<=' is not a compound assignment,
+ // thus it is aligned even when the AlignCompound
+ // option is not set.
+ (Style.isVerilog() && C.Tok->is(tok::lessequal) &&
+ C.Tok->getPrecedence() == prec::Assignment);
},
Changes, /*StartAt=*/0, Style.AlignConsecutiveAssignments,
/*RightJustify=*/true);
Index: clang/lib/Format/TokenAnnotator.cpp
===================================================================
--- clang/lib/Format/TokenAnnotator.cpp
+++ clang/lib/Format/TokenAnnotator.cpp
@@ -1625,6 +1625,7 @@
bool CaretFound = false;
bool InCpp11AttributeSpecifier = false;
bool InCSharpAttributeSpecifier = false;
+ bool AssignmentFound = false;
enum {
Unknown,
// Like the part after `:` in a constructor.
@@ -1922,7 +1923,17 @@
(!Current.Previous || Current.Previous->isNot(tok::l_square)) &&
(!Current.is(tok::greater) &&
Style.Language != FormatStyle::LK_TextProto)) {
- Current.setType(TT_BinaryOperator);
+ if (Style.isVerilog() && Current.is(tok::lessequal) &&
+ Contexts.size() == 1 && !Contexts.back().AssignmentFound) {
+ // In Verilog `<=` is assignment if in its own statement. It is a
+ // statement instead of an expression, that is it can not be chained.
+ Current.ForcedPrecedence = prec::Assignment;
+ Current.setFinalizedType(TT_BinaryOperator);
+ } else {
+ Current.setType(TT_BinaryOperator);
+ }
+ if (Current.getPrecedence() == prec::Assignment)
+ Contexts.back().AssignmentFound = true;
} else if (Current.is(tok::comment)) {
if (Current.TokenText.startswith("/*")) {
if (Current.TokenText.endswith("*/")) {
_______________________________________________
cfe-commits mailing list
[email protected]
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
