Mesa (mesa_7_4_branch): glsl: Fix symbol replacement handling in preprocessor.

[Brian Paul]

Module: Mesa
Branch: mesa_7_4_branch
Commit: 0269eb5e3f081c6e5d9ffddf7f6ca03f69b30fe5
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=0269eb5e3f081c6e5d9ffddf7f6ca03f69b30fe5

Author: Brian Paul <brianp at vmware.com>
Date:   Wed Jun 10 12:25:11 2009 -0600

glsl: Fix symbol replacement handling in preprocessor.

(cherry picked from master, commit d9617deb008b75f4a605a30408aeb1948139c33e)

---

 src/mesa/shader/slang/slang_preprocess.c |   28 +++++++++++++++-------------
 1 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/src/mesa/shader/slang/slang_preprocess.c b/src/mesa/shader/slang/slang_preprocess.c
index b2530a6..5455ba6 100644
--- a/src/mesa/shader/slang/slang_preprocess.c
+++ b/src/mesa/shader/slang/slang_preprocess.c
@@ -1018,8 +1018,6 @@ preprocess_source (slang_string *output, const char *source,
          case TOKEN_DEFINE:
             {
                pp_symbol *symbol = NULL;
-               slang_string replacement;
-               expand_state es;
 
                /* Parse macro name. */
                id = (const char *) (&prod[i]);
@@ -1061,21 +1059,25 @@ preprocess_source (slang_string *output, const char *source,
                id = (const char *) (&prod[i]);
                idlen = _mesa_strlen (id);
                if (state.cond.top->effective) {
+                  slang_string replacement;
+                  expand_state es;
+
                   pp_annotate (output, ") %s", id);
-               }
-               slang_string_init(&replacement);
-               slang_string_pushs(&replacement, id, idlen);
-               i += idlen + 1;
 
-               /* Expand macro replacement. */
-               es.output = &symbol->replacement;
-               es.input = slang_string_cstr(&replacement);
-               es.state = &state;
-               if (!expand(&es, &state.symbols)) {
+                  slang_string_init(&replacement);
+                  slang_string_pushs(&replacement, id, idlen);
+
+                  /* Expand macro replacement. */
+                  es.output = &symbol->replacement;
+                  es.input = slang_string_cstr(&replacement);
+                  es.state = &state;
+                  if (!expand(&es, &state.symbols)) {
+                     slang_string_free(&replacement);
+                     goto error;
+                  }
                   slang_string_free(&replacement);
-                  goto error;
                }
-               slang_string_free(&replacement);
+               i += idlen + 1;
             }
             break;