bison ./ChangeLog src/conflicts.c

[Akim Demaille]

CVSROOT:        /cvsroot/bison
Module name:    bison
Changes by:     Akim Demaille <address@hidden>  01/12/17 12:32:08

Modified files:
        .              : ChangeLog 
        src            : conflicts.c 

Log message:
        * src/conflicts.c (flush_shift): Also adjust lookaheadset.
        (flush_reduce): New.
        (resolve_sr_conflict): Adjust.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/bison/bison/ChangeLog.diff?tr1=1.425&tr2=1.426&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/bison/bison/src/conflicts.c.diff?tr1=1.53&tr2=1.54&r1=text&r2=text