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

Merge remote-tracking branch 'origin/maint'

Browse Source 
* origin/maint:
  tests: close files in glr-regression
  xml: match DOT output and xml2dot.xsl processing
  xml: factor xslt space template
  graph: fix a memory leak
  xml: documentation
  output: capitalize State
This commit is contained in:
Akim Demaille
2012-11-13 10:59:55 +01:00
parent 2c08dc504c 05c93b7d84
commit 06ec0105b1
16 changed files with 654 additions and 413 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
tests/conflicts.at
View File

@@ -574,7 +574,7 @@ exp (6)
on left: 1 2, on right: 0 1
state 0
State 0
0 $accept: . exp $end
1 exp: . exp OP exp
@@ -585,14 +585,14 @@ state 0
exp go to state 2
state 1
State 1
2 exp: NUM .
$default reduce using rule 2 (exp)
state 2
State 2
0 $accept: exp . $end
1 exp: exp . OP exp
@@ -601,14 +601,14 @@ state 2
OP shift, and go to state 4
state 3
State 3
0 $accept: exp $end .
$default accept
state 4
State 4
1 exp: . exp OP exp
1 | exp OP . exp
@@ -619,7 +619,7 @@ state 4
exp go to state 5
state 5
State 5
1 exp: exp . OP exp
1 | exp OP exp . [$end, OP]
@@ -677,7 +677,7 @@ exp (6)
on left: 1 2, on right: 0 1
state 0
State 0
0 $accept: . exp $end
1 exp: . exp OP exp
@@ -688,14 +688,14 @@ state 0
exp go to state 2
state 1
State 1
2 exp: NUM .
$default reduce using rule 2 (exp)
state 2
State 2
0 $accept: exp . $end
1 exp: exp . OP exp
@@ -704,14 +704,14 @@ state 2
OP shift, and go to state 4
state 3
State 3
0 $accept: exp $end .
$default accept
state 4
State 4
1 exp: . exp OP exp
1 | exp OP . exp
@@ -722,7 +722,7 @@ state 4
exp go to state 5
state 5
State 5
1 exp: exp . OP exp
1 | exp OP exp . [$end, OP]
@@ -873,7 +873,7 @@ id (7)
on left: 4, on right: 2
state 0
State 0
0 $accept: . exp $end
1 exp: . num
@@ -888,7 +888,7 @@ state 0
id go to state 4
state 1
State 1
3 num: '0' . [$end]
4 id: '0' . [$end]
@@ -898,28 +898,28 @@ state 1
$default reduce using rule 3 (num)
state 2
State 2
0 $accept: exp . $end
$end shift, and go to state 5
state 3
State 3
1 exp: num .
$default reduce using rule 1 (exp)
state 4
State 4
2 exp: id .
$default reduce using rule 2 (exp)
state 5
State 5
0 $accept: exp $end .
@@ -1218,7 +1218,7 @@ reported_conflicts (9)
on left: 8 9 10, on right: 1
state 0
State 0
0 $accept: . start $end
1 start: . resolved_conflict 'a' reported_conflicts 'a'
@@ -1233,28 +1233,28 @@ state 0
Conflict between rule 3 and token 'a' resolved as reduce (%left 'a').
state 1
State 1
0 $accept: start . $end
$end shift, and go to state 3
state 2
State 2
1 start: resolved_conflict . 'a' reported_conflicts 'a'
'a' shift, and go to state 4
state 3
State 3
0 $accept: start $end .
$default accept
state 4
State 4
1 start: resolved_conflict 'a' . reported_conflicts 'a'
8 reported_conflicts: . 'a'
@@ -1268,7 +1268,7 @@ state 4
reported_conflicts go to state 6
state 5
State 5
8 reported_conflicts: 'a' . ['a']
9 | 'a' . ['a']
@@ -1278,14 +1278,14 @@ state 5
$default reduce using rule 8 (reported_conflicts)
state 6
State 6
1 start: resolved_conflict 'a' reported_conflicts . 'a'
'a' shift, and go to state 7
state 7
State 7
1 start: resolved_conflict 'a' reported_conflicts 'a' .
@@ -1340,8 +1340,8 @@ empty_c2: %prec 'c' ;
empty_c3: %prec 'd' ;
]])
AT_BISON_CHECK([[--report=all -o input.c input.y]], 0, [], [ignore])
AT_CHECK([[cat input.output | sed -n '/^state 0$/,/^state 1$/p']], 0,
[[state 0
AT_CHECK([[cat input.output | sed -n '/^State 0$/,/^State 1$/p']], 0,
[[State 0
0 $accept: . start $end
1 start: . 'a'
@@ -1377,7 +1377,7 @@ AT_CHECK([[cat input.output | sed -n '/^state 0$/,/^state 1$/p']], 0,
Conflict between rule 13 and token 'c' resolved as reduce ('c' < 'd').
state 1
State 1
]])
AT_CLEANUP
@@ -1416,8 +1416,8 @@ empty_c3: %prec 'c' ;
]])
AT_BISON_CHECK([[--report=all -o input.c input.y]], 0, [], [ignore])
AT_CHECK([[cat input.output | sed -n '/^state 0$/,/^state 1$/p']], 0,
[[state 0
AT_CHECK([[cat input.output | sed -n '/^State 0$/,/^State 1$/p']], 0,
[[State 0
0 $accept: . start $end
1 start: . 'a'
@@ -1453,7 +1453,7 @@ 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').
state 1
State 1
]])
AT_CLEANUP