Merge pull request #533 from rvermeulen/rvermeulen/fix-400

Address FN reported in #400

change_notes/2024-02-13-fix-fn-M7-3-6.md

@@ -0,0 +1,2 @@
+- `M7-3-6` - `UsingDeclarationsUsedInHeaderFiles.ql`:
+  - Address FN reported in #400. Only using-declarations are exempted from class- and function-scope.

cpp/autosar/src/rules/M7-3-6/UsingDeclarationsUsedInHeaderFiles.ql

@@ -28,5 +28,13 @@ predicate isInClassScope(UsingEntry u) { exists(Class c | u.getEnclosingElement(
 from UsingEntry u
 where
   not isExcluded(u, BannedSyntaxPackage::usingDeclarationsUsedInHeaderFilesQuery()) and
-  (isInHeaderFile(u) and not isInFunctionScope(u) and not isInClassScope(u))
+  isInHeaderFile(u) and
+  (
+    u instanceof UsingDeclarationEntry
+    implies
+    (
+      not isInFunctionScope(u) and
+      not isInClassScope(u)
+    )
+  )
 select u, "Using directive or declaration used in a header file " + u.getFile() + "."

cpp/autosar/test/rules/M7-3-6/UsingDeclarationsUsedInHeaderFiles.expected

@@ -1 +1,2 @@
 | test.h:4:1:4:21 | using namespace std | Using directive or declaration used in a header file test.h. |
+| test.h:18:3:18:21 | using namespace std | Using directive or declaration used in a header file test.h. |

cpp/autosar/test/rules/M7-3-6/test.h

@@ -7,11 +7,15 @@ namespace my_namespace {
 int MY_CONST = 0;
 };
 
-int f() {
+void f() {
 
   using my_namespace::MY_CONST; // COMPLIANT - function scope
 
   int x = MY_CONST;
 }
 
+void test_fn_reported_in_400() {
+  using namespace std; // NON_COMPLIANT - only using declarations are exempted
+                       // in function scope.
+}
 #endif