]> git.saurik.com Git - bison.git/commit
Merge branch 'branch-2.6' into maint
authorAkim Demaille <akim@lrde.epita.fr>
Tue, 6 Nov 2012 17:00:33 +0000 (18:00 +0100)
committerAkim Demaille <akim@lrde.epita.fr>
Tue, 6 Nov 2012 17:12:05 +0000 (18:12 +0100)
commit049016237e8ad3666609295234ed550e66cc185c
tree4f6c711ef5b9eabb651d7676d023702cb00a5c50
parent71cb558dfe0f9c80e697308a5084de3b9926ee9c
parent3154ff8ef666b601181b5a544c8187de0e836c52
Merge branch 'branch-2.6' into maint

* origin/branch-2.6: (24 commits)
  tests: calc: modernize the use of locations
  tests: remove useless location initializations
  lalr1.cc: always initialize yylval.
  tests: check that C and C++ objects can be linked together.
  yacc.c: also disable -Wuninitialized.
  glr.cc, yacc.c: initialize yylloc properly
  yacc.c, glr.c: a better YY_LOCATION_PRINT
  yacc.c: simplify initialization
  doc: formatting changes
  c++: fix position operator signatures
  tests: remove useless location initialization.
  tests: fix locations in C
  tests: handle %parse-param in the generated yyerror
  tests: simplifications
  grammars: fix display of nul character in error message
  tests: sort
  tests: cosmetic changes
  comment changes
  autoconf: update
  gnulib: update
  ...

Conflicts:
NEWS
gnulib
tests/named-refs.at
tests/regression.at
12 files changed:
NEWS
THANKS
data/glr.cc
data/lalr1.cc
gnulib
tests/calc.at
tests/glr-regression.at
tests/headers.at
tests/input.at
tests/local.at
tests/named-refs.at
tests/regression.at