Statements: Improve var naming and alert message.

Author: lcartey

change_notes/2023-03-26-nested-switch-case.md

@@ -0,0 +1 @@
+ * `M6-4-4` - alert message updated for clarity.

cpp/common/src/codingstandards/cpp/rules/nestedlabelinswitch/NestedLabelInSwitch.qll

@@ -11,15 +11,15 @@ abstract class NestedLabelInSwitchSharedQuery extends Query { }
 Query getQuery() { result instanceof NestedLabelInSwitchSharedQuery }
 
 query predicate problems(
-  SwitchCase nestedCase, string message, SwitchCase case, string caseLabel, SwitchStmt switch,
+  SwitchCase case, string message, SwitchCase caseLocation, string caseLabel, SwitchStmt switch,
   string switchLabel
 ) {
-  not isExcluded(nestedCase, getQuery()) and
-  switch.getASwitchCase() = case and
-  not nestedCase.getParentStmt() = switch.getChildStmt() and
-  nestedCase = case and
+  not isExcluded(case, getQuery()) and
+  switch.getASwitchCase() = caseLocation and
+  not case.getParentStmt() = switch.getChildStmt() and
+  case = caseLocation and
   message =
-    "The switch $@ does not appear at the outermost level of the compound statement forming the body of the $@ statement." and
-  caseLabel = nestedCase.toString() and
+    "The case $@ does not appear at the outermost level of the compound statement forming the body of the $@ statement." and
+  caseLabel = case.toString() and
   switchLabel = switch.toString()
 }