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
This commit is contained in:
Akim Demaille
2012-11-06 18:00:33 +01:00
20 changed files with 360 additions and 234 deletions

View File

@@ -291,7 +291,7 @@ splice (\\[ \f\t\v]*\n)*
}
. {
complain_at (*loc, _("invalid character: %s"), quote (yytext));
complain_at (*loc, _("invalid character: %s"), quote_mem (yytext, yyleng));
}
<<EOF>> {
@@ -375,7 +375,7 @@ splice (\\[ \f\t\v]*\n)*
}
. {
complain_at (*loc, _("invalid character in bracketed name: %s"),
quote (yytext));
quote_mem (yytext, yyleng));
}
<<EOF>> {
BEGIN bracketed_id_context_state;