Added implementation for 15-3

Author: s-samadi

c/misra/src/rules/RULE-15-3/GotoLabelBlockCondition.ql

@@ -1,19 +1,37 @@
 /**
  * @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
+ * @name RULE-15-3: The goto statement and any of its label shall be declared or enclosed in the same 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
+ * @precision high
+ * @problem.severity recommendation
  * @tags external/misra/id/rule-15-3
+ *       maintainability
+ *       readability
  *       external/misra/obligation/required
  */
 
 import cpp
 import codingstandards.c.misra
 
-from
+from GotoStmt goto
 where
-  not isExcluded(x, Statements2Package::gotoLabelBlockConditionQuery()) and
-select
+  not isExcluded(goto, Statements2Package::gotoLabelBlockConditionQuery()) and
+  not goto.getEnclosingBlock+() = goto.getTarget().getEnclosingBlock()
+  or
+  exists(SwitchStmt switch, int caseLocation, int nextCaseLocation |
+    switch.getAChild*() = goto and
+    switch.getASwitchCase().getLocation().getStartLine() = caseLocation and
+    switch.getASwitchCase().getNextSwitchCase().getLocation().getStartLine() = nextCaseLocation and
+    goto.getLocation().getStartLine() > caseLocation and
+    goto.getLocation().getStartLine() < nextCaseLocation and
+    (
+      goto.getTarget().getLocation().getStartLine() < caseLocation
+      or
+      goto.getTarget().getLocation().getStartLine() > nextCaseLocation
+    ) and
+    goto.getTarget().getLocation().getStartLine() > switch.getLocation().getStartLine()
+  )
+select goto, "The $@ statement and its $@ are not declared or enclosed in the same block.", goto,
+  "goto", goto.getTarget(), "label"

c/misra/test/rules/RULE-15-3/GotoLabelBlockCondition.expected

@@ -1 +1,3 @@
-No expected results have yet been specified
+| test.c:2:3:2:10 | goto ... | The $@ statement and its $@ are not declared or enclosed in the same block. | test.c:2:3:2:10 | goto ... | goto | test.c:4:3:4:5 | label ...: | label |
+| test.c:37:3:37:10 | goto ... | The $@ statement and its $@ are not declared or enclosed in the same block. | test.c:37:3:37:10 | goto ... | goto | test.c:41:3:41:5 | label ...: | label |
+| test.c:52:5:52:12 | goto ... | The $@ statement and its $@ are not declared or enclosed in the same block. | test.c:52:5:52:12 | goto ... | goto | test.c:55:3:55:5 | label ...: | label |

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

@@ -0,0 +1,69 @@
+void f1() {
+  goto L1;
+  for (int i = 0; i < 100; i++) {
+  L1: // NON_COMPLIANT
+  }
+}
+
+void f2() {
+  int i = 0;
+  if (i >= 0) {
+    for (int j = 0; j < 10; j++) {
+      goto L2;
+    }
+  }
+L2: // COMPLIANT
+}
+
+void f3() {
+  int i = 0;
+  if (i >= 0) {
+    for (int j = 0; j < 10; j++) {
+      goto L3;
+    L3: // COMPLIANT
+    }
+  }
+}
+
+void f4() {
+  int i = 0;
+L4: // COMPLIANT
+  if (i >= 0) {
+    goto L4;
+  }
+}
+
+void f5(int p) {
+  goto L1;
+
+  switch (p) {
+  case 0:
+  L1:; // NON_COMPLIANT
+    break;
+  default:
+    break;
+  }
+}
+
+void f6(int p) {
+
+  switch (p) {
+  case 0:
+    goto L1;
+    break;
+  default:
+  L1: // NON_COMPLIANT
+    break;
+  }
+}
+
+void f7(int p) {
+L1: // COMPLIANT
+  switch (p) {
+  case 0:
+    goto L1;
+    break;
+  default:
+    break;
+  }
+}

rule_packages/c/Statements2.json

@@ -29,11 +29,14 @@
         {
           "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",
-          "name": "Any label referenced by a goto statement shall be declared in the same block, or in any block",
-          "precision": "very-high",
-          "severity": "error",
+          "name": "The goto statement and any of its label shall be declared or enclosed in the same block. ",
+          "precision": "high",
+          "severity": "recommendation",
           "short_name": "GotoLabelBlockCondition",
-          "tags": []
+          "tags": [
+            "maintainability",
+            "readability"
+          ]
         }
       ],
       "title": "Any label referenced by a goto statement shall be declared in the same block, or in any block enclosing the goto statement"