Fixed #else preprocessor directive so it'll work with #elif.

icculus · Feb 15, 2009 · 92498d7 · 92498d7
1 parent 30b6a51
commit 92498d7
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/mojoshader_internal.h b/mojoshader_internal.h
@@ -380,6 +380,7 @@ typedef struct Conditional
     Token type;
     int linenum;
     int skipping;
+    int chosen;
     struct Conditional *next;
 } Conditional;
 

diff --git a/mojoshader_preprocessor.c b/mojoshader_preprocessor.c
@@ -789,6 +789,7 @@ static Conditional *_handle_pp_ifdef(Context *ctx, const Token type)
     conditional->type = type;
     conditional->linenum = state->line - 1;
     conditional->skipping = skipping;
+    conditional->chosen = !skipping;
     conditional->next = prev;
     state->conditional_stack = conditional;
     return conditional;
@@ -820,9 +821,10 @@ static inline void handle_pp_else(Context *ctx)
         fail(ctx, "#else after #else");
     else
     {
-        // !!! FIXME: doesn't work for #elif
         cond->type = TOKEN_PP_ELSE;
-        cond->skipping = !cond->skipping;
+        cond->skipping = cond->chosen;
+        if (!cond->chosen)
+            cond->chosen = 1;
     } // else
 } // handle_pp_else