Reinforce A5-2-6

Author: jeongsoolee09

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

@@ -17,11 +17,17 @@
 import cpp
 import codingstandards.cpp.autosar
 
-from BinaryLogicalOperation op, BinaryOperation binop
+from BinaryLogicalOperation op, Expr operand
 where
   not isExcluded(op, OrderOfEvaluationPackage::operandsOfALogicalAndOrNotParenthesizedQuery()) and
-  op.getAnOperand() = binop 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"
+  operand = op.getAnOperand() and
+  /* The operand is a built-in arithmetic/logic binary operation */
+  if operand instanceof BinaryOperation
+  then
+    not exists(ParenthesisExpr p | p = operand.getFullyConverted()) and
+    // Exclude binary operations expanded by a macro.
+    not operand.isInMacroExpansion()
+  else
+    /* The operand should not be a field access operation */
+    not operand instanceof FieldAccess
+select op, "Binary $@ operand of logical operation is not parenthesized.", operand, "operator"

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

@@ -1,4 +1,5 @@
-extern void f1();
+// TODO: remove function body
+extern void f1(){};
 void f2(int p1, int p2) {
   if (p1 > 0 && p1 < 10) { // NON_COMPLIANT
     f1();
@@ -20,15 +21,18 @@ void f2(int p1, int p2) {
     int x;
   } sample;
 
-  if ((p1 > 0 ||
-       sample.x)) { // COMPLIANT: struct member accessors (.) are excluded
+  if ((p1 > 0) ||
+      sample.x) { // COMPLIANT: struct member accessors (.) are excluded
     f1();
   }
 
   Sample *sample_ptr = &sample;
 
-  if ((p1 > 0 || sample_ptr->x)) { // COMPLIANT: struct member accessors with
+  if ((p1 > 0) || sample_ptr->x) { // COMPLIANT: struct member accessors with
                                    // dereference (->) are excluded
     f1();
   }
-}
+}
+
+// TODO: remove this
+int main() { return 0; }