bison/src conflicts.c

Paul Eggert <[email protected]> Fri, 18 Apr 2003 01:07:08 -0400

Newsgroups	gmane.comp.parsers.bison.cvs
Message-ID	<[email protected]>

CVSROOT:	/cvsroot/bison
Module name:	bison
Changes by:	Paul Eggert <[email protected]>	03/04/18 01:07:08

Modified files:
	src            : conflicts.c 

Log message:
	(set_conflicts): Resolve all conflicts, not just
	the first one.  This change is from Paul Hilfinger, and it fixes
	regression reported by Werner Lemberg in
	<http://mail.gnu.org/archive/html/bug-bison/2003-04/msg00026.html>.
	
	(resolve_sr_conflict): Don't invoke state_errs_set
	unless one or more tokens have been explicitly made errors.
	Otherwise, the above change causes Bison to abort.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/bison/bison/src/conflicts.c.diff?tr1=1.103&tr2=1.104&r1=text&r2=text