]> git.saurik.com Git - bison.git/commit
Merge remote-tracking branch 'origin/maint'
authorAkim Demaille <akim@lrde.epita.fr>
Tue, 19 Jun 2012 15:35:53 +0000 (17:35 +0200)
committerAkim Demaille <akim@lrde.epita.fr>
Tue, 19 Jun 2012 16:17:09 +0000 (18:17 +0200)
commite436fa677c748f52929996590d3e46b5f984d6dc
tree29942406ffe3b3b71203ea170f1bcac51d792e94
parent22539284f3220db77eae57f1c06846753c20de43
parente29f0771d7a7a569f830bfe75216e1e0db3362e4
Merge remote-tracking branch 'origin/maint'

* origin/maint:
  maint: formatting changes.
  tests: support api.prefix.
  tests: pacify font-lock-mode.
  tests: remove test covered elsewhere.
  tests: factor the declaration/definition of yyerror and yylex.
  regen.
  tests: portability issues.
  tests: call the parser from another compilation unit.
  glr.c, yacc.c: declare yydebug in the header.
  skeletons: use header guards.
  tests: improve AT_FULL_COMPILE.
  tests: reorder.
  tests: strengthen the test on generated headers inclusion
  yacc.c: instead of duplicating y.tab.h inside y.tac.c, include it.
  yacc.c: factor.

Conflicts:
NEWS
data/glr.c
data/yacc.c
src/parse-gram.c
src/parse-gram.h
tests/conflicts.at
tests/regression.at
14 files changed:
NEWS
data/c.m4
data/glr.c
data/glr.cc
data/yacc.c
tests/actions.at
tests/calc.at
tests/conflicts.at
tests/glr-regression.at
tests/input.at
tests/local.at
tests/named-refs.at
tests/regression.at
tests/torture.at