X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/aa08666d72d132462e8d53d2d23c95a3bcfa403d..34f98f46ee16dd3719d19e002dc27b2665a2514f:/data/glr.cc diff --git a/data/glr.cc b/data/glr.cc index adb5b34e..de1f543e 100644 --- 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])[); } ]]) @@ -211,10 +214,9 @@ m4_defn([b4_parse_param])))], m4_include(b4_pkgdatadir/[glr.c]) 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. */ @@ -233,17 +235,18 @@ namespace ]b4_namespace[ class location; } -/* Copy the first part of user declarations. */ -]b4_pre_prologue[ +]m4_ifdef([b4_start_header], +[[/* Copy the %start-header blocks. */ +]b4_start_header])[]dnl -]/* Line __line__ of glr.cc. */ -b4_syncline([@oline@], [@ofile@])[ +[/* Line __line__ of glr.cc. */ +]b4_syncline([@oline@], [@ofile@])[ #include "location.hh" /* 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. */ @@ -259,15 +262,6 @@ b4_syncline([@oline@], [@ofile@])[ # define YYTOKEN_TABLE ]b4_token_table[ #endif -#if 0 -/* Copy the second part of user declarations. */ -]b4_post_prologue[ - -]/* Line __line__ of glr.cc. */ - -b4_syncline([@oline@], [@ofile@])[ -#endif - /* YYLLOC_DEFAULT -- Set CURRENT to span from RHS[1] to RHS[N]. If N is 0, then set CURRENT to the empty location which ends the previous symbol: RHS[0] (always defined). */ @@ -392,4 +386,8 @@ m4_ifset([b4_global_tokens_and_yystype], } -#endif /* ! defined PARSER_HEADER_H */] +]m4_ifdef([b4_end_header], +[[/* Copy the %end-header blocks. */ +]b4_end_header])[]dnl + +[#endif /* ! defined PARSER_HEADER_H */]