Throw away our dummy usertypes from the parse phase.

They are incorrect, and need to be correctly built during semantic analysis.
icculus · Jan 12, 2011 · 99fec26 · 99fec26
1 parent 0af8574
commit 99fec26
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/mojoshader_compiler.c b/mojoshader_compiler.c
@@ -3037,6 +3037,8 @@ static void parse_source(Context *ctx, const char *filename,
 
     // !!! FIXME: check if (parser == NULL)...
 
+    SymbolScope *start_scope = ctx->usertypes.scope;
+
     #if DEBUG_COMPILER_PARSER
     ParseHLSLTrace(stdout, "COMPILER: ");
     #endif
@@ -3165,6 +3167,10 @@ static void parse_source(Context *ctx, const char *filename,
             pop_scope(ctx);
     } while (tokenval != TOKEN_EOI);
 
+    // Clean out extra usertypes; they are dummies until semantic analysis.
+    while (ctx->usertypes.scope != start_scope)
+        pop_symbol(ctx, &ctx->usertypes);
+
     ParseHLSLFree(parser, ctx->free, ctx->malloc_data);
     preprocessor_end(pp);
 } // parse_source