aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArgyrios Kyrtzidis <akyrtzi@gmail.com>2010-11-17 18:26:33 +0000
committerArgyrios Kyrtzidis <akyrtzi@gmail.com>2010-11-17 18:26:33 +0000
commit75fd3f98d1b10fbd5bb996e08873e7c6995ce2f0 (patch)
treedb83e7da1a854746dfbc7116990925e85d5b6587
parentea1924e62162b299d797d23992a466142b3c6c68 (diff)
Put warn_logical_and_in_logical_or warning in new warning group "logical-op-parentheses" member of "parentheses".
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@119532 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r--include/clang/Basic/DiagnosticGroups.td5
-rw-r--r--include/clang/Basic/DiagnosticSemaKinds.td2
2 files changed, 5 insertions, 2 deletions
diff --git a/include/clang/Basic/DiagnosticGroups.td b/include/clang/Basic/DiagnosticGroups.td
index c89ab09b3a..7fb14705df 100644
--- a/include/clang/Basic/DiagnosticGroups.td
+++ b/include/clang/Basic/DiagnosticGroups.td
@@ -54,6 +54,7 @@ def : DiagGroup<"effc++">;
def FourByteMultiChar : DiagGroup<"four-char-constants">;
def GlobalConstructors : DiagGroup<"global-constructors">;
def : DiagGroup<"idiomatic-parentheses">;
+def LogicalOpParentheses: DiagGroup<"logical-op-parentheses">;
def IgnoredQualifiers : DiagGroup<"ignored-qualifiers">;
def : DiagGroup<"import">;
def : DiagGroup<"init-self">;
@@ -162,7 +163,9 @@ def CharSubscript : DiagGroup<"char-subscripts">;
// -Widiomatic-parentheses contains warnings about 'idiomatic'
// missing parentheses; it is off by default.
-def Parentheses : DiagGroup<"parentheses", [DiagGroup<"idiomatic-parentheses">]>;
+def Parentheses : DiagGroup<"parentheses",
+ [LogicalOpParentheses,
+ DiagGroup<"idiomatic-parentheses">]>;
// -Wconversion has its own warnings, but we split a few out for
// legacy reasons:
diff --git a/include/clang/Basic/DiagnosticSemaKinds.td b/include/clang/Basic/DiagnosticSemaKinds.td
index 4c8325621f..277653e7ea 100644
--- a/include/clang/Basic/DiagnosticSemaKinds.td
+++ b/include/clang/Basic/DiagnosticSemaKinds.td
@@ -2158,7 +2158,7 @@ def warn_logical_instead_of_bitwise : Warning<
"remove constant">, InGroup<DiagGroup<"constant-logical-operand">>;
def warn_logical_and_in_logical_or : Warning<
- "'&&' within '||'">, InGroup<Parentheses>;
+ "'&&' within '||'">, InGroup<LogicalOpParentheses>;
def note_logical_and_in_logical_or_silence : Note<
"place parentheses around the '&&' expression to silence this warning">;