]> git.saurik.com Git - bison.git/commit - data/glr.c
Merge remote-tracking branch 'origin/maint'
authorAkim Demaille <akim@lrde.epita.fr>
Sun, 1 Apr 2012 10:56:55 +0000 (12:56 +0200)
committerAkim Demaille <akim@lrde.epita.fr>
Sun, 1 Apr 2012 11:14:34 +0000 (13:14 +0200)
commit3e75a2c92b12766add442d00a86d5ec1c67ce560
treef0eb32273995e1e53e243c2c3f15e65b1cf12e84
parent24d84dd26c24a33adf1ae4ba245c53901507e650
parent681dda24bab97297d43a09fb50f95110b790c3ce
Merge remote-tracking branch 'origin/maint'

* origin/maint:
  bump to 2012 in skeletons.
  build: remove ancient Autoconf tests.
  doc: c++: complete the location documentation.
  c++: locations: provide convenience constructors.
  c++: locations: remove useless "inline".
  glr: do not use locations when they are not requested
  c++: use nullptr for C++11.
  build: simplify and improve the compiler warnings for tests.
  gnulib: update.
  maint: formatting changes.
  NEWS: update.
  Java: Fix syntax error handling without error token.
  tests: beware of -pedantic on large #line numbers.
  tests: when using the C++ compiler, use its flags too.

Conflicts:
data/glr.c
data/glr.cc
data/lalr1.cc
data/location.cc
data/yacc.c
tests/Makefile.am
16 files changed:
NEWS
configure.ac
data/c++.m4
data/c.m4
data/glr.c
data/lalr1.cc
data/lalr1.java
data/location.cc
data/yacc.c
doc/bison.texinfo
src/system.h
tests/actions.at
tests/atlocal.in
tests/calc.at
tests/java.at
tests/regression.at