]> git.saurik.com Git - bison.git/commit
Merge remote-tracking branch 'origin/maint'
authorAkim Demaille <akim@lrde.epita.fr>
Mon, 26 Nov 2012 08:14:51 +0000 (09:14 +0100)
committerAkim Demaille <akim@lrde.epita.fr>
Mon, 26 Nov 2012 08:41:35 +0000 (09:41 +0100)
commitc6b1772473d0a26faa22464df98718d0d0ae2e2e
tree40644d5a7d6bb0be6f47e21821d88d6bc1dd10b1
parent06ec0105b12cdfa2994283e345154e6720354808
parentc6bf97ccb45672a004ef376b9f3e578d2f558d5f
Merge remote-tracking branch 'origin/maint'

* origin/maint:
  yacc.c: always initialize yylloc
  scanner: issue a single error for groups of invalid characters
  tests: formatting changes
  doc: one of the fixes for an ambiguous grammar was ambiguous too
  doc: fix the dangling else with precedence directives
  doc: prefer "token" to TOKEN
  doc: formatting changes
  scanner: use explicit "ignore" statements

Conflicts:
src/scan-gram.l
NEWS
THANKS
data/yacc.c
doc/bison.texi
src/scan-gram.l
tests/actions.at
tests/input.at
tests/named-refs.at