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

[Akim Demaille]

CVSROOT:        /cvsroot/bison
Module name:    bison
Branch:         bison-1_29-branch
Changes by:     Akim Demaille <address@hidden>  01/11/12 04:15:25

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?only_with_tag=bison-1_29-branch&tr1=1.173.2.96&tr2=1.173.2.97&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/bison/bison/THANKS.diff?only_with_tag=bison-1_29-branch&tr1=1.10.2.9&tr2=1.10.2.10&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/bison/bison/src/conflicts.c.diff?only_with_tag=bison-1_29-branch&tr1=1.22.2.3&tr2=1.22.2.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/bison/bison/src/conflicts.h.diff?only_with_tag=bison-1_29-branch&tr1=1.3.2.2&tr2=1.3.2.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/bison/bison/src/main.c.diff?only_with_tag=bison-1_29-branch&tr1=1.30.2.4&tr2=1.30.2.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/bison/bison/src/print.c.diff?only_with_tag=bison-1_29-branch&tr1=1.17.2.3&tr2=1.17.2.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/bison/bison/tests/regression.at.diff?only_with_tag=bison-1_29-branch&tr1=1.1.2.9&tr2=1.1.2.10&r1=text&r2=text