(#61) Update the preprocessor to handle trailing comments on #include

ForNeVeR · Jan 17, 2024 · 9b57451 · 9b57451
1 parent 8840f9e
commit 9b57451
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 5 deletions.
diff --git a/Cesium.Parser.Tests/PreprocessorTests/PreprocessorTests.cs b/Cesium.Parser.Tests/PreprocessorTests/PreprocessorTests.cs
@@ -1,3 +1,4 @@
+using System.Diagnostics.CodeAnalysis;
 using Cesium.Core;
 using Cesium.Preprocessor;
 using Cesium.TestFramework;
@@ -7,7 +8,10 @@ namespace Cesium.Parser.Tests.PreprocessorTests;
 
 public class PreprocessorTests : VerifyTestBase
 {
-    private static async Task DoTest(string source, Dictionary<string, string>? standardHeaders = null, Dictionary<string, IList<IToken<CPreprocessorTokenType>>>? defines = null)
+    private static async Task DoTest(
+        [StringSyntax("cpp")] string source,
+        Dictionary<string, string>? standardHeaders = null,
+        Dictionary<string, IList<IToken<CPreprocessorTokenType>>>? defines = null)
     {
         string result = await DoPreprocess(source, standardHeaders, defines);
         await Verify(result, GetSettings());
@@ -45,12 +49,17 @@ int test()
 }", new() { ["foo.h"] = "void foo() {}", ["bar.h"] = "int bar = 0;" });
 
     [Fact]
-    public Task IncludeTrailingWhiltespacesIgnored() => DoTest($@"#include <foo.h>{"\t\t\t" /*Make whitespaces visible here */}
+    public Task IncludeTrailingWhitespacesIgnored() => DoTest($@"#include <foo.h>{"\t\t\t" /*Make whitespaces visible here */}
 #include <bar.h>
 int test()
 {{
 }}", new() { ["foo.h"] = "void foo() {}", ["bar.h"] = "int bar = 0;" });
 
+    [Fact]
+    public Task IncludeTrailingCommentsAreAllowed() => DoTest(
+        "#include <foo.h> // comment",
+        new() { ["foo.h"] = "int x = 0;" });
+
     [Fact]
     public Task IncludeNoWhitespaces() => DoTest(@"#include<foo.h>
 int test()

diff --git a/...eprocessorTests/verified/PreprocessorTests.IncludeTrailingCommentsAreAllowed.verified.txt b/...eprocessorTests/verified/PreprocessorTests.IncludeTrailingCommentsAreAllowed.verified.txt
@@ -0,0 +1 @@
+int x = 0;
diff --git a/...eTrailingWhiltespacesIgnored.verified.txt → ...deTrailingWhitespacesIgnored.verified.txt b/...eTrailingWhiltespacesIgnored.verified.txt → ...deTrailingWhitespacesIgnored.verified.txt
diff --git a/Cesium.Preprocessor/CPreprocessor.cs b/Cesium.Preprocessor/CPreprocessor.cs
@@ -1,5 +1,4 @@
 using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
 using System.Globalization;
 using System.Text;
 using Cesium.Core;
@@ -486,9 +485,9 @@ IEnumerable<IToken<CPreprocessorTokenType>> ConsumeLineAll()
 
                 bool hasRemaining;
                 while ((hasRemaining = enumerator.MoveNext())
-                       && enumerator.Current is { Kind: WhiteSpace })
+                       && enumerator.Current is { Kind: WhiteSpace or Comment })
                 {
-                    // eat remaining whitespace
+                    // eat remaining whitespace and comments
                 }
 
                 if (hasRemaining && enumerator.Current is var t and not { Kind: WhiteSpace })