glcpp: Rename "errors" to "info_log."

Eventually, we'll want to be be able to print out warnings as well.

diff --git a/glcpp/glcpp-parse.y b/glcpp/glcpp-parse.y
index 984a4768515e6f205705c03a70720689a3c63710..c70370a6c322ab846dde35f63ed5fabb0f9b2683 100644 (file)
--- a/glcpp/glcpp-parse.y
+++ b/glcpp/glcpp-parse.y
@@ -859,11 +859,11 @@ _token_paste (glcpp_parser_t *parser, token_t *token, token_t *other)
        }
 
        glcpp_error (&token->location, parser, "");
-       glcpp_print (parser->errors, "Pasting \"");
-       _token_print (&parser->errors, token);
-       glcpp_print (parser->errors, "\" and \"");
-       _token_print (&parser->errors, other);
-       glcpp_print (parser->errors, "\" does not give a valid preprocessing token.\n");
+       glcpp_print (parser->info_log, "Pasting \"");
+       _token_print (&parser->info_log, token);
+       glcpp_print (parser->info_log, "\" and \"");
+       _token_print (&parser->info_log, other);
+       glcpp_print (parser->info_log, "\" does not give a valid preprocessing token.\n");
 
        return token;
 }
@@ -909,7 +909,7 @@ glcpp_parser_create (void)
        parser->lex_from_node = NULL;
 
        parser->output = talloc_strdup(parser, "");
-       parser->errors = talloc_strdup(parser, "");
+       parser->info_log = talloc_strdup(parser, "");
 
        return parser;
 }

diff --git a/glcpp/glcpp.c b/glcpp/glcpp.c
index d204eee49acb092a25449e9e49c18fb7fe0d13fc..8ba4661f78419862e4eadc00d771d3cc2fe21fbb 100644 (file)
--- a/glcpp/glcpp.c
+++ b/glcpp/glcpp.c
@@ -36,7 +36,7 @@ main (void)
        ret = glcpp_parser_parse (parser);
 
        printf("%s", parser->output);
-       fprintf(stderr, "%s", parser->errors);
+       fprintf(stderr, "%s", parser->info_log);
 
        glcpp_parser_destroy (parser);
 

diff --git a/glcpp/glcpp.h b/glcpp/glcpp.h
index 4a2489a96d9f92a27255d012ced7f9143206e5a1..e67469be2eba68858fbc51bedfd9b8612aabac2d 100644 (file)
--- a/glcpp/glcpp.h
+++ b/glcpp/glcpp.h
@@ -154,7 +154,7 @@ struct glcpp_parser {
        token_list_t *lex_from_list;
        token_node_t *lex_from_node;
        char *output;
-       char *errors;
+       char *info_log;
 };
 
 glcpp_parser_t *

diff --git a/glcpp/pp.c b/glcpp/pp.c
index 5d1ff8c6823c4cd780bf2060291e88c8cf91ec6c..f8a7c2ea4d582122194e99dbd910da727ac4273e 100644 (file)
--- a/glcpp/pp.c
+++ b/glcpp/pp.c
@@ -26,15 +26,17 @@
 void
 glcpp_error (YYLTYPE *locp, glcpp_parser_t *parser, const char *fmt, ...)
 {
-        parser->errors = talloc_asprintf_append(parser->errors, "%u:%u(%u): "
-                                               "preprocessor error: ",
-                                               locp->source, locp->first_line,
-                                               locp->first_column);
-        va_list ap;
-        va_start(ap, fmt);
-        parser->errors = talloc_vasprintf_append(parser->errors, fmt, ap);
-        va_end(ap);
-        parser->errors = talloc_strdup_append(parser->errors, "\n");
+       parser->info_log = talloc_asprintf_append(parser->info_log,
+                                                 "%u:%u(%u): "
+                                                 "preprocessor error: ",
+                                                 locp->source,
+                                                 locp->first_line,
+                                                 locp->first_column);
+       va_list ap;
+       va_start(ap, fmt);
+       parser->info_log = talloc_vasprintf_append(parser->info_log, fmt, ap);
+       va_end(ap);
+       parser->info_log = talloc_strdup_append(parser->info_log, "\n");
 }
 
 extern int
@@ -46,8 +48,8 @@ preprocess(void *talloc_ctx, const char **shader, size_t *shader_len)
 
        glcpp_parser_parse (parser);
 
-       errors = parser->errors[0] != '\0';
-       printf("%s", parser->errors);
+       errors = parser->info_log[0] != '\0';
+       printf("%s", parser->info_log);
 
        talloc_steal(talloc_ctx, parser->output);
        *shader = parser->output;