WIP

s-samadi · s-samadi · commit 80b891f0472d · 2023-02-22T07:33:10.000+11:00
diff --git a/c/common/test/rules/gotostatementcondition/GotoStatementCondition.expected b/c/common/test/rules/gotostatementcondition/GotoStatementCondition.expected
@@ -0,0 +1 @@
+No expected results have yet been specified
diff --git a/c/common/test/rules/gotostatementcondition/GotoStatementCondition.ql b/c/common/test/rules/gotostatementcondition/GotoStatementCondition.ql
@@ -0,0 +1,2 @@
+// GENERATED FILE - DO NOT MODIFY
+import codingstandards.cpp.rules.gotostatementcondition.GotoStatementCondition
diff --git a/c/common/test/rules/gotostatementcondition/test.c b/c/common/test/rules/gotostatementcondition/test.c
diff --git a/c/misra/src/rules/RULE-15-2/GotoLabelLocationCondition.ql b/c/misra/src/rules/RULE-15-2/GotoLabelLocationCondition.ql
@@ -0,0 +1,20 @@
+/**
+ * @id c/misra/goto-label-location-condition
+ * @name RULE-15-2: The goto statement shall jump to a label declared later in the same function
+ * @description Unconstrained use of goto can lead to unstructured code
+ * @kind problem
+ * @precision very-high
+ * @problem.severity error
+ * @tags external/misra/id/rule-15-2
+ *       external/misra/obligation/required
+ */
+
+import cpp
+import codingstandards.c.misra
+import codingstandards.cpp.rules.gotostatementcondition.GotoStatementCondition
+
+class GotoLabelLocationConditionQuery extends GotoStatementConditionSharedQuery {
+  GotoLabelLocationConditionQuery() {
+    this = Statements2Package::gotoLabelLocationConditionQuery()
+  }
+}
diff --git a/c/misra/src/rules/RULE-15-3/GotoLabelBlockCondition.ql b/c/misra/src/rules/RULE-15-3/GotoLabelBlockCondition.ql
@@ -0,0 +1,19 @@
+/**
+ * @id c/misra/goto-label-block-condition
+ * @name RULE-15-3: Any label referenced by a goto statement shall be declared in the same block, or in any block
+ * @description Any label referenced by a goto statement shall be declared in the same block, or in
+ *              any block enclosing the goto statement
+ * @kind problem
+ * @precision very-high
+ * @problem.severity error
+ * @tags external/misra/id/rule-15-3
+ *       external/misra/obligation/required
+ */
+
+import cpp
+import codingstandards.c.misra
+
+from
+where
+  not isExcluded(x, Statements2Package::gotoLabelBlockConditionQuery()) and
+select
diff --git a/c/misra/src/rules/RULE-15-4/LoopIterationCondition.ql b/c/misra/src/rules/RULE-15-4/LoopIterationCondition.ql
@@ -0,0 +1,18 @@
+/**
+ * @id c/misra/loop-iteration-condition
+ * @name RULE-15-4: There should be no more than one break or goto statement used to terminate any iteration statement
+ * @description 
+ * @kind problem
+ * @precision very-high
+ * @problem.severity error
+ * @tags external/misra/id/rule-15-4
+ *       external/misra/obligation/advisory
+ */
+
+import cpp
+import codingstandards.c.misra
+
+from
+where
+  not isExcluded(x, Statements2Package::loopIterationConditionQuery()) and
+select
diff --git a/c/misra/src/rules/RULE-16-6/SwitchClauseNumberCondition.ql b/c/misra/src/rules/RULE-16-6/SwitchClauseNumberCondition.ql
@@ -0,0 +1,18 @@
+/**
+ * @id c/misra/switch-clause-number-condition
+ * @name RULE-16-6: Every switch statement shall have at least two switch-clauses
+ * @description 
+ * @kind problem
+ * @precision very-high
+ * @problem.severity error
+ * @tags external/misra/id/rule-16-6
+ *       external/misra/obligation/required
+ */
+
+import cpp
+import codingstandards.c.misra
+
+from
+where
+  not isExcluded(x, Statements2Package::switchClauseNumberConditionQuery()) and
+select
diff --git a/c/misra/src/rules/RULE-16-7/SwitchExpressionBoolCondition.ql b/c/misra/src/rules/RULE-16-7/SwitchExpressionBoolCondition.ql
@@ -0,0 +1,18 @@
+/**
+ * @id c/misra/switch-expression-bool-condition
+ * @name RULE-16-7: A switch-expression shall not have essentially Boolean type
+ * @description 
+ * @kind problem
+ * @precision very-high
+ * @problem.severity error
+ * @tags external/misra/id/rule-16-7
+ *       external/misra/obligation/required
+ */
+
+import cpp
+import codingstandards.c.misra
+
+from
+where
+  not isExcluded(x, Statements2Package::switchExpressionBoolConditionQuery()) and
+select
diff --git a/c/misra/test/rules/RULE-15-2/GotoLabelLocationCondition.expected b/c/misra/test/rules/RULE-15-2/GotoLabelLocationCondition.expected
@@ -0,0 +1 @@
+No expected results have yet been specified
diff --git a/c/misra/test/rules/RULE-15-2/GotoLabelLocationCondition.qlref b/c/misra/test/rules/RULE-15-2/GotoLabelLocationCondition.qlref
@@ -0,0 +1 @@
+rules/RULE-15-2/GotoLabelLocationCondition.ql
diff --git a/c/misra/test/rules/RULE-15-2/GotoLabelLocationCondition.testref b/c/misra/test/rules/RULE-15-2/GotoLabelLocationCondition.testref
@@ -0,0 +1 @@
+c/common/test/rules/gotostatementcondition/GotoStatementCondition.ql
diff --git a/c/misra/test/rules/RULE-15-3/GotoLabelBlockCondition.expected b/c/misra/test/rules/RULE-15-3/GotoLabelBlockCondition.expected
@@ -0,0 +1 @@
+No expected results have yet been specified
diff --git a/c/misra/test/rules/RULE-15-3/GotoLabelBlockCondition.qlref b/c/misra/test/rules/RULE-15-3/GotoLabelBlockCondition.qlref
@@ -0,0 +1 @@
+rules/RULE-15-3/GotoLabelBlockCondition.ql
diff --git a/c/misra/test/rules/RULE-15-4/LoopIterationCondition.expected b/c/misra/test/rules/RULE-15-4/LoopIterationCondition.expected
@@ -0,0 +1 @@
+No expected results have yet been specified
diff --git a/c/misra/test/rules/RULE-15-4/LoopIterationCondition.qlref b/c/misra/test/rules/RULE-15-4/LoopIterationCondition.qlref
@@ -0,0 +1 @@
+rules/RULE-15-4/LoopIterationCondition.ql
diff --git a/c/misra/test/rules/RULE-16-6/SwitchClauseNumberCondition.expected b/c/misra/test/rules/RULE-16-6/SwitchClauseNumberCondition.expected
@@ -0,0 +1 @@
+No expected results have yet been specified
diff --git a/c/misra/test/rules/RULE-16-6/SwitchClauseNumberCondition.qlref b/c/misra/test/rules/RULE-16-6/SwitchClauseNumberCondition.qlref
@@ -0,0 +1 @@
+rules/RULE-16-6/SwitchClauseNumberCondition.ql
diff --git a/c/misra/test/rules/RULE-16-7/SwitchExpressionBoolCondition.expected b/c/misra/test/rules/RULE-16-7/SwitchExpressionBoolCondition.expected
@@ -0,0 +1 @@
+No expected results have yet been specified
diff --git a/c/misra/test/rules/RULE-16-7/SwitchExpressionBoolCondition.qlref b/c/misra/test/rules/RULE-16-7/SwitchExpressionBoolCondition.qlref
@@ -0,0 +1 @@
+rules/RULE-16-7/SwitchExpressionBoolCondition.ql
diff --git a/cpp/autosar/src/rules/M6-6-2/GotoStatementJumpCondition.ql b/cpp/autosar/src/rules/M6-6-2/GotoStatementJumpCondition.ql
@@ -15,22 +15,10 @@
 
 import cpp
 import codingstandards.cpp.autosar
+import codingstandards.cpp.rules.gotostatementcondition.GotoStatementCondition
 
-from GotoStmt goto, Stmt target
-where
-  not isExcluded(goto, ConditionalsPackage::gotoStatementJumpConditionQuery()) and
-  target = goto.getTarget() and
-  exists(Location targetLoc, Location gotoLoc |
-    targetLoc = target.getLocation() and
-    gotoLoc = goto.getLocation() and
-    targetLoc.getFile() = gotoLoc.getFile()
-  |
-    // Starts on a previous line
-    targetLoc.getStartLine() < gotoLoc.getEndLine()
-    or
-    // Starts on the same line, but an earlier column
-    targetLoc.getStartLine() = gotoLoc.getEndLine() and
-    targetLoc.getEndColumn() < gotoLoc.getStartColumn()
-  )
-select goto, "The goto jumps to the label $@ that is not declared later in the same function.",
-  target, goto.getName()
+class GotoStatementJumpConditionQuery extends GotoStatementConditionSharedQuery {
+  GotoStatementJumpConditionQuery() {
+    this = ConditionalsPackage::gotoStatementJumpConditionQuery()
+  }
+}
diff --git a/cpp/autosar/test/rules/M6-6-2/GotoStatementJumpCondition.testref b/cpp/autosar/test/rules/M6-6-2/GotoStatementJumpCondition.testref
@@ -0,0 +1 @@
+cpp/common/test/rules/gotostatementcondition/GotoStatementCondition.ql
diff --git a/cpp/common/src/codingstandards/cpp/exclusions/c/RuleMetadata.qll b/cpp/common/src/codingstandards/cpp/exclusions/c/RuleMetadata.qll
@@ -43,6 +43,7 @@ import Preprocessor6
 import SideEffects1
 import SideEffects2
 import Statements1
+import Statements2
 import Strings1
 import Strings2
 import Strings3
@@ -91,6 +92,7 @@ newtype TCQuery =
   TSideEffects1PackageQuery(SideEffects1Query q) or
   TSideEffects2PackageQuery(SideEffects2Query q) or
   TStatements1PackageQuery(Statements1Query q) or
+  TStatements2PackageQuery(Statements2Query q) or
   TStrings1PackageQuery(Strings1Query q) or
   TStrings2PackageQuery(Strings2Query q) or
   TStrings3PackageQuery(Strings3Query q) or
@@ -139,6 +141,7 @@ predicate isQueryMetadata(Query query, string queryId, string ruleId, string cat
   isSideEffects1QueryMetadata(query, queryId, ruleId, category) or
   isSideEffects2QueryMetadata(query, queryId, ruleId, category) or
   isStatements1QueryMetadata(query, queryId, ruleId, category) or
+  isStatements2QueryMetadata(query, queryId, ruleId, category) or
   isStrings1QueryMetadata(query, queryId, ruleId, category) or
   isStrings2QueryMetadata(query, queryId, ruleId, category) or
   isStrings3QueryMetadata(query, queryId, ruleId, category) or
diff --git a/cpp/common/src/codingstandards/cpp/exclusions/c/Statements2.qll b/cpp/common/src/codingstandards/cpp/exclusions/c/Statements2.qll
@@ -0,0 +1,95 @@
+//** THIS FILE IS AUTOGENERATED, DO NOT MODIFY DIRECTLY.  **/
+import cpp
+import RuleMetadata
+import codingstandards.cpp.exclusions.RuleMetadata
+
+newtype Statements2Query =
+  TGotoLabelLocationConditionQuery() or
+  TGotoLabelBlockConditionQuery() or
+  TLoopIterationConditionQuery() or
+  TSwitchClauseNumberConditionQuery() or
+  TSwitchExpressionBoolConditionQuery()
+
+predicate isStatements2QueryMetadata(Query query, string queryId, string ruleId, string category) {
+  query =
+    // `Query` instance for the `gotoLabelLocationCondition` query
+    Statements2Package::gotoLabelLocationConditionQuery() and
+  queryId =
+    // `@id` for the `gotoLabelLocationCondition` query
+    "c/misra/goto-label-location-condition" and
+  ruleId = "RULE-15-2" and
+  category = "required"
+  or
+  query =
+    // `Query` instance for the `gotoLabelBlockCondition` query
+    Statements2Package::gotoLabelBlockConditionQuery() and
+  queryId =
+    // `@id` for the `gotoLabelBlockCondition` query
+    "c/misra/goto-label-block-condition" and
+  ruleId = "RULE-15-3" and
+  category = "required"
+  or
+  query =
+    // `Query` instance for the `loopIterationCondition` query
+    Statements2Package::loopIterationConditionQuery() and
+  queryId =
+    // `@id` for the `loopIterationCondition` query
+    "c/misra/loop-iteration-condition" and
+  ruleId = "RULE-15-4" and
+  category = "advisory"
+  or
+  query =
+    // `Query` instance for the `switchClauseNumberCondition` query
+    Statements2Package::switchClauseNumberConditionQuery() and
+  queryId =
+    // `@id` for the `switchClauseNumberCondition` query
+    "c/misra/switch-clause-number-condition" and
+  ruleId = "RULE-16-6" and
+  category = "required"
+  or
+  query =
+    // `Query` instance for the `switchExpressionBoolCondition` query
+    Statements2Package::switchExpressionBoolConditionQuery() and
+  queryId =
+    // `@id` for the `switchExpressionBoolCondition` query
+    "c/misra/switch-expression-bool-condition" and
+  ruleId = "RULE-16-7" and
+  category = "required"
+}
+
+module Statements2Package {
+  Query gotoLabelLocationConditionQuery() {
+    //autogenerate `Query` type
+    result =
+      // `Query` type for `gotoLabelLocationCondition` query
+      TQueryC(TStatements2PackageQuery(TGotoLabelLocationConditionQuery()))
+  }
+
+  Query gotoLabelBlockConditionQuery() {
+    //autogenerate `Query` type
+    result =
+      // `Query` type for `gotoLabelBlockCondition` query
+      TQueryC(TStatements2PackageQuery(TGotoLabelBlockConditionQuery()))
+  }
+
+  Query loopIterationConditionQuery() {
+    //autogenerate `Query` type
+    result =
+      // `Query` type for `loopIterationCondition` query
+      TQueryC(TStatements2PackageQuery(TLoopIterationConditionQuery()))
+  }
+
+  Query switchClauseNumberConditionQuery() {
+    //autogenerate `Query` type
+    result =
+      // `Query` type for `switchClauseNumberCondition` query
+      TQueryC(TStatements2PackageQuery(TSwitchClauseNumberConditionQuery()))
+  }
+
+  Query switchExpressionBoolConditionQuery() {
+    //autogenerate `Query` type
+    result =
+      // `Query` type for `switchExpressionBoolCondition` query
+      TQueryC(TStatements2PackageQuery(TSwitchExpressionBoolConditionQuery()))
+  }
+}
diff --git a/cpp/common/src/codingstandards/cpp/rules/gotostatementcondition/GotoStatementCondition.qll b/cpp/common/src/codingstandards/cpp/rules/gotostatementcondition/GotoStatementCondition.qll
@@ -0,0 +1,52 @@
+/**
+ * Provides a library which includes a `problems` predicate for reporting....
+ */
+
+import cpp
+import codingstandards.cpp.Customizations
+import codingstandards.cpp.Exclusions
+
+abstract class GotoStatementConditionSharedQuery extends Query { }
+
+Query getQuery() { result instanceof GotoStatementConditionSharedQuery }
+
+query predicate problems(GotoStmt goto, string message, Stmt target, string targetLabel) {
+    not isExcluded(goto, getQuery()) and
+    target = goto.getTarget() and
+    exists(Location targetLoc, Location gotoLoc |
+      targetLoc = target.getLocation() and
+      gotoLoc = goto.getLocation() and
+      targetLoc.getFile() = gotoLoc.getFile()
+    |
+      // Starts on a previous line
+      targetLoc.getStartLine() < gotoLoc.getEndLine()
+      or
+      // Starts on the same line, but an earlier column
+      targetLoc.getStartLine() = gotoLoc.getEndLine() and
+      targetLoc.getEndColumn() < gotoLoc.getStartColumn()
+    )
+    and message = "The goto jumps to the label $@ that is not declared later in the same function." and targetLabel = target.toString()
+}
+
+
+
+
+
+// from GotoStmt goto, Stmt target
+// where
+//   not isExcluded(goto, ConditionalsPackage::gotoStatementJumpConditionQuery()) and
+//   target = goto.getTarget() and
+//   exists(Location targetLoc, Location gotoLoc |
+//     targetLoc = target.getLocation() and
+//     gotoLoc = goto.getLocation() and
+//     targetLoc.getFile() = gotoLoc.getFile()
+//   |
+//     // Starts on a previous line
+//     targetLoc.getStartLine() < gotoLoc.getEndLine()
+//     or
+//     // Starts on the same line, but an earlier column
+//     targetLoc.getStartLine() = gotoLoc.getEndLine() and
+//     targetLoc.getEndColumn() < gotoLoc.getStartColumn()
+//   )
+// select goto, "The goto jumps to the label $@ that is not declared later in the same function.",
+//   target, goto.getName()
diff --git a/cpp/common/test/rules/gotostatementcondition/GotoStatementCondition.expected b/cpp/common/test/rules/gotostatementcondition/GotoStatementCondition.expected
@@ -0,0 +1 @@
+No expected results have yet been specified
diff --git a/cpp/common/test/rules/gotostatementcondition/GotoStatementCondition.ql b/cpp/common/test/rules/gotostatementcondition/GotoStatementCondition.ql
@@ -0,0 +1,2 @@
+// GENERATED FILE - DO NOT MODIFY
+import codingstandards.cpp.rules.gotostatementcondition.GotoStatementCondition
diff --git a/cpp/common/test/rules/gotostatementcondition/test.cpp b/cpp/common/test/rules/gotostatementcondition/test.cpp
diff --git a/rule_packages/c/Statements2.json b/rule_packages/c/Statements2.json
diff --git a/rule_packages/cpp/Conditionals.json b/rule_packages/cpp/Conditionals.json
diff --git a/rules.csv b/rules.csv

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+No expected results have yet been specified`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+// GENERATED FILE - DO NOT MODIFY`
	`2`	`+import codingstandards.cpp.rules.gotostatementcondition.GotoStatementCondition`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+rules/RULE-15-2/GotoLabelLocationCondition.ql`