Francois Gouget : d3dcompiler_43: Move asmparser_message() and asmshader_error() up to avoid forward declarations.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 330520980ab371882793c897eccc108c2b8de4e9
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=330520980ab371882793c897ec...

Author: Francois Gouget <fgouget(a)free.fr>
Date:   Mon Sep 13 10:45:14 2010 +0200

d3dcompiler_43: Move asmparser_message() and asmshader_error() up to avoid forward declarations.

---

 dlls/d3dcompiler_43/asmshader.y |   94 +++++++++++++++++++-------------------
 1 files changed, 47 insertions(+), 47 deletions(-)

diff --git a/dlls/d3dcompiler_43/asmshader.y b/dlls/d3dcompiler_43/asmshader.y
index 4e22c95..db83ec3 100644
--- a/dlls/d3dcompiler_43/asmshader.y
+++ b/dlls/d3dcompiler_43/asmshader.y
@@ -32,9 +32,49 @@ WINE_DEFAULT_DEBUG_CHANNEL(asmshader);
 
 struct asm_parser asm_ctx;
 
-/* Needed lexer functions declarations */
-void asmshader_error(const char *s);
-int asmshader_lex(void);
+/* Error reporting function */
+void asmparser_message(struct asm_parser *ctx, const char *fmt, ...) {
+    va_list args;
+    char* newbuffer;
+    int rc, newsize;
+
+    if(ctx->messagecapacity == 0) {
+        ctx->messages = asm_alloc(MESSAGEBUFFER_INITIAL_SIZE);
+        if(ctx->messages == NULL) {
+            ERR("Error allocating memory for parser messages\n");
+            return;
+        }
+        ctx->messagecapacity = MESSAGEBUFFER_INITIAL_SIZE;
+    }
+
+    while(1) {
+        va_start(args, fmt);
+        rc = vsnprintf(ctx->messages + ctx->messagesize,
+                       ctx->messagecapacity - ctx->messagesize, fmt, args);
+        va_end(args);
+
+        if (rc < 0 ||                                           /* C89 */
+            rc >= ctx->messagecapacity - ctx->messagesize) {    /* C99 */
+            /* Resize the buffer */
+            newsize = ctx->messagecapacity * 2;
+            newbuffer = asm_realloc(ctx->messages, newsize);
+            if(newbuffer == NULL){
+                ERR("Error reallocating memory for parser messages\n");
+                return;
+            }
+            ctx->messages = newbuffer;
+            ctx->messagecapacity = newsize;
+        } else {
+            ctx->messagesize += rc;
+            return;
+        }
+    }
+}
+
+void asmshader_error(char const *s) {
+    asmparser_message(&asm_ctx, "Line %u: Error \"%s\" from bison\n", asm_ctx.line_no, s);
+    set_parse_status(&asm_ctx, PARSE_ERR);
+}
 
 void set_rel_reg(struct shader_reg *reg, struct rel_reg *rel) {
     /* We can have an additional offset without true relative addressing
@@ -53,6 +93,10 @@ void set_rel_reg(struct shader_reg *reg, struct rel_reg *rel) {
     }
 }
 
+/* Needed lexer functions declarations */
+int asmshader_lex(void);
+
+
 %}
 
 %union {
@@ -1660,50 +1704,6 @@ predicate:            '(' REG_PREDICATE swizzle ')'
 
 %%
 
-void asmshader_error (char const *s) {
-    asmparser_message(&asm_ctx, "Line %u: Error \"%s\" from bison\n", asm_ctx.line_no, s);
-    set_parse_status(&asm_ctx, PARSE_ERR);
-}
-
-/* Error reporting function */
-void asmparser_message(struct asm_parser *ctx, const char *fmt, ...) {
-    va_list args;
-    char* newbuffer;
-    int rc, newsize;
-
-    if(ctx->messagecapacity == 0) {
-        ctx->messages = asm_alloc(MESSAGEBUFFER_INITIAL_SIZE);
-        if(ctx->messages == NULL) {
-            ERR("Error allocating memory for parser messages\n");
-            return;
-        }
-        ctx->messagecapacity = MESSAGEBUFFER_INITIAL_SIZE;
-    }
-
-    while(1) {
-        va_start(args, fmt);
-        rc = vsnprintf(ctx->messages + ctx->messagesize,
-                       ctx->messagecapacity - ctx->messagesize, fmt, args);
-        va_end(args);
-
-        if (rc < 0 ||                                           /* C89 */
-            rc >= ctx->messagecapacity - ctx->messagesize) {    /* C99 */
-            /* Resize the buffer */
-            newsize = ctx->messagecapacity * 2;
-            newbuffer = asm_realloc(ctx->messages, newsize);
-            if(newbuffer == NULL){
-                ERR("Error reallocating memory for parser messages\n");
-                return;
-            }
-            ctx->messages = newbuffer;
-            ctx->messagecapacity = newsize;
-        } else {
-            ctx->messagesize += rc;
-            return;
-        }
-    }
-}
-
 /* New status is the worst between current status and parameter value */
 void set_parse_status(struct asm_parser *ctx, enum parse_status status) {
     if(status == PARSE_ERR) ctx->status = PARSE_ERR;