bison ./ChangeLog src/conflicts.c src/lalr.c sr...

[Akim Demaille]

CVSROOT:        /cvsroot/bison
Module name:    bison
Changes by:     Akim Demaille <address@hidden>  02/06/15 14:24:08

Modified files:
        .              : ChangeLog 
        src            : conflicts.c lalr.c lalr.h state.h 

Log message:
        * src/conflicts.c (log_resolution): Accept the rule involved in
        the sr conflicts instead of the lookahead number that points to
        that rule.
        (flush_reduce): Accept the current lookahead vector as argument,
        instead of the index in LA.
        (resolve_sr_conflict): Accept the current number of lookahead
        bitset to consider for the STATE, instead of the index in LA.
        (set_conflicts): Adjust.
        * src/lalr.c, src/lalr.h, src/state.h: Comment changes.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/bison/bison/ChangeLog.diff?tr1=1.725&tr2=1.726&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/bison/bison/src/conflicts.c.diff?tr1=1.80&tr2=1.81&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/bison/bison/src/lalr.c.diff?tr1=1.69&tr2=1.70&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/bison/bison/src/lalr.h.diff?tr1=1.17&tr2=1.18&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/bison/bison/src/state.h.diff?tr1=1.27&tr2=1.28&r1=text&r2=text