From 02bab284f9509a5be981374b7d5781db44c3a2b3 Mon Sep 17 00:00:00 2001
From: Remco Vermeulen <rvermeulen@users.noreply.github.com>
Date: Tue, 13 Feb 2024 15:26:27 -0800
Subject: [PATCH] Address FN reported in #400

Only using-declaratons are exempt from class- and
function-scope use.
---
 change_notes/2024-02-13-fix-fn-M7-3-6.md               |  2 ++
 .../rules/M7-3-6/UsingDeclarationsUsedInHeaderFiles.ql | 10 +++++++++-
 .../M7-3-6/UsingDeclarationsUsedInHeaderFiles.expected |  1 +
 cpp/autosar/test/rules/M7-3-6/test.h                   |  6 +++++-
 4 files changed, 17 insertions(+), 2 deletions(-)
 create mode 100644 change_notes/2024-02-13-fix-fn-M7-3-6.md

diff --git a/change_notes/2024-02-13-fix-fn-M7-3-6.md b/change_notes/2024-02-13-fix-fn-M7-3-6.md
new file mode 100644
index 0000000000..aa86ab6222
--- /dev/null
+++ b/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.
\ No newline at end of file
diff --git a/cpp/autosar/src/rules/M7-3-6/UsingDeclarationsUsedInHeaderFiles.ql b/cpp/autosar/src/rules/M7-3-6/UsingDeclarationsUsedInHeaderFiles.ql
index 84b8c45a86..5a2a1e7b30 100644
--- a/cpp/autosar/src/rules/M7-3-6/UsingDeclarationsUsedInHeaderFiles.ql
+++ b/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() + "."
diff --git a/cpp/autosar/test/rules/M7-3-6/UsingDeclarationsUsedInHeaderFiles.expected b/cpp/autosar/test/rules/M7-3-6/UsingDeclarationsUsedInHeaderFiles.expected
index 23bc5f6560..350c1f0cdc 100644
--- a/cpp/autosar/test/rules/M7-3-6/UsingDeclarationsUsedInHeaderFiles.expected
+++ b/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. |
diff --git a/cpp/autosar/test/rules/M7-3-6/test.h b/cpp/autosar/test/rules/M7-3-6/test.h
index 537e8ff3be..1286de2cf9 100644
--- a/cpp/autosar/test/rules/M7-3-6/test.h
+++ b/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
\ No newline at end of file