bison ./ChangeLog ./THANKS src/conflicts.c src/...

[Akim Demaille]

CVSROOT:        /cvsroot/bison
Module name:    bison
Changes by:     Akim Demaille <address@hidden>  01/11/12 04:31:40

Modified files:
        .              : ChangeLog THANKS 
        src            : conflicts.c conflicts.h main.c print.c 
        tests          : regression.at 

Log message:
        * src/conflicts.c (count_sr_conflicts, count_rr_conflicts): Return
        the result instead of using...
        (src_total, rrc_total, src_count, rrc_count): Remove.
        (any_conflicts): Remove.
        (print_conflicts): Split into...
        (conflicts_print, conflicts_output): New.
        * src/conflicts.h: Adjust.
        * src/main.c (main): Invoke both conflicts_output and conflicts_print.
        * src/print.c (print_grammar): Issue `n' between to rule outputs.
        * tests/regression.at (Conflicts): New.
        Reported by Tom Lane.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/bison/bison/ChangeLog.diff?tr1=1.244&tr2=1.245&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/bison/bison/THANKS.diff?tr1=1.15&tr2=1.16&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/bison/bison/src/conflicts.c.diff?tr1=1.24&tr2=1.25&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/bison/bison/src/conflicts.h.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/bison/bison/src/main.c.diff?tr1=1.37&tr2=1.38&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/bison/bison/src/print.c.diff?tr1=1.18&tr2=1.19&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/bison/bison/tests/regression.at.diff?tr1=1.7&tr2=1.8&r1=text&r2=text