diff --git a/src/symtab.c b/src/symtab.c index 417b71e4..66a99059 100644 --- a/src/symtab.c +++ b/src/symtab.c @@ -464,7 +464,8 @@ symbol_class_set (symbol *sym, symbol_class class, location loc, bool declaring) if (s->status == declared) { unsigned i = 0; - complain (&loc, Wother, _("symbol %s redeclared"), sym->tag); + complain_indent (&loc, Wother, &i, + _("symbol %s redeclared"), sym->tag); i += SUB_INDENT; complain_indent (&sym->location, Wother, &i, _("previous declaration")); diff --git a/tests/diagnostics.at b/tests/diagnostics.at index d89b5f64..a4496952 100644 --- a/tests/diagnostics.at +++ b/tests/diagnostics.at @@ -73,31 +73,31 @@ exp: %empty; [[input.y:9.12-14: warning: symbol FOO redeclared [-Wother] 9 | %token FOO FOO FOO | ^~~ -input.y:9.8-10: previous declaration +input.y:9.8-10: previous declaration 9 | %token FOO FOO FOO | ^~~ input.y:9.16-18: warning: symbol FOO redeclared [-Wother] 9 | %token FOO FOO FOO | ^~~ -input.y:9.8-10: previous declaration +input.y:9.8-10: previous declaration 9 | %token FOO FOO FOO | ^~~ input.y:10.8-10: warning: symbol FOO redeclared [-Wother] 10 | %token FOO FOO FOO | ^~~ -input.y:9.8-10: previous declaration +input.y:9.8-10: previous declaration 9 | %token FOO FOO FOO | ^~~ input.y:10.13-15: warning: symbol FOO redeclared [-Wother] 10 | %token FOO FOO FOO | ^~~ -input.y:9.8-10: previous declaration +input.y:9.8-10: previous declaration 9 | %token FOO FOO FOO | ^~~ input.y:10.18-20: warning: symbol FOO redeclared [-Wother] 10 | %token FOO FOO FOO | ^~~ -input.y:9.8-10: previous declaration +input.y:9.8-10: previous declaration 9 | %token FOO FOO FOO | ^~~ ]]) @@ -300,7 +300,7 @@ exp:^M [[input.y:11.9-11: warning: symbol FOO redeclared [-Wother] 11 | %token FOO | ^~~ -input.y:10.9-11: previous declaration +input.y:10.9-11: previous declaration 10 | %token FOO | ^~~ input.y:13.5: warning: empty rule without %empty [-Wempty-rule] diff --git a/tests/input.at b/tests/input.at index 40d6757a..443b9374 100644 --- a/tests/input.at +++ b/tests/input.at @@ -633,19 +633,19 @@ AT_BISON_CHECK([-fcaret input.y], [0], [], [[input.y:1.12-14: warning: symbol FOO redeclared [-Wother] 1 | %token FOO FOO | ^~~ -input.y:1.8-10: previous declaration +input.y:1.8-10: previous declaration 1 | %token FOO FOO | ^~~ input.y:2.15-17: warning: symbol BAR redeclared [-Wother] 2 | %token BAR 12 BAR 12 | ^~~ -input.y:2.8-10: previous declaration +input.y:2.8-10: previous declaration 2 | %token BAR 12 BAR 12 | ^~~ input.y:3.14-16: warning: symbol EOF redeclared [-Wother] 3 | %token EOF 0 EOF 0 | ^~~ -input.y:3.8-10: previous declaration +input.y:3.8-10: previous declaration 3 | %token EOF 0 EOF 0 | ^~~ ]]) diff --git a/tests/regression.at b/tests/regression.at index 55a3c95b..7ec9ed57 100644 --- a/tests/regression.at +++ b/tests/regression.at @@ -401,7 +401,7 @@ AT_BISON_CHECK([-fcaret -o input.c input.y], [[0]], [[]], [[input.y:22.8-14: warning: symbol SPECIAL redeclared [-Wother] 22 | %token SPECIAL "\\\'\?\"\a\b\f\n\r\t\v\001\201\x001\x000081??!" | ^~~~~~~ -input.y:21.8-14: previous declaration +input.y:21.8-14: previous declaration 21 | %token SPECIAL "\\\'\?\"\a\b\f\n\r\t\v\001\201\x001\x000081??!" | ^~~~~~~ input.y:22.16-63: warning: symbol "\\'?\"\a\b\f\n\r\t\v\001\201\001\201??!" used more than once as a literal string [-Wother]