]> git.rm.cloudns.org Git - xonotic/gmqcc.git/commitdiff
error message replacement
authorWolfgang (Blub) Bumiller <blub@speed.at>
Tue, 14 Aug 2012 15:36:20 +0000 (17:36 +0200)
committerWolfgang (Blub) Bumiller <blub@speed.at>
Tue, 14 Aug 2012 15:36:20 +0000 (17:36 +0200)
parser.c

index e65eff3fde8425282a74154f3db268fc18ab8f5c..e83edb75fd5bbda84edb32b606e6e0778700317d 100644 (file)
--- a/parser.c
+++ b/parser.c
@@ -1579,7 +1579,8 @@ static bool parser_variable(parser_t *parser, ast_block *localblock)
              */
             if (proto) {
                 if (!ast_compare_type((ast_expression*)proto, (ast_expression*)fval)) {
-                    parseerror(parser, "prototype declared at %s:%i had a different type",
+                    parseerror(parser, "conflicting types for `%s`, previous declaration was here: %s:%i",
+                               proto->name,
                                ast_ctx(proto).file, ast_ctx(proto).line);
                     ast_function_delete(func);
                     ast_value_delete(fval);