Future/bison
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/bison.git synced 2026-03-13 22:33:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/maint'

Browse Source 
* 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
This commit is contained in:
Akim Demaille
2012-04-01 12:56:55 +02:00
parent 24d84dd26c 681dda24ba
commit 3e75a2c92b
19 changed files with 407 additions and 229 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
data/lalr1.cc
View File

@@ -157,6 +157,8 @@ dnl FIXME: This is wrong, we want computed header guards.
b4_variant_define
b4_namespace_close])[
]b4_null_define[
/* Enabling traces. */
#ifndef YYDEBUG
# define YYDEBUG ]b4_parse_trace_if([1], [0])[
@@ -1056,7 +1058,7 @@ b4_error_verbose_if([state_type yystate, int yytoken],
}
}
char const* yyformat = 0;
char const* yyformat = YY_NULL;
switch (yycount)
{
#define YYCASE_(N, S) \