Future/bison
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/bison.git synced 2026-03-15 07:13:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

report: put the dot after %empty in items

Browse Source 
When printing items, it is clearer to put the dot after %emtpy rather
than before:

     0 $accept: . unit "end of file"
     1 unit: . assignments exp
-    2 assignments: . %empty
+    2 assignments: %empty .
     3            | . assignments assignment

Also, use the Unicode characters if they are supported.

* src/gram.c (item_print): Put the dot after %emtpy.
* tests/conflicts.at, tests/reduce.at, tests/report.at: Adjust.
This commit is contained in:
Akim Demaille
2020-10-04 14:35:46 +02:00
parent 7cd195b30a
commit 36143b5ecc
4 changed files with 38 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
tests/conflicts.at
View File

@@ -1720,7 +1720,7 @@ State 0
0 $accept: . start $end
1 start: . resolved_conflict 'a' reported_conflicts 'a'
2 resolved_conflict: . 'a' unreachable1
3 | . %empty ['a']
3 | %empty . ['a']
$default reduce using rule 3 (resolved_conflict)
@@ -1756,7 +1756,7 @@ State 4
1 start: resolved_conflict 'a' . reported_conflicts 'a'
8 reported_conflicts: . 'a'
9 | . 'a'
10 | . %empty ['a']
10 | %empty . ['a']
'a' shift, and go to state 5
@@ -1765,7 +1765,7 @@ State 4
reported_conflicts go to state 6
shift/reduce conflict on token 'a':
10 reported_conflicts: . %empty
10 reported_conflicts: %empty .
8 reported_conflicts: . 'a'
First example: resolved_conflict . 'a' 'a'
Shift derivation
@@ -1779,7 +1779,7 @@ State 4
`-> 10: %empty .
shift/reduce conflict on token 'a':
10 reported_conflicts: . %empty
10 reported_conflicts: %empty .
9 reported_conflicts: . 'a'
First example: resolved_conflict . 'a' 'a'
Shift derivation
@@ -1891,11 +1891,11 @@ AT_CHECK([[cat input.output | sed -n '/^State 0$/,/^State 1$/p']], 0,
6 | . empty_c1 'c'
7 | . empty_c2 'c'
8 | . empty_c3 'c'
9 empty_a: . %empty ['a']
10 empty_b: . %empty []
11 empty_c1: . %empty []
12 empty_c2: . %empty []
13 empty_c3: . %empty ['c']
9 empty_a: %empty . ['a']
10 empty_b: %empty . []
11 empty_c1: %empty . []
12 empty_c2: %empty . []
13 empty_c3: %empty . ['c']
'b' shift, and go to state 1
@@ -1969,11 +1969,11 @@ AT_CHECK([[cat input.output | sed -n '/^State 0$/,/^State 1$/p']], 0,
6 | . empty_c1 'c'
7 | . empty_c2 'c'
8 | . empty_c3 'c'
9 empty_a: . %empty []
10 empty_b: . %empty []
11 empty_c1: . %empty []
12 empty_c2: . %empty ['c']
13 empty_c3: . %empty ['c']
9 empty_a: %empty . []
10 empty_b: %empty . []
11 empty_c1: %empty . []
12 empty_c2: %empty . ['c']
13 empty_c3: %empty . ['c']
'a' error (nonassociative)
'b' error (nonassociative)
@@ -1994,8 +1994,8 @@ AT_CHECK([[cat input.output | sed -n '/^State 0$/,/^State 1$/p']], 0,
Conflict between rule 11 and token 'c' resolved as an error (%nonassoc 'c').
reduce/reduce conflict on token 'c':
12 empty_c2: . %empty
13 empty_c3: . %empty
12 empty_c2: %empty .
13 empty_c3: %empty .
Example: . 'c'
First reduce derivation
start