Serious reworking of preprocessor macro replacement code.

Appears to handles the various oddities on might encounter in macro salsa, now.
icculus · Mar 12, 2010 · ad005a5 · ad005a5
1 parent 6903d18
commit ad005a5
Show file tree

Hide file tree

Showing 2 changed files with 311 additions and 302 deletions.
diff --git a/mojoshader_internal.h b/mojoshader_internal.h
@@ -461,6 +461,7 @@ typedef struct Define
 {
     const char *identifier;
     const char *definition;
+    const char *original;
     const char **parameters;
     int paramcount;
     struct Define *next;
@@ -476,14 +477,12 @@ typedef struct IncludeState
     Token tokenval;
     int pushedback;
     const unsigned char *lexer_marker;
-    int is_macro;
     int report_whitespace;
     int asm_comments;
     unsigned int orig_length;
     unsigned int bytes_left;
     unsigned int line;
     Conditional *conditional_stack;
-    Define *defines;  // temp defines for macros with parameters.
     MOJOSHADER_includeClose close_callback;
     struct IncludeState *next;
 } IncludeState;