style: variant: remove empty line

[bison.git] / data / glr.cc

diff --git a/data/glr.cc b/data/glr.cc
index 741ea71bae28b20a7cf95a38f2d7c66dd2f6fdde..e57308bd82514cbebe68a6457acf4fd7b0d6bb5b 100644 (file)
--- a/data/glr.cc
+++ b/data/glr.cc
@@ -1,6 +1,6 @@
 # C++ GLR skeleton for Bison
 
 # C++ GLR skeleton for Bison
 

-# Copyright (C) 2002-2012 Free Software Foundation, Inc.
+# Copyright (C) 2002-2013 Free Software Foundation, Inc.

 
 # 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


@@ -112,10 +112,28 @@ m4_defn([b4_initial_action])]))])[
     [[const char* msg], [msg]])])
 
 
     [[const char* msg], [msg]])])
 
 

+#undef yynerrs
+#undef yychar
+#undef yylval]b4_locations_if([
+#undef yylloc])
+
+m4_if(b4_prefix, [yy], [],
+[[/* Substitute the variable and function names.  */
+#define yyparse ]b4_prefix[parse
+#define yylex   ]b4_prefix[lex
+#define yyerror ]b4_prefix[error
+#define yydebug ]b4_prefix[debug
+]]b4_pure_if([], [[
+#define yylval  ]b4_prefix[lval
+#define yychar  ]b4_prefix[char
+#define yynerrs ]b4_prefix[nerrs]b4_locations_if([[
+#define yylloc  ]b4_prefix[lloc]])]))
+

 # Hijack the epilogue to define implementations (yyerror, parser member
 # functions etc.).
 m4_append([b4_epilogue],
 [b4_syncline([@oline@], [@ofile@])[
 # Hijack the epilogue to define implementations (yyerror, parser member
 # functions etc.).
 m4_append([b4_epilogue],
 [b4_syncline([@oline@], [@ofile@])[

+

 /*------------------.
 | Report an error.  |
 `------------------*/
 /*------------------.
 | Report an error.  |
 `------------------*/


@@ -169,12 +187,7 @@ m4_pushdef([b4_parse_param], m4_defn([b4_parse_param_orig]))dnl
     std::ostream& yyoutput = debug_stream ();
     std::ostream& yyo = yyoutput;
     YYUSE (yyo);
     std::ostream& yyoutput = debug_stream ();
     std::ostream& yyo = yyoutput;
     YYUSE (yyo);

-    switch (yytype)
-      {
-]b4_symbol_foreach([b4_symbol_printer])dnl
-[        default:
-          break;
-      }
+    ]b4_symbol_actions([printer])[

   }
 
 
   }
 
 


@@ -290,7 +303,7 @@ b4_location_define])])[
                                    const semantic_type* yyvaluep]b4_locations_if([[,
                                    const location_type* yylocationp]])[);
   private:
                                    const semantic_type* yyvaluep]b4_locations_if([[,
                                    const location_type* yylocationp]])[);
   private:

-    /* Debugging.  */
+    // Debugging.

     std::ostream* yycdebug_;
 #endif
 
     std::ostream* yycdebug_;
 #endif
 


@@ -314,13 +327,11 @@ b4_percent_define_flag_if([[global_tokens_and_yystype]],
 ])
 
 b4_defines_if(
 ])
 
 b4_defines_if(

-[m4_changecom()dnl
-m4_divert_push(0)dnl
-@output(b4_spec_defines_file@)@
+[b4_output_begin([b4_spec_defines_file])

 b4_copyright([Skeleton interface for Bison GLR parsers in C++],
 b4_copyright([Skeleton interface for Bison GLR parsers in C++],

-             [2002-2012])[
+             [2002-2013])[

 
 

-/* C++ GLR parser skeleton written by Akim Demaille.  */
+// C++ GLR parser skeleton written by Akim Demaille.

 
 ]b4_cpp_guard_open([b4_spec_defines_file])[
 ]b4_shared_declarations[
 
 ]b4_cpp_guard_open([b4_spec_defines_file])[
 ]b4_shared_declarations[