Author: sstwcw Date: 2023-04-01T17:10:31Z New Revision: feb585e7d62ce92fcd8334abde4a84ee0301dcd3
URL: https://github.com/llvm/llvm-project/commit/feb585e7d62ce92fcd8334abde4a84ee0301dcd3 DIFF: https://github.com/llvm/llvm-project/commit/feb585e7d62ce92fcd8334abde4a84ee0301dcd3.diff LOG: [clang-format] Handle Verilog struct literals Previously `isVerilogIdentifier` was mistaking the apostrophe used in struct literals as an identifier. It is fixed. Reviewed By: HazardyKnusperkeks, owenpan Differential Revision: https://reviews.llvm.org/D147329 Added: Modified: clang/lib/Format/Format.cpp clang/lib/Format/FormatToken.h clang/unittests/Format/FormatTestVerilog.cpp Removed: ################################################################################ diff --git a/clang/lib/Format/Format.cpp b/clang/lib/Format/Format.cpp index 618cdb68f7c4..97c4867fcb44 100644 --- a/clang/lib/Format/Format.cpp +++ b/clang/lib/Format/Format.cpp @@ -1489,6 +1489,7 @@ FormatStyle getLLVMStyle(FormatStyle::LanguageKind Language) { break; case FormatStyle::LK_Verilog: LLVMStyle.IndentCaseLabels = true; + LLVMStyle.SpacesInContainerLiterals = false; break; default: break; diff --git a/clang/lib/Format/FormatToken.h b/clang/lib/Format/FormatToken.h index 5cd3422aed5b..59d4a871f7ec 100644 --- a/clang/lib/Format/FormatToken.h +++ b/clang/lib/Format/FormatToken.h @@ -1722,8 +1722,9 @@ struct AdditionalKeywords { case tok::kw_while: return false; case tok::identifier: - return VerilogExtraKeywords.find(Tok.Tok.getIdentifierInfo()) == - VerilogExtraKeywords.end(); + return isWordLike(Tok) && + VerilogExtraKeywords.find(Tok.Tok.getIdentifierInfo()) == + VerilogExtraKeywords.end(); default: // getIdentifierInfo returns non-null for both identifiers and keywords. return Tok.Tok.getIdentifierInfo(); diff --git a/clang/unittests/Format/FormatTestVerilog.cpp b/clang/unittests/Format/FormatTestVerilog.cpp index 3243d3343dca..9d3ccf9f1da0 100644 --- a/clang/unittests/Format/FormatTestVerilog.cpp +++ b/clang/unittests/Format/FormatTestVerilog.cpp @@ -916,6 +916,25 @@ TEST_F(FormatTestVerilog, Streaming) { verifyFormat("{<<byte{j}} = x;"); } +TEST_F(FormatTestVerilog, StructLiteral) { + verifyFormat("c = '{0, 0.0};"); + verifyFormat("c = '{'{1, 1.0}, '{2, 2.0}};"); + verifyFormat("c = '{a: 0, b: 0.0};"); + verifyFormat("c = '{a: 0, b: 0.0, default: 0};"); + verifyFormat("c = ab'{a: 0, b: 0.0};"); + verifyFormat("c = ab'{cd: cd'{1, 1.0}, ef: ef'{2, 2.0}};"); + verifyFormat("c = ab'{cd'{1, 1.0}, ef'{2, 2.0}};"); + verifyFormat("d = {int: 1, shortreal: 1.0};"); + verifyFormat("d = ab'{int: 1, shortreal: 1.0};"); + verifyFormat("c = '{default: 0};"); + auto Style = getDefaultStyle(); + Style.SpacesInContainerLiterals = true; + verifyFormat("c = '{a : 0, b : 0.0};", Style); + verifyFormat("c = '{a : 0, b : 0.0, default : 0};", Style); + verifyFormat("c = ab'{a : 0, b : 0.0};", Style); + verifyFormat("c = ab'{cd : cd'{1, 1.0}, ef : ef'{2, 2.0}};", Style); +} + TEST_F(FormatTestVerilog, StructuredProcedure) { // Blocks should be indented correctly. verifyFormat("initial begin\n" _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
