Lexer now handles '\\' continuation at the end of a line.

icculus · Feb 15, 2009 · 378e88d · 378e88d
1 parent 3fb7c25
commit 378e88d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/mojoshader_lexer.re b/mojoshader_lexer.re
@@ -69,6 +69,8 @@ scanner_loop:
 */
 
 /*!re2c
+    "\\" [ \t\v\f]* NEWLINE  { s->line++; goto scanner_loop; }
+
     "/*"            { goto multilinecomment; }
     "//"            { goto singlelinecomment; }
 
@@ -83,7 +85,7 @@ scanner_loop:
     
     (["] (ESC|ANY\[\r\n\\"])* ["])
                     { RET(TOKEN_STRING_LITERAL); }
-    
+
     ">>="           { RET(TOKEN_RSHIFTASSIGN); }
     "<<="           { RET(TOKEN_LSHIFTASSIGN); }
     "+="            { RET(TOKEN_ADDASSIGN); }
@@ -129,7 +131,6 @@ scanner_loop:
     "}"             { RET('}'); }
     "="             { RET('='); }
     "?"             { RET('?'); }
-    "\\"            { RET('\\'); }
 
     PP "include"    { RET(TOKEN_PP_INCLUDE); }
     PP "line"       { RET(TOKEN_PP_LINE); }

diff --git a/mojoshader_preprocessor.c b/mojoshader_preprocessor.c
@@ -568,10 +568,6 @@ int preprocessor_outofmemory(Preprocessor *_ctx)
 } // preprocessor_outofmemory
 
 
-// !!! FIXME: (almost?) all preprocessor directives can end a line with a
-// !!! FIXME:  '\\' to continue to the next line.
-
-
 static int require_newline(IncludeState *state)
 {
     const char *source = state->source;