mirror of
https://git.savannah.gnu.org/git/bison.git
synced 2026-03-09 12:23:04 +00:00
diagnostics: modernize the display of submessages
Since Bison 2.7, output was indented four spaces for explanatory
statements. For example:
input.y:2.7-13: error: %type redeclaration for exp
input.y:1.7-11: previous declaration
Since the introduction of caret-diagnostics, it became less clear.
Remove the indentation and display submessages as in GCC:
input.y:2.7-13: error: %type redeclaration for exp
2 | %type <float> exp
| ^~~~~~~
input.y:1.7-11: note: previous declaration
1 | %type <int> exp
| ^~~~~
* src/complain.h (SUB_INDENT): Remove.
(warnings): Add "note" to the enum.
* src/complain.h, src/complain.c (complain_indent): Replace by...
(subcomplain): this.
Adjust all dependencies.
* tests/actions.at, tests/diagnostics.at, tests/glr-regression.at,
* tests/input.at, tests/named-refs.at, tests/regression.at:
Adjust expectations.
This commit is contained in:
Victor Morales Cayuela
committed by
Akim Demaille
Akim Demaille
parent
a09d0ae4d1
commit
e09a72eeb0
@@ -77,31 +77,31 @@ exp: %empty;
|
||||
[[input.y:9.12-14: <warning>warning:</warning> symbol FOO redeclared [<warning>-Wother</warning>]
|
||||
9 | %token FOO <warning>FOO</warning> FOO
|
||||
| <warning>^~~</warning>
|
||||
input.y:9.8-10: previous declaration
|
||||
input.y:9.8-10: <note>note:</note> previous declaration
|
||||
9 | %token <note>FOO</note> FOO FOO
|
||||
| <note>^~~</note>
|
||||
input.y:9.16-18: <warning>warning:</warning> symbol FOO redeclared [<warning>-Wother</warning>]
|
||||
9 | %token FOO FOO <warning>FOO</warning>
|
||||
| <warning>^~~</warning>
|
||||
input.y:9.8-10: previous declaration
|
||||
input.y:9.8-10: <note>note:</note> previous declaration
|
||||
9 | %token <note>FOO</note> FOO FOO
|
||||
| <note>^~~</note>
|
||||
input.y:10.8-10: <warning>warning:</warning> symbol FOO redeclared [<warning>-Wother</warning>]
|
||||
10 | %token <warning>FOO</warning> FOO FOO
|
||||
| <warning>^~~</warning>
|
||||
input.y:9.8-10: previous declaration
|
||||
input.y:9.8-10: <note>note:</note> previous declaration
|
||||
9 | %token <note>FOO</note> FOO FOO
|
||||
| <note>^~~</note>
|
||||
input.y:10.13-15: <warning>warning:</warning> symbol FOO redeclared [<warning>-Wother</warning>]
|
||||
10 | %token FOO <warning>FOO</warning> FOO
|
||||
| <warning>^~~</warning>
|
||||
input.y:9.8-10: previous declaration
|
||||
input.y:9.8-10: <note>note:</note> previous declaration
|
||||
9 | %token <note>FOO</note> FOO FOO
|
||||
| <note>^~~</note>
|
||||
input.y:10.18-20: <warning>warning:</warning> symbol FOO redeclared [<warning>-Wother</warning>]
|
||||
10 | %token FOO FOO <warning>FOO</warning>
|
||||
| <warning>^~~</warning>
|
||||
input.y:9.8-10: previous declaration
|
||||
input.y:9.8-10: <note>note:</note> previous declaration
|
||||
9 | %token <note>FOO</note> FOO FOO
|
||||
| <note>^~~</note>
|
||||
]])
|
||||
@@ -296,7 +296,7 @@ exp:^M
|
||||
[[input.y:11.9-11: <warning>warning:</warning> symbol FOO redeclared [<warning>-Wother</warning>]
|
||||
11 | %token
|
||||
<warning>FOO</warning>
|
||||
| <warning>^~~</warning>
|
||||
| <warning>^~~</warning>
|
||||
input.y:10.9-11: <note>note:</note> previous declaration
|
||||
10 | %token
|
||||
<note>FOO</note>
|
||||
@@ -322,19 +322,19 @@ exp: ABCDEFGHIJKLMNOPQRSTUVWXYZ
|
||||
]],
|
||||
[0],
|
||||
[[input.y:9.36-61: <warning>warning:</warning> symbol ABCDEFGHIJKLMNOPQRSTUVWXYZ redeclared [<warning>-Wother</warning>]
|
||||
9 | %token ABCDEFGHIJKLMNOPQRSTUVWXYZ <warning>ABCDEFGHIJKLMNOPQRSTUVWXYZ</warning> ABCDEFGHIJKLMNOPQRSTUVWXYZ ABCDEFGHIJKLMNOPQRSTUVWXYZ
|
||||
9 | %token ABCDEFGHIJKLMNOPQRSTUVWXYZ <warning>ABCDEFGHIJKLMNOPQRSTUVWXYZ</warning> ABCDEFGHIJKLMNOPQRSTUVWXYZ ABCDEFGHIJKLMNOPQRSTUVWXYZ
|
||||
| <warning>^~~~~~~~~~~~~~~~~~~~~~~~~~</warning>
|
||||
input.y:9.8-33: <note>note:</note> previous declaration
|
||||
9 | %token <note>ABCDEFGHIJKLMNOPQRSTUVWXYZ</note> ABCDEFGHIJKLMNOPQRSTUVWXYZ ABCDEFGHIJKLMNOPQRSTUVWXYZ ABCDEFGHIJKLMNOPQRSTUVWXYZ
|
||||
| <note>^~~~~~~~~~~~~~~~~~~~~~~~~~</note>
|
||||
input.y:9.64-89: <warning>warning:</warning> symbol ABCDEFGHIJKLMNOPQRSTUVWXYZ redeclared [<warning>-Wother</warning>]
|
||||
9 | %token ABCDEFGHIJKLMNOPQRSTUVWXYZ ABCDEFGHIJKLMNOPQRSTUVWXYZ <warning>ABCDEFGHIJKLMNOPQRSTUVWXYZ</warning> ABCDEFGHIJKLMNOPQRSTUVWXYZ
|
||||
9 | %token ABCDEFGHIJKLMNOPQRSTUVWXYZ ABCDEFGHIJKLMNOPQRSTUVWXYZ <warning>ABCDEFGHIJKLMNOPQRSTUVWXYZ</warning> ABCDEFGHIJKLMNOPQRSTUVWXYZ
|
||||
| <warning>^~~~~~~~~~~~~~~~~~~~~~~~~~</warning>
|
||||
input.y:9.8-33: <note>note:</note> previous declaration
|
||||
9 | %token <note>ABCDEFGHIJKLMNOPQRSTUVWXYZ</note> ABCDEFGHIJKLMNOPQRSTUVWXYZ ABCDEFGHIJKLMNOPQRSTUVWXYZ ABCDEFGHIJKLMNOPQRSTUVWXYZ
|
||||
| <note>^~~~~~~~~~~~~~~~~~~~~~~~~~</note>
|
||||
input.y:9.92-117: <warning>warning:</warning> symbol ABCDEFGHIJKLMNOPQRSTUVWXYZ redeclared [<warning>-Wother</warning>]
|
||||
9 | %token ABCDEFGHIJKLMNOPQRSTUVWXYZ ABCDEFGHIJKLMNOPQRSTUVWXYZ ABCDEFGHIJKLMNOPQRSTUVWXYZ <warning>ABCDEFGHIJKLMNOPQRSTUVWXYZ</warning>
|
||||
9 | %token ABCDEFGHIJKLMNOPQRSTUVWXYZ ABCDEFGHIJKLMNOPQRSTUVWXYZ ABCDEFGHIJKLMNOPQRSTUVWXYZ <warning>ABCDEFGHIJKLMNOPQRSTUVWXYZ</warning>
|
||||
| <warning>^~~~~~~~~~~~~~~~~~~~~~~~~~</warning>
|
||||
input.y:9.8-33: <note>note:</note> previous declaration
|
||||
9 | %token <note>ABCDEFGHIJKLMNOPQRSTUVWXYZ</note> ABCDEFGHIJKLMNOPQRSTUVWXYZ ABCDEFGHIJKLMNOPQRSTUVWXYZ ABCDEFGHIJKLMNOPQRSTUVWXYZ
|
||||
@@ -355,19 +355,19 @@ exp: ABCDEFGHIJKLMNOPQRSTUVWXYZ
|
||||
]],
|
||||
[0],
|
||||
[[input.y:9.36-61: <warning>warning:</warning> symbol ABCDEFGHIJKLMNOPQRSTUVWXYZ redeclared [<warning>-Wother</warning>]
|
||||
9 | %token ABCDEFGHIJKLMNOPQRSTUVWXYZ <warning>ABCDEFGHIJKLMNOPQRSTUVWXYZ</warning> ABCDEF...
|
||||
9 | %token ABCDEFGHIJKLMNOPQRSTUVWXYZ <warning>ABCDEFGHIJKLMNOPQRSTUVWXYZ</warning> ABCDEF...
|
||||
| <warning>^~~~~~~~~~~~~~~~~~~~~~~~~~</warning>
|
||||
input.y:9.8-33: <note>note:</note> previous declaration
|
||||
9 | %token <note>ABCDEFGHIJKLMNOPQRSTUVWXYZ</note> ABCDEFGHIJKLMNOPQRSTUVWXYZ ABCDEF...
|
||||
| <note>^~~~~~~~~~~~~~~~~~~~~~~~~~</note>
|
||||
input.y:9.64-89: <warning>warning:</warning> symbol ABCDEFGHIJKLMNOPQRSTUVWXYZ redeclared [<warning>-Wother</warning>]
|
||||
9 | %token ABCDEFGHIJKLMNOPQRSTUVWXYZ ABCDEFGHIJKLMNOPQRSTUVWXYZ <warning>ABCDEF</warning>...
|
||||
9 | %token ABCDEFGHIJKLMNOPQRSTUVWXYZ ABCDEFGHIJKLMNOPQRSTUVWXYZ <warning>ABCDEF</warning>...
|
||||
| <warning>^~~~~~</warning>
|
||||
input.y:9.8-33: <note>note:</note> previous declaration
|
||||
9 | %token <note>ABCDEFGHIJKLMNOPQRSTUVWXYZ</note> ABCDEFGHIJKLMNOPQRSTUVWXYZ ABCDEF...
|
||||
| <note>^~~~~~~~~~~~~~~~~~~~~~~~~~</note>
|
||||
input.y:9.92-117: <warning>warning:</warning> symbol ABCDEFGHIJKLMNOPQRSTUVWXYZ redeclared [<warning>-Wother</warning>]
|
||||
9 | ...TUVWXYZ <warning>ABCDEFGHIJKLMNOPQRSTUVWXYZ</warning>
|
||||
9 | ...TUVWXYZ <warning>ABCDEFGHIJKLMNOPQRSTUVWXYZ</warning>
|
||||
| <warning>^~~~~~~~~~~~~~~~~~~~~~~~~~</warning>
|
||||
input.y:9.8-33: <note>note:</note> previous declaration
|
||||
9 | %token <note>ABCDEFGHIJKLMNOPQRSTUVWXYZ</note> ABCDEFGHIJKLMNOPQRSTUVWXYZ ABCDEF...
|
||||
@@ -388,19 +388,19 @@ exp: ABCDEFGHIJKLMNOPQRSTUVWXYZ
|
||||
]],
|
||||
[0],
|
||||
[[input.y:9.36-61: <warning>warning:</warning> symbol ABCDEFGHIJKLMNOPQRSTUVWXYZ redeclared [<warning>-Wother</warning>]
|
||||
9 | %token ABCDEFGHIJKLMNOPQRSTUVWXYZ <warning>ABCDEFGHIJKLMN</warning>...
|
||||
9 | %token ABCDEFGHIJKLMNOPQRSTUVWXYZ <warning>ABCDEFGHIJKLMN</warning>...
|
||||
| <warning>^~~~~~~~~~~~~~</warning>
|
||||
input.y:9.8-33: <note>note:</note> previous declaration
|
||||
9 | %token <note>ABCDEFGHIJKLMNOPQRSTUVWXYZ</note> ABCDEFGHIJKLMN...
|
||||
| <note>^~~~~~~~~~~~~~~~~~~~~~~~~~</note>
|
||||
input.y:9.64-89: <warning>warning:</warning> symbol ABCDEFGHIJKLMNOPQRSTUVWXYZ redeclared [<warning>-Wother</warning>]
|
||||
9 | ...TUVWXYZ <warning>ABCDEFGHIJKLMNOPQRSTUVWXYZ</warning> ABCDEFGHI...
|
||||
9 | ...TUVWXYZ <warning>ABCDEFGHIJKLMNOPQRSTUVWXYZ</warning> ABCDEFGHI...
|
||||
| <warning>^~~~~~~~~~~~~~~~~~~~~~~~~~</warning>
|
||||
input.y:9.8-33: <note>note:</note> previous declaration
|
||||
9 | %token <note>ABCDEFGHIJKLMNOPQRSTUVWXYZ</note> ABCDEFGHIJKLMN...
|
||||
| <note>^~~~~~~~~~~~~~~~~~~~~~~~~~</note>
|
||||
input.y:9.92-117: <warning>warning:</warning> symbol ABCDEFGHIJKLMNOPQRSTUVWXYZ redeclared [<warning>-Wother</warning>]
|
||||
9 | ...TUVWXYZ <warning>ABCDEFGHIJKLMNOPQRSTUVWXYZ</warning>
|
||||
9 | ...TUVWXYZ <warning>ABCDEFGHIJKLMNOPQRSTUVWXYZ</warning>
|
||||
| <warning>^~~~~~~~~~~~~~~~~~~~~~~~~~</warning>
|
||||
input.y:9.8-33: <note>note:</note> previous declaration
|
||||
9 | %token <note>ABCDEFGHIJKLMNOPQRSTUVWXYZ</note> ABCDEFGHIJKLMN...
|
||||
|
||||
Reference in New Issue
Block a user