From 79b0a2a555d17bb2fd3f391be83bab4809288075 Mon Sep 17 00:00:00 2001
From: jsmall-nvidia <jsmall@nvidia.com>
Date: Tue, 20 Jun 2023 11:55:08 -0400
Subject: Fix for generic with scope issue (#2925)

* Small fixes and improvements around reflection tool.

* Make PrettyWriter printing a class.

* Sundary improvements around StringBlob.

* Fix for generic scope issue.

* Fix expected output.

* Add scope-generic test.

---------

Co-authored-by: Theresa Foley <10618364+tangent-vector@users.noreply.github.com>
---
 source/slang/slang-parser.cpp               |  1 +
 tests/bugs/scope-generic.slang              | 46 +++++++++++++++++++++++++++++
 tests/bugs/scope-generic.slang.expected.txt |  6 ++++
 3 files changed, 53 insertions(+)
 create mode 100644 tests/bugs/scope-generic.slang
 create mode 100644 tests/bugs/scope-generic.slang.expected.txt

diff --git a/source/slang/slang-parser.cpp b/source/slang/slang-parser.cpp
index 410395669..5022a9fdd 100644
--- a/source/slang/slang-parser.cpp
+++ b/source/slang/slang-parser.cpp
@@ -2070,6 +2070,7 @@ namespace Slang
             // disambiguate based on FOLLOW set
             switch (peekTokenType(&newParser))
             {
+            case TokenType::Scope:
             case TokenType::Dot:
             case TokenType::LParent:
             case TokenType::RParent:
diff --git a/tests/bugs/scope-generic.slang b/tests/bugs/scope-generic.slang
new file mode 100644
index 000000000..9ebe226fe
--- /dev/null
+++ b/tests/bugs/scope-generic.slang
@@ -0,0 +1,46 @@
+//TEST(compute):COMPARE_COMPUTE_EX:-slang -compute -shaderobj
+
+struct Test1
+{
+    struct A<let N : uint = 2>
+    {
+        static uint num() { return N; }
+    };
+
+    static uint num() { return A<2>::num(); }
+
+    typealias B = A<2>;
+};
+
+struct Test2
+{};
+
+extension Test2
+{
+    struct A<let N : uint = 2>
+    {
+        static uint num() { return N; }
+    };
+
+    static uint num()
+    {
+        return A<2>::num(); 
+    }
+
+    typealias B = A<2>;
+};
+
+//TEST_INPUT:ubuffer(data=[0 0 0 0 0 0], stride=4):out,name outputBuffer
+RWStructuredBuffer<uint> outputBuffer;
+
+[numthreads(4, 1, 1)]
+void computeMain(uint3 dispatchThreadID : SV_DispatchThreadID)
+{
+    outputBuffer[0] = Test1::num();
+    outputBuffer[1] = Test1::B::num();
+    outputBuffer[2] = Test1::A<2>::num(); 
+
+    outputBuffer[3] = Test2::num(); 
+    outputBuffer[4] = Test2::B::num();
+    outputBuffer[5] = Test2::A<2>::num(); 
+}
\ No newline at end of file
diff --git a/tests/bugs/scope-generic.slang.expected.txt b/tests/bugs/scope-generic.slang.expected.txt
new file mode 100644
index 000000000..5ee4e7592
--- /dev/null
+++ b/tests/bugs/scope-generic.slang.expected.txt
@@ -0,0 +1,6 @@
+2
+2
+2
+2
+2
+2
-- 
cgit v1.2.3