From ec0224edc3a867bbf059e790ad7b2a1a881a0705 Mon Sep 17 00:00:00 2001
From: Yong He <yonghe@outlook.com>
Date: Mon, 11 Dec 2023 16:13:32 -0800
Subject: Diagnose for invalid decl nesting + namespace lookup fixes. (#3397)

* Diagnose for invalid decl nesting.

* Fix.

* Fix.

* Fix.

* Fix `namespace` lookup and `using` resolution.

* fix project files.

* revert project files.

* Enhance namespace syntax, docs.

* Fixes.

---------

Co-authored-by: Yong He <yhe@nvidia.com>
---
 source/slang/slang-check-modifier.cpp | 22 +++++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

(limited to 'source/slang/slang-check-modifier.cpp')

diff --git a/source/slang/slang-check-modifier.cpp b/source/slang/slang-check-modifier.cpp
index 339ecba4c..20a393ff5 100644
--- a/source/slang/slang-check-modifier.cpp
+++ b/source/slang/slang-check-modifier.cpp
@@ -1044,9 +1044,18 @@ namespace Slang
 
         if (as<PrivateModifier>(m))
         {
-            if (as<AggTypeDeclBase>(syntaxNode) || as<NamespaceDeclBase>(syntaxNode))
+            if (auto decl = as<Decl>(syntaxNode))
             {
-                getSink()->diagnose(m, Diagnostics::invalidUseOfPrivateVisibility, as<Decl>(syntaxNode));
+                if (isGlobalDecl(decl))
+                {
+                    getSink()->diagnose(m, Diagnostics::invalidUseOfPrivateVisibility, as<Decl>(syntaxNode));
+                    return m;
+                }
+            }
+            if (as<NamespaceDeclBase>(syntaxNode))
+            {
+                getSink()->diagnose(m, Diagnostics::invalidVisibilityModifierOnTypeOfDecl, syntaxNode->astNodeType);
+                return m;
             }
             else if (auto decl = as<Decl>(syntaxNode))
             {
@@ -1057,7 +1066,14 @@ namespace Slang
                 }
             }
         }
-
+        else if (as<InternalModifier>(m))
+        {
+            if (as<NamespaceDeclBase>(syntaxNode))
+            {
+                getSink()->diagnose(m, Diagnostics::invalidVisibilityModifierOnTypeOfDecl, syntaxNode->astNodeType);
+                return m;
+            }
+        }
 
         // Default behavior is to leave things as they are,
         // and assume that modifiers are mostly already checked.
-- 
cgit v1.2.3