Scope: Ensure loop entries have correct parent scope

All direct children of a for loop should have the for loop itself
as the scope.

Author: lcartey

cpp/common/src/codingstandards/cpp/Scope.qll

@@ -29,7 +29,7 @@ module Internal {
      * }
      */
 
-    exists(Loop loop | loop.getStmt() = e and result = loop)
+    exists(Loop loop | loop.getAChild() = e and result = loop)
     or
     exists(IfStmt ifStmt |
       (ifStmt.getThen() = e or ifStmt.getElse() = e) and
@@ -38,7 +38,7 @@ module Internal {
     or
     exists(SwitchStmt switchStmt | switchStmt.getStmt() = e and result = switchStmt)
     or
-    not exists(Loop loop | loop.getStmt() = e) and
+    not exists(Loop loop | loop.getAChild() = e) and
     not exists(IfStmt ifStmt | ifStmt.getThen() = e or ifStmt.getElse() = e) and
     not exists(SwitchStmt switchStmt | switchStmt.getStmt() = e) and
     if exists(e.getParentScope())

cpp/common/test/library/codingstandards/cpp/scope/ParentScope.expected

@@ -26,22 +26,22 @@
 | test.cpp:10:23:10:25 | id1 | test.cpp:10:8:10:17 | test_scope |
 | test.cpp:10:28:34:3 | { ... } | test.cpp:10:8:10:17 | test_scope |
 | test.cpp:11:5:33:5 | for(...;...;...) ... | test.cpp:10:28:34:3 | { ... } |
-| test.cpp:11:10:11:17 | declaration | test.cpp:10:28:34:3 | { ... } |
+| test.cpp:11:10:11:17 | declaration | test.cpp:11:5:33:5 | for(...;...;...) ... |
 | test.cpp:11:14:11:16 | id1 | test.cpp:11:5:33:5 | for(...;...;...) ... |
 | test.cpp:11:19:11:21 | id1 | test.cpp:10:28:34:3 | { ... } |
-| test.cpp:11:19:11:25 | ... < ... | test.cpp:10:28:34:3 | { ... } |
+| test.cpp:11:19:11:25 | ... < ... | test.cpp:11:5:33:5 | for(...;...;...) ... |
 | test.cpp:11:25:11:25 | 1 | test.cpp:10:28:34:3 | { ... } |
 | test.cpp:11:28:11:30 | id1 | test.cpp:10:28:34:3 | { ... } |
-| test.cpp:11:28:11:32 | ... ++ | test.cpp:10:28:34:3 | { ... } |
+| test.cpp:11:28:11:32 | ... ++ | test.cpp:11:5:33:5 | for(...;...;...) ... |
 | test.cpp:11:35:33:5 | { ... } | test.cpp:11:5:33:5 | for(...;...;...) ... |
 | test.cpp:12:7:32:7 | for(...;...;...) ... | test.cpp:11:35:33:5 | { ... } |
-| test.cpp:12:12:12:19 | declaration | test.cpp:11:35:33:5 | { ... } |
+| test.cpp:12:12:12:19 | declaration | test.cpp:12:7:32:7 | for(...;...;...) ... |
 | test.cpp:12:16:12:18 | id1 | test.cpp:12:7:32:7 | for(...;...;...) ... |
 | test.cpp:12:21:12:23 | id1 | test.cpp:11:35:33:5 | { ... } |
-| test.cpp:12:21:12:27 | ... < ... | test.cpp:11:35:33:5 | { ... } |
+| test.cpp:12:21:12:27 | ... < ... | test.cpp:12:7:32:7 | for(...;...;...) ... |
 | test.cpp:12:27:12:27 | 1 | test.cpp:11:35:33:5 | { ... } |
 | test.cpp:12:30:12:32 | id1 | test.cpp:11:35:33:5 | { ... } |
-| test.cpp:12:30:12:34 | ... ++ | test.cpp:11:35:33:5 | { ... } |
+| test.cpp:12:30:12:34 | ... ++ | test.cpp:12:7:32:7 | for(...;...;...) ... |
 | test.cpp:12:37:32:7 | { ... } | test.cpp:12:7:32:7 | for(...;...;...) ... |
 | test.cpp:13:9:31:9 | { ... } | test.cpp:12:37:32:7 | { ... } |
 | test.cpp:14:11:14:18 | declaration | test.cpp:13:9:31:9 | { ... } |