Support #include with angle brackets. (#3773)

shader-slang · Mar 14, 2024 · c7d7a96 · c7d7a96
1 parent f5f0740
commit c7d7a96
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 5 deletions.
diff --git a/source/slang/slang-preprocessor.cpp b/source/slang/slang-preprocessor.cpp
@@ -2994,10 +2994,25 @@ static void HandleIncludeDirective(PreprocessorDirectiveContext* context)
     AdvanceRawToken(context);
 
     Token pathToken;
-    if(!Expect(context, TokenType::StringLiteral, Diagnostics::expectedTokenInPreprocessorDirective, &pathToken))
-        return;
-
-    String path = getFileNameTokenValue(pathToken);
+    String path;
+    if (PeekRawTokenType(context) == TokenType::OpLess)
+    {
+        StringBuilder pathSB;
+        Expect(context, TokenType::OpLess, Diagnostics::expectedTokenInPreprocessorDirective, &pathToken);
+        while (PeekRawTokenType(context) != TokenType::OpGreater &&
+            PeekRawTokenType(context) != TokenType::EndOfFile)
+        {
+            pathSB << AdvanceRawToken(context).getContent();
+        }
+        if (!Expect(context, TokenType::OpGreater, Diagnostics::expectedTokenInPreprocessorDirective))
+            return;
+        path = pathSB.produceString();
+    }
+    else
+    {
+        Expect(context, TokenType::StringLiteral, Diagnostics::expectedTokenInPreprocessorDirective, &pathToken);
+        path = getFileNameTokenValue(pathToken);
+    }
 
     auto directiveLoc = GetDirectiveLoc(context);
 

diff --git a/tests/preprocessor/include-angle-bracket.slang b/tests/preprocessor/include-angle-bracket.slang
@@ -0,0 +1,8 @@
+//TEST:SIMPLE:
+// #include support
+
+int foo() { return 0; }
+
+#include <include-a.slang.h>
+
+int baz() { return bar(); }
diff --git a/tests/preprocessor/include/include-pragma-once-c.h b/tests/preprocessor/include/include-pragma-once-c.h
@@ -2,4 +2,4 @@
 
 #pragma once
 
-#include "pragma-once-c.h"
+#include "pragma-once-c.h"