From bc3dc0e82d52faa45ffe73448e86208f137b8536 Mon Sep 17 00:00:00 2001 From: Yong He Date: Fri, 8 Mar 2024 16:32:37 -0800 Subject: Parser and module finding logic fixes. (#3720) * Fix parsing logic of `struct` decl. Fixes #3716. * Allow `loadModule` to find modules with underscores. * Fix test. --- .../modules/module-name-underscore/my_module.slang | 1 + .../modules/module-name-underscore/underscore.slang | 13 +++++++++++++ tests/parser/incomplete-member-decl.slang.expected | 1 - 3 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 tests/language-feature/modules/module-name-underscore/my_module.slang create mode 100644 tests/language-feature/modules/module-name-underscore/underscore.slang (limited to 'tests') diff --git a/tests/language-feature/modules/module-name-underscore/my_module.slang b/tests/language-feature/modules/module-name-underscore/my_module.slang new file mode 100644 index 000000000..32c07c8c3 --- /dev/null +++ b/tests/language-feature/modules/module-name-underscore/my_module.slang @@ -0,0 +1 @@ +int f() { return 1; } \ No newline at end of file diff --git a/tests/language-feature/modules/module-name-underscore/underscore.slang b/tests/language-feature/modules/module-name-underscore/underscore.slang new file mode 100644 index 000000000..529611676 --- /dev/null +++ b/tests/language-feature/modules/module-name-underscore/underscore.slang @@ -0,0 +1,13 @@ +//TEST(compute):COMPARE_COMPUTE(filecheck-buffer=CHECK): -shaderobj -output-using-type +//TEST(compute):COMPARE_COMPUTE(filecheck-buffer=CHECK): -vk -shaderobj -output-using-type + +import my_module; + +//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out,name=output +RWStructuredBuffer output; + +void computeMain() +{ + output[0] = f(); + // CHECK: 1 +} diff --git a/tests/parser/incomplete-member-decl.slang.expected b/tests/parser/incomplete-member-decl.slang.expected index d7df41f58..ed5695977 100644 --- a/tests/parser/incomplete-member-decl.slang.expected +++ b/tests/parser/incomplete-member-decl.slang.expected @@ -3,7 +3,6 @@ standard error = { tests/parser/incomplete-member-decl.slang(19): error 20001: unexpected identifier, expected '(' int MyType inner; ^~~~~ -tests/parser/incomplete-member-decl.slang(20): error 20001: unexpected end of file, expected identifier } standard output = { } -- cgit v1.2.3