Future/bison
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/bison.git synced 2026-03-09 12:23:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

diagnostics: copy GCC9's format

Browse Source 
Currently, when we quote the source file, we indent it with one space,
and preserve tabulations, so there is a discrepancy and the visual
rendering is bad.  One way out is to indent with a tab instead of a
space, but then this space can be used for more information.  This is
what GCC9 does.  Let's play copy cats.

See
https://lists.gnu.org/archive/html/bison-patches/2019-04/msg00025.html
https://developers.redhat.com/blog/2019/03/08/usability-improvements-in-gcc-9/
https://gcc.gnu.org/onlinedocs/gccint/Guidelines-for-Diagnostics.html#Guidelines-for-Diagnostics

* src/location.c (location_caret): Prefix quoted lines with the line
number and a pipe, fitting 8 columns.

* tests/actions.at, tests/c++.at, tests/conflicts.at,
* tests/diagnostics.at, tests/input.at, tests/java.at,
* tests/named-refs.at, tests/reduce.at, tests/regression.at,
* tests/sets.at: Adjust expectations.
Partly by "./build-aux/update-test tests/testsuite.dir/*/testsuite.log"
repeatedly, and partly by hand.
This commit is contained in:
Akim Demaille
2019-04-22 07:52:38 +02:00
parent afe7dfd3b9
commit a9b350fb3a
11 changed files with 502 additions and 502 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
tests/diagnostics.at
View File

@@ -60,20 +60,20 @@ AT_TEST([[Warnings]],
exp: %empty;
]],
[[input.y:9.12-14: <warning>warning:</warning> symbol FOO redeclared [<warning>-Wother</warning>]
%token FOO <warning>FOO</warning> FOO
<warning>^~~</warning>
9 | %token FOO <warning>FOO</warning> FOO
| <warning>^~~</warning>
input.y:9.16-18: <warning>warning:</warning> symbol FOO redeclared [<warning>-Wother</warning>]
%token FOO FOO <warning>FOO</warning>
<warning>^~~</warning>
9 | %token FOO FOO <warning>FOO</warning>
| <warning>^~~</warning>
input.y:10.8-10: <warning>warning:</warning> symbol FOO redeclared [<warning>-Wother</warning>]
%token <warning>FOO</warning> FOO FOO
<warning>^~~</warning>
10 | %token <warning>FOO</warning> FOO FOO
| <warning>^~~</warning>
input.y:10.13-15: <warning>warning:</warning> symbol FOO redeclared [<warning>-Wother</warning>]
%token FOO <warning>FOO</warning> FOO
<warning>^~~</warning>
10 | %token FOO <warning>FOO</warning> FOO
| <warning>^~~</warning>
input.y:10.18-20: <warning>warning:</warning> symbol FOO redeclared [<warning>-Wother</warning>]
%token FOO FOO <warning>FOO</warning>
<warning>^~~</warning>
10 | %token FOO FOO <warning>FOO</warning>
| <warning>^~~</warning>
]])
@@ -98,20 +98,20 @@ d
e:
]],
[[input.y:11.4-5: <warning>warning:</warning> empty rule without %empty [<warning>-Wempty-rule</warning>]
a: <warning>{}</warning>
<warning>^~</warning>
11 | a: <warning>{}</warning>
| <warning>^~</warning>
input.y:12.3-13.1: <warning>warning:</warning> empty rule without %empty [<warning>-Wempty-rule</warning>]
b:<warning>{</warning>
<warning>^</warning>
12 | b:<warning>{</warning>
| <warning>^</warning>
input.y:14.2: <warning>warning:</warning> empty rule without %empty [<warning>-Wempty-rule</warning>]
c<warning>:</warning>
<warning>^</warning>
14 | c<warning>:</warning>
| <warning>^</warning>
input.y:15.2: <warning>warning:</warning> empty rule without %empty [<warning>-Wempty-rule</warning>]
d
<warning>^</warning>
15 | d
| <warning>^</warning>
input.y:17.2: <warning>warning:</warning> empty rule without %empty [<warning>-Wempty-rule</warning>]
e<warning>:</warning>
<warning>^</warning>
17 | e<warning>:</warning>
| <warning>^</warning>
]])
@@ -135,29 +135,29 @@ g: { "฿¥$€₦" }
h: { 🐃 }
]],
[[input.y:11.4-17: <warning>warning:</warning> empty rule without %empty [<warning>-Wempty-rule</warning>]
a: <warning>{ }</warning>
<warning>^~~~~~~~~~~~~~</warning>
11 | a: <warning>{ }</warning>
| <warning>^~~~~~~~~~~~~~</warning>
input.y:12.4-17: <warning>warning:</warning> empty rule without %empty [<warning>-Wempty-rule</warning>]
b: <warning>{ }</warning>
<warning>^~~~~~~~~~~~~~</warning>
12 | b: <warning>{ }</warning>
| <warning>^~~~~~~~~~~~~~</warning>
input.y:13.4-17: <warning>warning:</warning> empty rule without %empty [<warning>-Wempty-rule</warning>]
c: <warning>{------------}</warning>
<warning>^~~~~~~~~~~~~~</warning>
13 | c: <warning>{------------}</warning>
| <warning>^~~~~~~~~~~~~~</warning>
input.y:14.4-17: <warning>warning:</warning> empty rule without %empty [<warning>-Wempty-rule</warning>]
d: <warning>{éééééééééééé}</warning>
<warning>^~~~~~~~~~~~~~</warning>
14 | d: <warning>{éééééééééééé}</warning>
| <warning>^~~~~~~~~~~~~~</warning>
input.y:15.4-17: <warning>warning:</warning> empty rule without %empty [<warning>-Wempty-rule</warning>]
e: <warning>{∇⃗×𝐸⃗ = -∂𝐵⃗/∂t}</warning>
<warning>^~~~~~~~~~~~~~</warning>
15 | e: <warning>{∇⃗×𝐸⃗ = -∂𝐵⃗/∂t}</warning>
| <warning>^~~~~~~~~~~~~~</warning>
input.y:16.4-17: <warning>warning:</warning> empty rule without %empty [<warning>-Wempty-rule</warning>]
f: <warning>{ 42 }</warning>
<warning>^~~~~~~~~~~~~~</warning>
16 | f: <warning>{ 42 }</warning>
| <warning>^~~~~~~~~~~~~~</warning>
input.y:17.4-17: <warning>warning:</warning> empty rule without %empty [<warning>-Wempty-rule</warning>]
g: <warning>{ "฿¥$€₦" }</warning>
<warning>^~~~~~~~~~~~~~</warning>
17 | g: <warning>{ "฿¥$€₦" }</warning>
| <warning>^~~~~~~~~~~~~~</warning>
input.y:18.4-17: <warning>warning:</warning> empty rule without %empty [<warning>-Wempty-rule</warning>]
h: <warning>{ 🐃 }</warning>
<warning>^~~~~~~~~~~~~~</warning>
18 | h: <warning>{ 🐃 }</warning>
| <warning>^~~~~~~~~~~~~~</warning>
]])