Merge pull request #753 from github/lcartey/a5-2-6

`A5-2-6`: Ignore cases with the same operator

Author: lcartey

change_notes/2024-10-17-a5-2-6-no-ambiguity.md

@@ -0,0 +1,3 @@
+ - `A5-2-6` - `OperandsOfAlogicalAndOrNotParenthesized.ql`:
+   - Remove false positives where the operator is identical.
+   - Improve alert message to clarify which expression needs to be parenthesized.

cpp/autosar/src/rules/A5-2-6/OperandsOfALogicalAndOrNotParenthesized.ql

@@ -17,11 +17,20 @@
 import cpp
 import codingstandards.cpp.autosar
 
-from BinaryLogicalOperation op, BinaryOperation binop
+from BinaryLogicalOperation op, BinaryOperation binop, string leftOrRight
 where
   not isExcluded(op, OrderOfEvaluationPackage::operandsOfALogicalAndOrNotParenthesizedQuery()) and
-  op.getAnOperand() = binop and
+  (
+    op.getLeftOperand() = binop and
+    leftOrRight = "Left"
+    or
+    op.getRightOperand() = binop and
+    leftOrRight = "Right"
+  ) and
+  // Ignore cases with the same operator
+  not op.getOperator() = binop.getOperator() and
   not exists(ParenthesisExpr p | p = binop.getFullyConverted()) and
   // Exclude binary operations expanded by a macro.
   not binop.isInMacroExpansion()
-select op, "Binary $@ operand of logical operation is not parenthesized.", binop, "operator"
+select op, "$@ of logical operation " + op.getOperator() + " is not parenthesized.", binop,
+  leftOrRight + " operand " + binop.getOperator()

cpp/autosar/test/rules/A5-2-6/OperandsOfALogicalAndOrNotParenthesized.expected

@@ -1,3 +1,3 @@
-| test.cpp:3:7:3:23 | ... && ... | Binary $@ operand of logical operation is not parenthesized. | test.cpp:3:7:3:12 | ... > ... | operator |
-| test.cpp:3:7:3:23 | ... && ... | Binary $@ operand of logical operation is not parenthesized. | test.cpp:3:17:3:23 | ... < ... | operator |
-| test.cpp:7:7:7:24 | ... \|\| ... | Binary $@ operand of logical operation is not parenthesized. | test.cpp:7:19:7:24 | ... > ... | operator |
+| test.cpp:3:7:3:23 | ... && ... | $@ of logical operation && is not parenthesized. | test.cpp:3:7:3:12 | ... > ... | Left operand > |
+| test.cpp:3:7:3:23 | ... && ... | $@ of logical operation && is not parenthesized. | test.cpp:3:17:3:23 | ... < ... | Right operand < |
+| test.cpp:7:7:7:24 | ... \|\| ... | $@ of logical operation \|\| is not parenthesized. | test.cpp:7:19:7:24 | ... > ... | Right operand > |

cpp/autosar/test/rules/A5-2-6/test.cpp

@@ -25,6 +25,8 @@ void f2(int p1, int p2) {
     f1();
   }
 
+  (p1 > 0) && (p2 > 0) && (p1 > p2); // COMPLIANT - no ambiguity
+
   Sample *sample_ptr = &sample;
 
   if ((p1 > 0) || sample_ptr->x) { // COMPLIANT: struct member accessors with