* src/flex-scanner.h: For the sake of Flex 2.5.4, don't #define yyleng

[bison.git] / data / glr.cc

diff --git a/data/glr.cc b/data/glr.cc
index 4507c7787a372f2fc901883220c3922a16d028f3..d07b5a48b87c4e00ce7c44a2d65ae3de68e51829 100644 (file)
--- a/data/glr.cc
+++ b/data/glr.cc
@@ -46,10 +46,13 @@ m4_divert(-1)                                                       -*- C -*-
 #   user must initialize the first positions (in particular the
 #   filename member).
 
-
 # We require a pure interface using locations.
-m4_define([b4_location_flag], [1])
-m4_define([b4_pure],          [1])
+m4_define([b4_locations_flag], [1])
+m4_define([b4_pure_flag],      [1])
+
+# The header is mandatory.
+b4_defines_if([],
+              [m4_fatal(b4_skeleton[: using %defines is mandatory])])
 
 m4_include(b4_pkgdatadir/[c++.m4])
 m4_include(b4_pkgdatadir/[location.cc])
@@ -80,7 +83,7 @@ m4_define([b4_yy_symbol_print_generate],
     b4_parse_param)[
 {
 ]b4_parse_param_use[]dnl
-[  yyparser.yy_symbol_print_ (yytype, yyvaluep]b4_location_if([, yylocationp])[);
+[  yyparser.yy_symbol_print_ (yytype, yyvaluep]b4_locations_if([, yylocationp])[);
 }
 ]])
 
@@ -213,8 +216,8 @@ m4_popdef([b4_parse_param])
 
 
 @output @output_header_name@
-b4_copyright([C++ Skeleton parser for GLALR(1) parsing with Bison],
-            [2002, 2003, 2004, 2005, 2006])[
+b4_copyright([Skeleton interface for Bison GLR parsers in C++],
+  [2002, 2003, 2004, 2005, 2006])[
 
 /* C++ GLR parser skeleton written by Akim Demaille.  */
 
@@ -243,7 +246,7 @@ b4_syncline([@oline@], [@ofile@])[
 
 /* Enabling traces.  */
 #ifndef YYDEBUG
-# define YYDEBUG ]b4_debug[
+# define YYDEBUG ]b4_debug_flag[
 #endif
 
 /* Enabling verbose error messages.  */
@@ -251,7 +254,7 @@ b4_syncline([@oline@], [@ofile@])[
 # undef YYERROR_VERBOSE
 # define YYERROR_VERBOSE 1
 #else
-# define YYERROR_VERBOSE ]b4_error_verbose[
+# define YYERROR_VERBOSE ]b4_error_verbose_flag[
 #endif
 
 /* Enabling the token table.  */