(#61) Preprocessor: ignore #include directives in disabled blocks

ForNeVeR · Jan 17, 2024 · 408af79 · 408af79
1 parent 9b57451
commit 408af79
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 16 deletions.
diff --git a/Cesium.Parser.Tests/PreprocessorTests/PreprocessorTests.cs b/Cesium.Parser.Tests/PreprocessorTests/PreprocessorTests.cs
@@ -81,6 +81,16 @@ int test()
 {
 }", new() { ["foo.h"] = "#include <bar.h>", ["bar.h"] = "#include <baz.h>", ["baz.h"] = "int bar = 0;" });
 
+    [Fact]
+    public Task IgnoredInclude() => DoTest("""
+#ifdef MY_INCLUDE
+#include MY_INCLUDE
+#endif
+#ifndef MY_INCLUDE
+test
+#endif
+""");
+
     [Fact]
     public Task PragmaOnce() => DoTest(@"
 int test()

diff --git a/Cesium.Parser.Tests/PreprocessorTests/verified/PreprocessorTests.IgnoredInclude.verified.txt b/Cesium.Parser.Tests/PreprocessorTests/verified/PreprocessorTests.IgnoredInclude.verified.txt
@@ -0,0 +1,3 @@
+
+
+test
diff --git a/Cesium.Preprocessor/CPreprocessor.cs b/Cesium.Preprocessor/CPreprocessor.cs
@@ -460,27 +460,30 @@ IEnumerable<IToken<CPreprocessorTokenType>> ConsumeLineAll()
         {
             case "include":
             {
-                // If in disabled block, do not attempt to include files.
+                if (!IncludeTokens)
+                {
+                    // Ignore everything after #include in a disabled block
+                    foreach (var _ in ConsumeLineAll()) {}
+                    return [];
+                }
+
                 var filePath = ConsumeNext(HeaderName).Text;
                 var tokensList = new List<IToken<CPreprocessorTokenType>>();
-                if (IncludeTokens)
+                var includeFilePath = LookUpIncludeFile(filePath);
+                if (!IncludeContext.ShouldIncludeFile(includeFilePath))
                 {
-                    var includeFilePath = LookUpIncludeFile(filePath);
-                    if (!IncludeContext.ShouldIncludeFile(includeFilePath))
-                    {
-                        return Array.Empty<IToken<CPreprocessorTokenType>>();
-                    }
+                    return Array.Empty<IToken<CPreprocessorTokenType>>();
+                }
 
-                    if (!File.Exists(includeFilePath))
-                    {
-                        Console.Error.WriteLine($"Cannot find path to {filePath} during parsing {CompilationUnitPath}");
-                    }
+                if (!File.Exists(includeFilePath))
+                {
+                    Console.Error.WriteLine($"Cannot find path to {filePath} during parsing {CompilationUnitPath}");
+                }
 
-                    using var reader = IncludeContext.OpenFileStream(includeFilePath);
-                    await foreach (var token in ProcessInclude(includeFilePath, reader))
-                    {
-                        tokensList.Add(token);
-                    }
+                using var reader = IncludeContext.OpenFileStream(includeFilePath);
+                await foreach (var token in ProcessInclude(includeFilePath, reader))
+                {
+                    tokensList.Add(token);
                 }
 
                 bool hasRemaining;