Renamed query RULE-14-3

Author: s-samadi

…14-3/ControllingExpInvariantCondition.ql …es/RULE-14-3/ControllingExprInvariant.qlc/misra/src/rules/RULE-14-3/ControllingExpInvariantCondition.ql renamed to c/misra/src/rules/RULE-14-3/ControllingExprInvariant.ql c/misra/src/rules/RULE-14-3/ControllingExpInvariantCondition.ql renamed to c/misra/src/rules/RULE-14-3/ControllingExprInvariant.ql

@@ -1,5 +1,5 @@
 /**
- * @id c/misra/controlling-exp-invariant-condition
+ * @id c/misra/controlling-expr-invariant
  * @name RULE-14-3: Controlling expressions shall not be invariant
  * @description If a controlling expression has an invariant value then it is possible that there is
  *              a programming error.
@@ -15,10 +15,12 @@
 
 import cpp
 import codingstandards.c.misra
+import cpp
+import codingstandards.c.misra
 
 from ControlFlowNode expr, string message
 where
-  not isExcluded(expr, Statements5Package::controllingExpInvariantConditionQuery()) and
+  not isExcluded(expr, Statements5Package::controllingExprInvariantQuery()) and
   (
     exists(IfStmt ifStmt |
       (

c/misra/test/rules/RULE-14-3/ControllingExpInvariantCondition.qlref

@@ -1,3 +1,4 @@
 | test.c:2:7:2:11 | ... > ... | Controlling expression in if statement has invariant value. |
 | test.c:13:10:13:16 | ... > ... | Controlling expression in loop statement has invariant value. |
 | test.c:14:9:14:13 | ... > ... | Controlling expression in if statement has invariant value. |
+| test.c:18:20:18:24 | ... < ... | Controlling expression in loop statement has invariant value. |

…ontrollingExpInvariantCondition.expected …E-14-3/ControllingExprInvariant.expectedc/misra/test/rules/RULE-14-3/ControllingExpInvariantCondition.expected renamed to c/misra/test/rules/RULE-14-3/ControllingExprInvariant.expected c/misra/test/rules/RULE-14-3/ControllingExpInvariantCondition.expected renamed to c/misra/test/rules/RULE-14-3/ControllingExprInvariant.expected

@@ -0,0 +1 @@
+rules/RULE-14-3/ControllingExprInvariant.ql

c/misra/test/rules/RULE-14-3/ControllingExprInvariant.qlref

@@ -9,9 +9,12 @@ void f1(int p1) {
   }
 }
 
-void f2(int p1) {
+void f2() {
   while (20 > 10) { // NON_COMPLIANT
     if (1 > 2) {
     } // NON_COMPLIANT
   }
-}
+
+  for (int i = 10; i < 5; i++) { // NON_COMPLIANT
+  }
+}

c/misra/test/rules/RULE-14-3/test.c

@@ -4,17 +4,17 @@ import RuleMetadata
 import codingstandards.cpp.exclusions.RuleMetadata
 
 newtype Statements5Query =
-  TControllingExpInvariantConditionQuery() or
+  TControllingExprInvariantQuery() or
   TFunctionReturnConditionQuery() or
   TNonVoidFunctionReturnConditionQuery()
 
 predicate isStatements5QueryMetadata(Query query, string queryId, string ruleId, string category) {
   query =
-    // `Query` instance for the `controllingExpInvariantCondition` query
-    Statements5Package::controllingExpInvariantConditionQuery() and
+    // `Query` instance for the `controllingExprInvariant` query
+    Statements5Package::controllingExprInvariantQuery() and
   queryId =
-    // `@id` for the `controllingExpInvariantCondition` query
-    "c/misra/controlling-exp-invariant-condition" and
+    // `@id` for the `controllingExprInvariant` query
+    "c/misra/controlling-expr-invariant" and
   ruleId = "RULE-14-3" and
   category = "required"
   or
@@ -38,11 +38,11 @@ predicate isStatements5QueryMetadata(Query query, string queryId, string ruleId,
 }
 
 module Statements5Package {
-  Query controllingExpInvariantConditionQuery() {
+  Query controllingExprInvariantQuery() {
     //autogenerate `Query` type
     result =
-      // `Query` type for `controllingExpInvariantCondition` query
-      TQueryC(TStatements5PackageQuery(TControllingExpInvariantConditionQuery()))
+      // `Query` type for `controllingExprInvariant` query
+      TQueryC(TStatements5PackageQuery(TControllingExprInvariantQuery()))
   }
 
   Query functionReturnConditionQuery() {

cpp/common/src/codingstandards/cpp/exclusions/c/Statements5.qll

@@ -11,7 +11,7 @@
           "name": "Controlling expressions shall not be invariant",
           "precision": "very-high",
           "severity": "error",
-          "short_name": "ControllingExpInvariantCondition",
+          "short_name": "ControllingExprInvariant",
           "tags": [
             "correctness",
             "maintainability",
@@ -65,4 +65,4 @@
       "title": "All exit paths from a function with non-void return type shall have an explicit return statement with an expression"
     }
   }
-}
+}