From ec0224edc3a867bbf059e790ad7b2a1a881a0705 Mon Sep 17 00:00:00 2001 From: Yong He 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 --- .../namespaces/namespace-import/m.slang | 5 ++++ .../namespaces/namespace-import/test.slang | 29 ++++++++++++++++++++++ 2 files changed, 34 insertions(+) create mode 100644 tests/language-feature/namespaces/namespace-import/m.slang create mode 100644 tests/language-feature/namespaces/namespace-import/test.slang (limited to 'tests/language-feature/namespaces/namespace-import') diff --git a/tests/language-feature/namespaces/namespace-import/m.slang b/tests/language-feature/namespaces/namespace-import/m.slang new file mode 100644 index 000000000..16a35d9b4 --- /dev/null +++ b/tests/language-feature/namespaces/namespace-import/m.slang @@ -0,0 +1,5 @@ +module m; +namespace ns1.ns2 +{ + public int g() { return 1; } +} diff --git a/tests/language-feature/namespaces/namespace-import/test.slang b/tests/language-feature/namespaces/namespace-import/test.slang new file mode 100644 index 000000000..285883c69 --- /dev/null +++ b/tests/language-feature/namespaces/namespace-import/test.slang @@ -0,0 +1,29 @@ +//TEST(compute):COMPARE_COMPUTE(filecheck-buffer=CHECK): -shaderobj + +module test; + +import m; + +namespace ns1.ns2 +{ + int f() + { + // Should be able to access g() from m. + return g(); + } +} + +using ns1.ns2; + +//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out,name=outputBuffer +RWStructuredBuffer outputBuffer; + +[numthreads(4, 1, 1)] +void computeMain(int3 dispatchThreadID : SV_DispatchThreadID) +{ + int tid = dispatchThreadID.x; + int inVal = tid; + int outVal = f() + g() + ns1.ns2.g(); + outputBuffer[tid] = outVal; + // CHECK: 3 +} -- cgit v1.2.3