diff --git a/bootstrap/test/hocc/G.expected.txt b/bootstrap/test/hocc/G.expected.txt index b3ec8d2aa..1c7bee57d 100644 --- a/bootstrap/test/hocc/G.expected.txt +++ b/bootstrap/test/hocc/G.expected.txt @@ -118,6 +118,9 @@ IELR(1) States Ta : ShiftPrefix 11 prec p2 Gotos A : 12 + Conflict contributions + [Z ::= Tz · A B, {Ta}] + 20 : Reduce E ::= epsilon State 5 [5.0] Kernel [Z ::= Ty · A B, {Ta}] @@ -127,6 +130,9 @@ IELR(1) States Ta : ShiftPrefix 11 prec p2 Gotos A : 13 + Conflict contributions + [Z ::= Ty · A B, {Ta}] + 20 : Reduce E ::= epsilon State 6 [6.0] Kernel [S ::= Ta Z · Ta, {"⊥"}] @@ -171,6 +177,9 @@ IELR(1) States Gotos C : 18 D : 19 + Conflict contributions + [A ::= Ta · C D E, {Ta}] + 20 : Reduce E ::= epsilon State 12 [10.0] Kernel [Z ::= Tz A · B, {Ta, Tb}] @@ -232,6 +241,9 @@ IELR(1) States Ta : ShiftPrefix 17 prec p2 Gotos D : 24 + Conflict contributions + [A ::= Ta C · D E, {Ta}] + 20 : Reduce E ::= epsilon State 19 [16.0] Kernel [C ::= D ·, {Ta}] @@ -275,6 +287,9 @@ IELR(1) States Tc : Reduce E ::= epsilon prec p1 Gotos E : 27 + Conflict contributions + [A ::= Ta C D · E, {Ta}] + 20 : Reduce E ::= epsilon State 25 [20.1] Kernel [A ::= Ta C D · E, {Tb, Tc}] diff --git a/bootstrap/test/hocc/H.expected.txt b/bootstrap/test/hocc/H.expected.txt index aeabd6675..12a2cf039 100644 --- a/bootstrap/test/hocc/H.expected.txt +++ b/bootstrap/test/hocc/H.expected.txt @@ -132,6 +132,9 @@ IELR(1) States Tz1 : ShiftPrefix 12 Gotos Z : 13 + Conflict contributions + [Y ::= Ty0 · Z, {Ta}] + 24 : Reduce E ::= epsilon State 5 [5.0] Kernel [Y ::= Ty1 · Z, {Ta}] @@ -143,6 +146,9 @@ IELR(1) States Tz1 : ShiftPrefix 12 Gotos Z : 14 + Conflict contributions + [Y ::= Ty1 · Z, {Ta}] + 24 : Reduce E ::= epsilon State 6 [6.0] Kernel [S ::= Ta Y · Ta, {"⊥"}] @@ -189,6 +195,9 @@ IELR(1) States Ta : ShiftPrefix 19 prec p2 Gotos A : 20 + Conflict contributions + [Z ::= Tz0 · A B, {Ta}] + 24 : Reduce E ::= epsilon State 12 [10.0] Kernel [Z ::= Tz1 · A B, {Ta}] @@ -198,6 +207,9 @@ IELR(1) States Ta : ShiftPrefix 19 prec p2 Gotos A : 21 + Conflict contributions + [Z ::= Tz1 · A B, {Ta}] + 24 : Reduce E ::= epsilon State 13 [11.0] Kernel [Y ::= Ty0 Z ·, {Ta, Tb}] @@ -249,6 +261,9 @@ IELR(1) States Gotos C : 24 D : 25 + Conflict contributions + [A ::= Ta · C D E, {Ta}] + 24 : Reduce E ::= epsilon State 20 [16.0] Kernel [Z ::= Tz0 A · B, {Ta, Tb}] @@ -300,6 +315,9 @@ IELR(1) States Ta : ShiftPrefix 23 prec p2 Gotos D : 30 + Conflict contributions + [A ::= Ta C · D E, {Ta}] + 24 : Reduce E ::= epsilon State 25 [20.0] Kernel [C ::= D ·, {Ta}] @@ -343,6 +361,9 @@ IELR(1) States Tc : Reduce E ::= epsilon prec p1 Gotos E : 33 + Conflict contributions + [A ::= Ta C D · E, {Ta}] + 24 : Reduce E ::= epsilon State 31 [24.1] Kernel [A ::= Ta C D · E, {Tb, Tc}] diff --git a/bootstrap/test/hocc/IelrFig1.expected.txt b/bootstrap/test/hocc/IelrFig1.expected.txt index d0ac137de..eb18f772f 100644 --- a/bootstrap/test/hocc/IelrFig1.expected.txt +++ b/bootstrap/test/hocc/IelrFig1.expected.txt @@ -76,6 +76,9 @@ IELR(1) States [A ::= Ta · Ta, {Ta}] prec p Actions Ta : Reduce A ::= Ta prec p + Conflict contributions + [A ::= Ta ·, {Ta}] + 4 : Reduce A ::= Ta State 5 [5.0] Kernel [S ::= Ta A · Ta, {"⊥"}] prec p diff --git a/bootstrap/test/hocc/IelrFig1_rno.expected.txt b/bootstrap/test/hocc/IelrFig1_rno.expected.txt index 7260e6182..71da651d0 100644 --- a/bootstrap/test/hocc/IelrFig1_rno.expected.txt +++ b/bootstrap/test/hocc/IelrFig1_rno.expected.txt @@ -78,6 +78,9 @@ IELR(1) States Ta : CONFLICT ShiftPrefix 9 prec p CONFLICT Reduce A ::= Ta prec p + Conflict contributions + [A ::= Ta ·, {Ta}] + 4 : Reduce A ::= Ta State 5 [5.0] Kernel [S ::= Ta A · Ta, {"⊥"}] prec p diff --git a/bootstrap/test/hocc/IelrFig2.expected.txt b/bootstrap/test/hocc/IelrFig2.expected.txt index a2edf9018..3a07d5d54 100644 --- a/bootstrap/test/hocc/IelrFig2.expected.txt +++ b/bootstrap/test/hocc/IelrFig2.expected.txt @@ -108,6 +108,11 @@ IELR(1) States [C ::= Ta · Ta, {Tc}] prec p2 Actions Ta : ShiftPrefix 13 + Conflict contributions + [A ::= Ta · Ta, {Ta}] + 12 : Reduce A ::= Ta Ta + [B ::= Ta · Ta, {Tb}] + 12 : Reduce B ::= Ta Ta State 5 [5.0] Kernel [S ::= Ta A · Ta, {"⊥"}] @@ -130,6 +135,13 @@ IELR(1) States [C ::= Ta · Ta, {Ta}] prec p2 Actions Ta : ShiftPrefix 17 + Conflict contributions + [A ::= Ta · Ta, {Tb}] + 12 : Reduce A ::= Ta Ta + [B ::= Ta · Ta, {Ta}] + 12 : Reduce B ::= Ta Ta + [C ::= Ta · Ta, {Ta}] + 12 : Reduce C ::= Ta Ta State 9 [8.0] Kernel [S ::= Tb A · Tb, {"⊥"}] @@ -159,6 +171,11 @@ IELR(1) States Ta : Reduce A ::= Ta Ta Tb : Reduce B ::= Ta Ta prec p1 Tc : Reduce C ::= Ta Ta prec p2 + Conflict contributions + [A ::= Ta Ta ·, {Ta}] + 12 : Reduce A ::= Ta Ta + [B ::= Ta Ta ·, {Tb}] + 12 : Reduce B ::= Ta Ta State 14 [13.0] Kernel [S ::= Ta A Ta ·, {"⊥"}] @@ -182,6 +199,13 @@ IELR(1) States Actions Ta : Reduce B ::= Ta Ta prec p1 Tb : Reduce A ::= Ta Ta + Conflict contributions + [A ::= Ta Ta ·, {Tb}] + 12 : Reduce A ::= Ta Ta + [B ::= Ta Ta ·, {Ta}] + 12 : Reduce B ::= Ta Ta + [C ::= Ta Ta ·, {Ta}] + 12 : Reduce C ::= Ta Ta State 18 [16.0] Kernel [S ::= Tb A Tb ·, {"⊥"}] diff --git a/bootstrap/test/hocc/IelrFig2_rno.expected.txt b/bootstrap/test/hocc/IelrFig2_rno.expected.txt index df67bebf3..5fdc17f45 100644 --- a/bootstrap/test/hocc/IelrFig2_rno.expected.txt +++ b/bootstrap/test/hocc/IelrFig2_rno.expected.txt @@ -108,6 +108,11 @@ IELR(1) States [C ::= Ta · Ta, {Tc}] prec p2 Actions Ta : ShiftPrefix 13 + Conflict contributions + [A ::= Ta · Ta, {Ta}] + 12 : Reduce A ::= Ta Ta + [B ::= Ta · Ta, {Tb}] + 12 : Reduce B ::= Ta Ta State 5 [5.0] Kernel [S ::= Ta A · Ta, {"⊥"}] @@ -130,6 +135,13 @@ IELR(1) States [C ::= Ta · Ta, {Ta}] prec p2 Actions Ta : ShiftPrefix 17 + Conflict contributions + [A ::= Ta · Ta, {Tb}] + 12 : Reduce A ::= Ta Ta + [B ::= Ta · Ta, {Ta}] + 12 : Reduce B ::= Ta Ta + [C ::= Ta · Ta, {Ta}] + 12 : Reduce C ::= Ta Ta State 9 [8.0] Kernel [S ::= Tb A · Tb, {"⊥"}] @@ -159,6 +171,11 @@ IELR(1) States Ta : Reduce A ::= Ta Ta Tb : Reduce B ::= Ta Ta prec p1 Tc : Reduce C ::= Ta Ta prec p2 + Conflict contributions + [A ::= Ta Ta ·, {Ta}] + 12 : Reduce A ::= Ta Ta + [B ::= Ta Ta ·, {Tb}] + 12 : Reduce B ::= Ta Ta State 14 [13.0] Kernel [S ::= Ta A Ta ·, {"⊥"}] @@ -184,6 +201,13 @@ IELR(1) States CONFLICT Reduce B ::= Ta Ta prec p1 CONFLICT Reduce C ::= Ta Ta prec p2 Tb : Reduce A ::= Ta Ta + Conflict contributions + [A ::= Ta Ta ·, {Tb}] + 12 : Reduce A ::= Ta Ta + [B ::= Ta Ta ·, {Ta}] + 12 : Reduce B ::= Ta Ta + [C ::= Ta Ta ·, {Ta}] + 12 : Reduce C ::= Ta Ta State 18 [16.0] Kernel [S ::= Tb A Tb ·, {"⊥"}] diff --git a/bootstrap/test/hocc/IelrFig3.expected.txt b/bootstrap/test/hocc/IelrFig3.expected.txt index aaffd7758..2b7de45f6 100644 --- a/bootstrap/test/hocc/IelrFig3.expected.txt +++ b/bootstrap/test/hocc/IelrFig3.expected.txt @@ -106,6 +106,13 @@ IELR(1) States [C ::= Ta · Ta, {Ta}] prec p3 Actions Ta : ShiftPrefix 13 + Conflict contributions + [A ::= Ta · Ta, {Ta}] + 12 : Reduce A ::= Ta Ta + [B ::= Ta · Ta, {Ta}] + 12 : Reduce B ::= Ta Ta + [C ::= Ta · Ta, {Ta}] + 12 : Reduce C ::= Ta Ta State 5 [5.0] Kernel [S ::= Ta A · Ta, {"⊥"}] @@ -128,6 +135,11 @@ IELR(1) States [C ::= Ta · Ta, {Ta}] prec p3 Actions Ta : ShiftPrefix 17 + Conflict contributions + [B ::= Ta · Ta, {Ta}] + 12 : Reduce B ::= Ta Ta + [C ::= Ta · Ta, {Ta}] + 12 : Reduce C ::= Ta Ta State 9 [8.0] Kernel [S ::= Tb A · Tb, {"⊥"}] @@ -155,6 +167,13 @@ IELR(1) States [C ::= Ta Ta ·, {Ta}] prec p3 Actions Ta : Reduce A ::= Ta Ta prec p1 + Conflict contributions + [A ::= Ta Ta ·, {Ta}] + 12 : Reduce A ::= Ta Ta + [B ::= Ta Ta ·, {Ta}] + 12 : Reduce B ::= Ta Ta + [C ::= Ta Ta ·, {Ta}] + 12 : Reduce C ::= Ta Ta State 14 [13.0] Kernel [S ::= Ta A Ta ·, {"⊥"}] @@ -178,6 +197,11 @@ IELR(1) States Actions Ta : Reduce B ::= Ta Ta prec p2 Tb : Reduce A ::= Ta Ta prec p1 + Conflict contributions + [B ::= Ta Ta ·, {Ta}] + 12 : Reduce B ::= Ta Ta + [C ::= Ta Ta ·, {Ta}] + 12 : Reduce C ::= Ta Ta State 18 [16.0] Kernel [S ::= Tb A Tb ·, {"⊥"}] diff --git a/bootstrap/test/hocc/IelrFig3_rno.expected.txt b/bootstrap/test/hocc/IelrFig3_rno.expected.txt index a826f2745..52581e6fb 100644 --- a/bootstrap/test/hocc/IelrFig3_rno.expected.txt +++ b/bootstrap/test/hocc/IelrFig3_rno.expected.txt @@ -106,6 +106,13 @@ IELR(1) States [C ::= Ta · Ta, {Ta}] prec p3 Actions Ta : ShiftPrefix 12 + Conflict contributions + [A ::= Ta · Ta, {Ta}] + 12 : Reduce A ::= Ta Ta + [B ::= Ta · Ta, {Ta}] + 12 : Reduce B ::= Ta Ta + [C ::= Ta · Ta, {Ta}] + 12 : Reduce C ::= Ta Ta State 5 [5.0] Kernel [S ::= Ta A · Ta, {"⊥"}] @@ -152,6 +159,13 @@ CONFLICT Reduce A ::= Ta Ta prec p1 CONFLICT Reduce B ::= Ta Ta prec p2 CONFLICT Reduce C ::= Ta Ta prec p3 Tb : Reduce A ::= Ta Ta prec p1 + Conflict contributions + [A ::= Ta Ta ·, {Ta}] + 12 : Reduce A ::= Ta Ta + [B ::= Ta Ta ·, {Ta}] + 12 : Reduce B ::= Ta Ta + [C ::= Ta Ta ·, {Ta}] + 12 : Reduce C ::= Ta Ta State 13 [13.0] Kernel [S ::= Ta A Ta ·, {"⊥"}] diff --git a/bootstrap/test/hocc/IelrFig4_rno.expected.txt b/bootstrap/test/hocc/IelrFig4_rno.expected.txt index f53488ca9..cdced571f 100644 --- a/bootstrap/test/hocc/IelrFig4_rno.expected.txt +++ b/bootstrap/test/hocc/IelrFig4_rno.expected.txt @@ -92,6 +92,13 @@ IELR(1) States CONFLICT Reduce A ::= Ta CONFLICT Reduce B ::= Ta Tb : Reduce A ::= Ta + Conflict contributions + [A ::= Ta ·, {Ta}] + 4 : Reduce A ::= Ta + [A ::= Ta ·, {Tb}] + 4 : Reduce A ::= Ta + [B ::= Ta ·, {Ta}] + 4 : Reduce B ::= Ta State 5 [5.0] Kernel [Sn ::= Ta A · Ta, {"⊥"}] @@ -111,6 +118,11 @@ CONFLICT Reduce B ::= Ta Actions Ta : Reduce A ::= Ta Tb : Reduce B ::= Ta + Conflict contributions + [A ::= Ta ·, {Ta}] + 4 : Reduce A ::= Ta + [B ::= Ta ·, {Tb}] + 4 : Reduce B ::= Ta State 8 [7.0] Kernel [Sn ::= Tb A · Ta, {"⊥"}] diff --git a/bootstrap/test/hocc/IelrFig5.expected.txt b/bootstrap/test/hocc/IelrFig5.expected.txt index f959dbb08..508dc429c 100644 --- a/bootstrap/test/hocc/IelrFig5.expected.txt +++ b/bootstrap/test/hocc/IelrFig5.expected.txt @@ -104,6 +104,9 @@ IELR(1) States Gotos C : 10 D : 11 + Conflict contributions + [A ::= Ta · C D E, {Ta}] + 14 : Reduce E ::= epsilon State 5 [5.0] Kernel [S ::= Ta A · B Ta, {"⊥"}] @@ -158,6 +161,9 @@ IELR(1) States Ta : ShiftPrefix 9 prec p2 Gotos D : 16 + Conflict contributions + [A ::= Ta C · D E, {Ta}] + 14 : Reduce E ::= epsilon State 11 [10.0] Kernel [C ::= D ·, {Ta}] @@ -199,6 +205,9 @@ IELR(1) States Tc : Reduce E ::= epsilon prec p1 Gotos E : 21 + Conflict contributions + [A ::= Ta C D · E, {Ta}] + 14 : Reduce E ::= epsilon State 17 [15.0] Kernel [S ::= Ta A B Ta ·, {"⊥"}] diff --git a/bootstrap/test/hocc/IelrFig5_rno.expected.txt b/bootstrap/test/hocc/IelrFig5_rno.expected.txt index 4c51eb28a..76e15bf35 100644 --- a/bootstrap/test/hocc/IelrFig5_rno.expected.txt +++ b/bootstrap/test/hocc/IelrFig5_rno.expected.txt @@ -104,6 +104,9 @@ IELR(1) States Gotos C : 10 D : 11 + Conflict contributions + [A ::= Ta · C D E, {Ta}] + 14 : Reduce E ::= epsilon State 5 [5.0] Kernel [S ::= Ta A · B Ta, {"⊥"}] @@ -158,6 +161,9 @@ IELR(1) States Ta : ShiftPrefix 9 prec p2 Gotos D : 16 + Conflict contributions + [A ::= Ta C · D E, {Ta}] + 14 : Reduce E ::= epsilon State 11 [10.0] Kernel [C ::= D ·, {Ta}] @@ -201,6 +207,9 @@ CONFLICT Reduce E ::= epsilon prec p1 Tc : Reduce E ::= epsilon prec p1 Gotos E : 21 + Conflict contributions + [A ::= Ta C D · E, {Ta}] + 14 : Reduce E ::= epsilon State 17 [15.0] Kernel [S ::= Ta A B Ta ·, {"⊥"}] diff --git a/bootstrap/test/hocc/M_aielr1.expected.txt b/bootstrap/test/hocc/M_aielr1.expected.txt index a2b9ce317..93baf0e2a 100644 --- a/bootstrap/test/hocc/M_aielr1.expected.txt +++ b/bootstrap/test/hocc/M_aielr1.expected.txt @@ -150,6 +150,9 @@ IELR(1) States Ut : ShiftPrefix 16 Gotos Wn : 17 + Conflict contributions + [Yn ::= Tt · Wn, {Dt}] + 15 : Reduce Vn ::= epsilon State 6 [6.0] Kernel [Yn ::= Ut · Xn, {Dt, Et}] @@ -194,6 +197,9 @@ IELR(1) States Ut : ShiftPrefix 21 Gotos Wn : 17 + Conflict contributions + [Zn ::= Tt · Ut, {Dt}] + 15 : Reduce Zn ::= Tt Ut State 11 [10.0] Kernel [Xn ::= Bt Yn · Et, {At, Dt, Et, EOI}] @@ -233,6 +239,9 @@ IELR(1) States Dt : Reduce Vn ::= epsilon Gotos Vn : 24 + Conflict contributions + [Wn ::= Ut · Vn, {Dt}] + 15 : Reduce Vn ::= epsilon State 17 [16.0] Kernel [Yn ::= Tt Wn ·, {Dt, Et}] @@ -274,6 +283,9 @@ IELR(1) States Et : Reduce Vn ::= epsilon Gotos Vn : 24 + Conflict contributions + [Zn ::= Tt Ut ·, {Dt}] + 15 : Reduce Zn ::= Tt Ut State 22 [20.0] Kernel [Xn ::= Bt Yn Et ·, {At, Dt, Et, EOI}]