git.saurik.com Git - bison.git/commit

]> git.saurik.com Git - bison.git/commit

author	Akim Demaille <akim@lrde.epita.fr>
	Thu, 28 Jun 2012 13:29:18 +0000 (15:29 +0200)
committer	Akim Demaille <akim@lrde.epita.fr>
	Thu, 28 Jun 2012 13:42:00 +0000 (15:42 +0200)
commit	7aaaad6c6dc0fae412d608dcf20a3977d8902cd1
tree	365f5716891ed280df0093ca46c848556922e9c1	tree \| snapshot
parent	22b081deb7ab1d0ec7a279e5213fa7fdc2c85207	commit \| diff
parent	087dcd78685097983821e5d540f9ff3385931833	commit \| diff

Merge remote-tracking branch 'origin/maint'

* origin/maint:
  tests: use the generalized default yylex.
  tests: AT_YYERROR_DEFINE: prepare for list of ints.
  skeletons: no longer define YYLSP_NEEDED.
  c++: do not export YYTOKEN_TABLE and YYERROR_VERBOSE.

Conflicts:
data/c.m4
data/glr.cc
data/lalr1.cc
doc/bison.texi
tests/regression.at

12 files changed:

NEWS	diff1 \|	diff2 \|	blob \| history
data/bison.m4	diff1 \|	diff2 \|	blob \| history
data/c.m4	diff1 \|	diff2 \|	blob \| history
data/glr.c	diff1 \|	diff2 \|	blob \| history
data/glr.cc	diff1 \|	diff2 \|	blob \| history
data/lalr1.cc	diff1 \|	diff2 \|	blob \| history
data/yacc.c	diff1 \|	diff2 \|	blob \| history
src/output.c	diff1 \|	diff2 \|	blob \| history
tests/actions.at	diff1 \|	diff2 \|	blob \| history
tests/conflicts.at	diff1 \|	diff2 \|	blob \| history
tests/local.at	diff1 \|	diff2 \|	blob \| history
tests/regression.at	diff1 \|	diff2 \|	blob \| history

bison

RSS Atom

NEWS	diff1 \|	diff2 \|	blob \| history
data/bison.m4	diff1 \|	diff2 \|	blob \| history
data/c.m4	diff1 \|	diff2 \|	blob \| history
data/glr.c	diff1 \|	diff2 \|	blob \| history
data/glr.cc	diff1 \|	diff2 \|	blob \| history
data/lalr1.cc	diff1 \|	diff2 \|	blob \| history
data/yacc.c	diff1 \|	diff2 \|	blob \| history
src/output.c	diff1 \|	diff2 \|	blob \| history
tests/actions.at	diff1 \|	diff2 \|	blob \| history
tests/conflicts.at	diff1 \|	diff2 \|	blob \| history
tests/local.at	diff1 \|	diff2 \|	blob \| history
tests/regression.at	diff1 \|	diff2 \|	blob \| history