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

cex: display the rule numbers

Browse Source 
From

    Example: "if" expr "then" "if" expr "then" stmt • "else" stmt
    Shift derivation
      if_stmt
      ↳ "if" expr "then" stmt
                         ↳ if_stmt
                           ↳ "if" expr "then" stmt • "else" stmt
    Reduce derivation
      if_stmt
      ↳ "if" expr "then" stmt                        "else" stmt
                         ↳ if_stmt
                           ↳ "if" expr "then" stmt •

to

    Example: "if" expr "then" "if" expr "then" stmt • "else" stmt
    Shift derivation
      if_stmt
      ↳ 3: "if" expr "then" stmt
                            ↳ 2: if_stmt
                                 ↳ 4: "if" expr "then" stmt • "else" stmt
    Example: "if" expr "then" "if" expr "then" stmt • "else" stmt
    Reduce derivation
      if_stmt
      ↳ 4: "if" expr "then" stmt                              "else" stmt
                            ↳ 2: if_stmt
                                 ↳ 3: "if" expr "then" stmt •

* src/state-item.h, src/state-item.c (state_item_rule): New.
* src/derivation.h, src/derivation.c (struct derivation): Add a rule
member.
Adjust dependencies.
* src/counterexample.c, src/parse-simulation.c: Pass the rule to
derivation_new.
* src/derivation.c (fprintf_if): New.
(derivation_width, derivation_print_tree_impl): Take the rule number
into account.

* tests/conflicts.at, tests/counterexample.at, tests/diagnostics.at,
* tests/report.at: Adjust.

* doc/bison.texi: Adjust.
This commit is contained in:
Akim Demaille
2020-07-28 19:50:22 +02:00
parent 2becdace96
commit 3c36d871fa
13 changed files with 407 additions and 357 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
tests/conflicts.at
View File

@@ -867,12 +867,12 @@ State 5
Example: exp OP exp . OP exp
Shift derivation
exp
`-> exp OP exp
`-> exp . OP exp
`-> 1: exp OP exp
`-> 1: exp . OP exp
Reduce derivation
exp
`-> exp OP exp
`-> exp OP exp .
`-> 1: exp OP exp
`-> 1: exp OP exp .
]])
@@ -1215,12 +1215,12 @@ State 1
Example: '0' .
First reduce derivation
exp
`-> num
`-> '0' .
`-> 1: num
`-> 3: '0' .
Second reduce derivation
exp
`-> id
`-> '0' .
`-> 2: id
`-> 4: '0' .
@@ -1770,13 +1770,13 @@ State 4
First example: resolved_conflict . 'a' 'a'
Shift derivation
start
`-> resolved_conflict reported_conflicts 'a'
`-> . 'a'
`-> 1: resolved_conflict reported_conflicts 'a'
`-> 8: . 'a'
Second example: resolved_conflict . 'a'
Reduce derivation
start
`-> resolved_conflict reported_conflicts 'a'
`-> .
`-> 1: resolved_conflict reported_conflicts 'a'
`-> 10: .
shift/reduce conflict on token 'a':
10 reported_conflicts: . %empty
@@ -1784,13 +1784,13 @@ State 4
First example: resolved_conflict . 'a' 'a'
Shift derivation
start
`-> resolved_conflict reported_conflicts 'a'
`-> . 'a'
`-> 1: resolved_conflict reported_conflicts 'a'
`-> 9: . 'a'
Second example: resolved_conflict . 'a'
Reduce derivation
start
`-> resolved_conflict reported_conflicts 'a'
`-> .
`-> 1: resolved_conflict reported_conflicts 'a'
`-> 10: .
@@ -1809,10 +1809,10 @@ State 5
Example: 'a' .
First reduce derivation
reported_conflicts
`-> 'a' .
`-> 8: 'a' .
Second reduce derivation
reported_conflicts
`-> 'a' .
`-> 9: 'a' .
@@ -1999,12 +1999,12 @@ AT_CHECK([[cat input.output | sed -n '/^State 0$/,/^State 1$/p']], 0,
Example: . 'c'
First reduce derivation
start
`-> empty_c2 'c'
`-> .
`-> 7: empty_c2 'c'
`-> 12: .
Second reduce derivation
start
`-> empty_c3 'c'
`-> .
`-> 8: empty_c3 'c'
`-> 13: .