Rule 16.4: Consider nested blocks.

Author: lcartey

c/misra/src/rules/RULE-16-4/EverySwitchShallHaveDefaultLabel.ql

@@ -14,6 +14,20 @@
 import cpp
 import codingstandards.c.misra
 
+Stmt getFirstNonBlockStatement(BlockStmt bs) {
+  exists(Stmt nextStmt | nextStmt = bs.getStmt(0) |
+    if nextStmt instanceof BlockStmt
+    then result = getFirstNonBlockStatement(nextStmt)
+    else result = nextStmt
+  )
+}
+
+Stmt getFirstStatement(DefaultCase case) {
+  exists(Stmt next | next = case.getFollowingStmt() |
+    if next instanceof BlockStmt then result = getFirstNonBlockStatement(next) else result = next
+  )
+}
+
 from SwitchStmt switch, string message
 where
   not isExcluded(switch, Statements1Package::everySwitchShallHaveDefaultLabelQuery()) and
@@ -22,7 +36,7 @@ where
   or
   exists(SwitchCase case, BreakStmt break |
     switch.getDefaultCase() = case and
-    case.getFollowingStmt() = break and
+    getFirstStatement(case) = break and
     not exists(Comment comment | comment.getCommentedElement() = break) and
     message =
       "has default label that does not terminate in a statement or comment before break statement"

c/misra/test/rules/RULE-16-4/EverySwitchShallHaveDefaultLabel.expected

@@ -1,2 +1,3 @@
 | test.c:4:3:12:3 | switch (...) ...  | $@ statement has missing default clause. | test.c:4:3:12:3 | switch (...) ...  | Switch |
 | test.c:13:3:22:3 | switch (...) ...  | $@ statement has default label that does not terminate in a statement or comment before break statement | test.c:13:3:22:3 | switch (...) ...  | Switch |
+| test.c:53:3:60:3 | switch (...) ...  | $@ statement has default label that does not terminate in a statement or comment before break statement | test.c:53:3:60:3 | switch (...) ...  | Switch |

c/misra/test/rules/RULE-16-4/test.c

@@ -49,4 +49,13 @@ void f1(int p1) {
     i++;
     break;
   }
+
+  switch (p1) { // NON_COMPLIANT
+  case 1:
+    i++;
+    break;
+  default: {
+    break;
+  }
+  }
 }