c++: display locations as C does

[bison.git] / data / yacc.c

diff --git a/data/yacc.c b/data/yacc.c
index 9b227aea3012ecf60eb3d1172abbd2e17e10a765..ba72c24ad21fbb6e2867b1f153a29c2b0db0f639 100644 (file)
--- a/data/yacc.c
+++ b/data/yacc.c
@@ -1,11 +1,11 @@
                                                              -*- C -*-
 # Yacc compatible skeleton for Bison
 
                                                              -*- C -*-
 # Yacc compatible skeleton for Bison
 

-# Copyright (C) 1984, 1989-1990, 2000-2012 Free Software Foundation,
+# Copyright (C) 1984, 1989-1990, 2000-2013 Free Software Foundation,

 # Inc.
 
 m4_pushdef([b4_copyright_years],
 # Inc.
 
 m4_pushdef([b4_copyright_years],

-           [1984, 1989-1990, 2000-2012])
+           [1984, 1989-1990, 2000-2013])

 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by


@@ -346,11 +346,12 @@ m4_if(b4_api_prefix, [yy], [],
 #define yypstate        ]b4_prefix[pstate]])[
 #define yylex           ]b4_prefix[lex
 #define yyerror         ]b4_prefix[error
 #define yypstate        ]b4_prefix[pstate]])[
 #define yylex           ]b4_prefix[lex
 #define yyerror         ]b4_prefix[error

-#define yylval          ]b4_prefix[lval
-#define yychar          ]b4_prefix[char

 #define yydebug         ]b4_prefix[debug
 #define yydebug         ]b4_prefix[debug

-#define yynerrs         ]b4_prefix[nerrs]b4_locations_if([[
-#define yylloc          ]b4_prefix[lloc]])])[
+#define yynerrs         ]b4_prefix[nerrs
+]]b4_pure_if([], [[
+#define yylval          ]b4_prefix[lval
+#define yychar          ]b4_prefix[char]b4_locations_if([[
+#define yylloc          ]b4_prefix[lloc]])]))[

 
 /* Copy the first part of user declarations.  */
 ]b4_user_pre_prologue[
 
 /* Copy the first part of user declarations.  */
 ]b4_user_pre_prologue[