Following a suggestion from Erik Verbruggen, added a note to the unique
enum warning with a fixit hint to set the final element to equal the
previous element to silence the warning.
Index: test/SemaCXX/warn-unique-enum.cpp
===================================================================
--- test/SemaCXX/warn-unique-enum.cpp (revision 158749)
+++ test/SemaCXX/warn-unique-enum.cpp (working copy)
@@ -1,8 +1,13 @@
// RUN: %clang_cc1 %s -fsyntax-only -verify -Wunique-enum
-enum A { A1 = 1, A2 = 1, A3 = 1 }; // expected-warning {{all elements of 'A' are initialized with literals to value 1}}
+enum A { A1 = 1, A2 = 1, A3 = 1 }; // expected-warning {{all elements of 'A' are initialized with literals to value 1}} \
+// expected-note {{initialize the last element with the previous element to silence this warning}}
enum { B1 = 1, B2 = 1, B3 = 1 }; // no warning
-enum C { C1 = true, C2 = true}; // expected-warning {{all elements of 'C' are initialized with literals to value 1}}
-enum D { D1 = 5, D2 = 5L, D3 = 5UL, D4 = 5LL, D5 = 5ULL }; // expected-warning {{all elements of 'D' are initialized with literals to value 5}}
+enum C { // expected-warning {{all elements of 'C' are initialized with literals to value 1}}
+ C1 = true,
+ C2 = true // expected-note {{initialize the last element with the previous element to silence this warning}}
+};
+enum D { D1 = 5, D2 = 5L, D3 = 5UL, D4 = 5LL, D5 = 5ULL }; // expected-warning {{all elements of 'D' are initialized with literals to value 5}} \
+// expected-note {{initialize the last element with the previous element to silence this warning}}
// Don't warn on enums with less than 2 elements.
enum E { E1 = 4 };
Index: include/clang/Basic/DiagnosticSemaKinds.td
===================================================================
--- include/clang/Basic/DiagnosticSemaKinds.td (revision 158749)
+++ include/clang/Basic/DiagnosticSemaKinds.td (working copy)
@@ -23,6 +23,9 @@
def warn_identical_enum_values : Warning<
"all elements of %0 are initialized with literals to value %1">,
InGroup<DiagGroup<"unique-enum">>;
+def note_identical_enum_values : Note<
+ "initialize the last element with the previous element to silence "
+ "this warning">;
// Constant expressions
def err_expr_not_ice : Error<
Index: lib/Sema/SemaDecl.cpp
===================================================================
--- lib/Sema/SemaDecl.cpp (revision 158749)
+++ lib/Sema/SemaDecl.cpp (working copy)
@@ -10342,6 +10342,13 @@
S.Diag(Enum->getLocation(), diag::warn_identical_enum_values)
<< EnumType << FirstVal.toString(10)
<< Enum->getSourceRange();
+
+ EnumConstantDecl *Last = cast<EnumConstantDecl>(Elements[NumElements - 1]),
+ *Next = cast<EnumConstantDecl>(Elements[NumElements - 2]);
+
+ S.Diag(Last->getLocation(), diag::note_identical_enum_values)
+ << FixItHint::CreateReplacement(Last->getInitExpr()->getSourceRange(),
+ Next->getName());
}
void Sema::ActOnEnumBody(SourceLocation EnumLoc, SourceLocation LBraceLoc,
_______________________________________________
cfe-commits mailing list
[email protected]
http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits
