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>
---
 .../namespaces/namespace-using/a.slang                 | 10 ++++++++++
 .../namespaces/namespace-using/a1.slang                |  6 ++++++
 .../namespaces/namespace-using/b.slang                 | 18 ++++++++++++++++++
 3 files changed, 34 insertions(+)
 create mode 100644 tests/language-feature/namespaces/namespace-using/a.slang
 create mode 100644 tests/language-feature/namespaces/namespace-using/a1.slang
 create mode 100644 tests/language-feature/namespaces/namespace-using/b.slang

(limited to 'tests/language-feature/namespaces/namespace-using')

diff --git a/tests/language-feature/namespaces/namespace-using/a.slang b/tests/language-feature/namespaces/namespace-using/a.slang
new file mode 100644
index 000000000..25c606c6e
--- /dev/null
+++ b/tests/language-feature/namespaces/namespace-using/a.slang
@@ -0,0 +1,10 @@
+module a;
+
+__include a1;
+
+namespace ns2
+{
+    public int f() { return 1; }
+}
+
+using ns;
diff --git a/tests/language-feature/namespaces/namespace-using/a1.slang b/tests/language-feature/namespaces/namespace-using/a1.slang
new file mode 100644
index 000000000..f417cd47c
--- /dev/null
+++ b/tests/language-feature/namespaces/namespace-using/a1.slang
@@ -0,0 +1,6 @@
+implementing a;
+
+namespace ns
+{
+    using ns2;
+}
diff --git a/tests/language-feature/namespaces/namespace-using/b.slang b/tests/language-feature/namespaces/namespace-using/b.slang
new file mode 100644
index 000000000..3e5816662
--- /dev/null
+++ b/tests/language-feature/namespaces/namespace-using/b.slang
@@ -0,0 +1,18 @@
+//TEST(compute):COMPARE_COMPUTE(filecheck-buffer=CHECK): -shaderobj
+
+module b;
+
+import a;
+
+//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out,name=outputBuffer
+RWStructuredBuffer<int> outputBuffer;
+
+[numthreads(4, 1, 1)]
+void computeMain(int3 dispatchThreadID: SV_DispatchThreadID)
+{
+    int tid = dispatchThreadID.x;
+    int inVal = tid;
+    int outVal = f() + ns.f();
+    outputBuffer[tid] = outVal;
+    // CHECK: 2
+}
-- 
cgit v1.2.3