Fix line numbers in #error preprocessor directives.

icculus · Feb 14, 2009 · 645d4c9 · 645d4c9
1 parent db73da9
commit 645d4c9
Showing 1 changed file with 7 additions and 6 deletions.
diff --git a/mojoshader_preprocessor.c b/mojoshader_preprocessor.c
@@ -639,18 +639,17 @@ static void handle_pp_error(Context *ctx)
     const char *data = NULL;
     int done = 0;
 
+    const char *source = NULL;
     while (!done)
     {
-        const char *source = state->source;
+        source = state->source;
         const Token token = preprocessor_internal_lexer(state);
         switch (token)
         {
-            case TOKEN_INCOMPLETE_COMMENT:
-                state->source = source;  // move back so we catch this later.
-                done = 1;
-                break;
-
             case ((Token) '\n'):
+                state->line--;  // make sure error is on the right line.
+                // fall through!
+            case TOKEN_INCOMPLETE_COMMENT:
             case TOKEN_EOI:
                 done = 1;
                 break;
@@ -662,6 +661,8 @@ static void handle_pp_error(Context *ctx)
         } // switch
     } // while
 
+    state->source = source;  // move back so we catch this later.
+
     const char *prefix = "#error ";
     const size_t prefixlen = strlen(prefix);
     const int len = (int) (state->source - data);