Allow multiline comments before preprocessor directives.

Microsoft's preprocessor allows this, even though C/C++ doesn't.
icculus · Oct 2, 2014 · 8961fa5 · 8961fa5
1 parent d1421a7
commit 8961fa5
Show file tree

Hide file tree

Showing 10 changed files with 46 additions and 6 deletions.
diff --git a/mojoshader_internal.h b/mojoshader_internal.h
@@ -68,6 +68,11 @@
 #error glsl120 profile requires glsl profile. Fix your build.
 #endif
 
+// Microsoft's preprocessor has some quirks. In some ways, it doesn't work
+//  like you'd expect a C preprocessor to function.
+#ifndef MATCH_MICROSOFT_PREPROCESSOR
+#define MATCH_MICROSOFT_PREPROCESSOR 1
+#endif
 
 // Other stuff you can disable...
 

diff --git a/mojoshader_lexer.c b/mojoshader_lexer.c
@@ -1164,6 +1164,18 @@ Token preprocessor_lexer(IncludeState *s)
                             RET(TOKEN_MULTI_COMMENT);
                         else if (s->report_whitespace)
                             RET(' ');
+
+                        // Microsoft's preprocessor allows multiline comments
+                        //  before a preprocessor directive, even though C/C++
+                        //  doesn't. See if we've hit this case.
+                        #if MATCH_MICROSOFT_PREPROCESSOR
+                        if (s->tokenval == ((Token) '\n'))  // was start of line?
+                        {
+                            update_state(s, eoi, cursor, token, (Token) '\n');
+                            goto ppdirective;  // may jump back to scanner_loop.
+                        }
+                        #endif
+
                         goto scanner_loop;
                     }
 }

diff --git a/mojoshader_lexer.re b/mojoshader_lexer.re
@@ -172,6 +172,18 @@ multilinecomment:
                             RET(TOKEN_MULTI_COMMENT);
                         else if (s->report_whitespace)
                             RET(' ');
+
+                        // Microsoft's preprocessor allows multiline comments
+                        //  before a preprocessor directive, even though C/C++
+                        //  doesn't. See if we've hit this case.
+                        #if MATCH_MICROSOFT_PREPROCESSOR
+                        if (s->tokenval == ((Token) '\n'))  // was start of line?
+                        {
+                            update_state(s, eoi, cursor, token, (Token) '\n');
+                            goto ppdirective;  // may jump back to scanner_loop.
+                        }
+                        #endif
+
                         goto scanner_loop;
                     }
     NEWLINE         {

diff --git a/mojoshader_preprocessor.c b/mojoshader_preprocessor.c
@@ -60,12 +60,6 @@ typedef struct Context
     void *malloc_data;
 } Context;
 
-// Microsoft's preprocessor has some quirks. In some ways, it doesn't work
-//  like you'd expect a C preprocessor to function.
-#ifndef MATCH_MICROSOFT_PREPROCESSOR
-#define MATCH_MICROSOFT_PREPROCESSOR 1
-#endif
-
 
 // Convenience functions for allocators...
 

diff --git a/unit_tests/preprocessor/output/comment-before-preprocessor-directive b/unit_tests/preprocessor/output/comment-before-preprocessor-directive
@@ -0,0 +1,10 @@
+// This shouldn't care that there's a multiline comment before a preprocessor
+//  directive. It should translate to whitespace, thrown away, making the
+//  "#if 1" the first thing on the line, and thus valid.
+// Note that this isn't legal in C/C++ preprocessing, but Microsoft's fxc.exe
+//  allows this quirk.
+/* comment! */ #if 1
+RIGHT
+#else
+WRONG
+#endif
diff --git a/unit_tests/preprocessor/output/comment-before-preprocessor-directive.correct b/unit_tests/preprocessor/output/comment-before-preprocessor-directive.correct
@@ -0,0 +1 @@
+RIGHT
diff --git a/unit_tests/preprocessor/output/multiline-comment-no-whitespace b/unit_tests/preprocessor/output/multiline-comment-no-whitespace
@@ -0,0 +1 @@
+/*comment*/RIGHT/*comment*/
diff --git a/unit_tests/preprocessor/output/multiline-comment-no-whitespace.correct b/unit_tests/preprocessor/output/multiline-comment-no-whitespace.correct
@@ -0,0 +1 @@
+RIGHT
diff --git a/unit_tests/preprocessor/output/multiline-comments-alone-on-line b/unit_tests/preprocessor/output/multiline-comments-alone-on-line
@@ -0,0 +1,3 @@
+/*comment*/
+/*comment*/
+RIGHT
diff --git a/unit_tests/preprocessor/output/multiline-comments-alone-on-line.correct b/unit_tests/preprocessor/output/multiline-comments-alone-on-line.correct
@@ -0,0 +1 @@
+RIGHT