X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/5f108727a13ff887f889948b2484724f14c125e9..2bd435c36c0dfdefb07cef05dec851ec75bab20b:/data/glr.cc diff --git a/data/glr.cc b/data/glr.cc index ce3951e2..49b4fa10 100644 --- a/data/glr.cc +++ b/data/glr.cc @@ -54,7 +54,7 @@ b4_defines_if([], [b4_fatal([b4_skeleton[: using %%defines is mandatory]])]) m4_include(b4_pkgdatadir/[c++.m4]) -b4_percent_define_ifdef([[location_type]], [], +b4_percent_define_ifdef([[api.location.type]], [], [m4_include(b4_pkgdatadir/[location.cc])]) m4_define([b4_parser_class_name], @@ -78,31 +78,39 @@ m4_define([b4_yy_symbol_print_generate], [static void], [[FILE *], []], [[int yytype], [yytype]], - [[const b4_namespace_ref::b4_parser_class_name::semantic_type *yyvaluep], + [[const ]b4_namespace_ref::b4_parser_class_name[::semantic_type *yyvaluep], [yyvaluep]], - [[const b4_namespace_ref::b4_parser_class_name::location_type *yylocationp], + [[const ]b4_namespace_ref::b4_parser_class_name[::location_type *yylocationp], [yylocationp]], b4_parse_param)[ { ]b4_parse_param_use[]dnl [ yyparser.yy_symbol_print_ (yytype, yyvaluep]b4_locations_if([, yylocationp])[); } -]]) +]])[ +# Hijack the initial action to initialize the locations. +]b4_locations_if([b4_percent_define_ifdef([[api.location.type]], [], +[m4_define([b4_initial_action], +[yylloc.initialize ();]m4_ifdef([b4_initial_action], [ +m4_defn([b4_initial_action])]))])])[ -# Declare yyerror. -m4_append([b4_post_prologue], -[b4_syncline([@oline@], [@ofile@]) - -b4_c_ansi_function_decl([yyerror], +# Hijack the post prologue to insert early definition of YYLLOC_DEFAULT +# and declaration of yyerror. +]m4_append([b4_post_prologue], +[b4_syncline([@oline@], [@ofile@])[ +]b4_yylloc_default_define[ +#define YYRHSLOC(Rhs, K) ((Rhs)[K].yystate.yyloc) +]b4_c_ansi_function_decl([yyerror], [static void], - [[const b4_namespace_ref::b4_parser_class_name::location_type *yylocationp], + [[const ]b4_namespace_ref::b4_parser_class_name[::location_type *yylocationp], [yylocationp]], b4_parse_param, [[const char* msg], [msg]])]) -# Define yyerror. +# Hijack the epilogue to define implementations (yyerror, parser member +# functions etc.). m4_append([b4_epilogue], [b4_syncline([@oline@], [@ofile@])[ /*------------------. @@ -111,7 +119,7 @@ m4_append([b4_epilogue], ]b4_c_ansi_function_def([yyerror], [static void], - [[const b4_namespace_ref::b4_parser_class_name::location_type *yylocationp], + [[const ]b4_namespace_ref::b4_parser_class_name[::location_type *yylocationp], [yylocationp]], b4_parse_param, [[const char* msg], [msg]])[ @@ -128,7 +136,7 @@ m4_pushdef([b4_parse_param], m4_defn([b4_parse_param_orig]))dnl ]b4_parser_class_name::b4_parser_class_name[ (]b4_parse_param_decl[)]m4_ifset([b4_parse_param], [ :])[ #if ]b4_api_PREFIX[DEBUG - ]m4_ifset([b4_parse_param], [ ], [ :])[yydebug_ (false), + ]m4_ifset([b4_parse_param], [ ], [ :])[ yycdebug_ (&std::cerr)]m4_ifset([b4_parse_param], [,])[ #endif]b4_parse_param_cons[ { @@ -196,35 +204,33 @@ m4_pushdef([b4_parse_param], m4_defn([b4_parse_param_orig]))dnl ]b4_parser_class_name[::debug_level_type ]b4_parser_class_name[::debug_level () const { - return yydebug_; + return yydebug; } void ]b4_parser_class_name[::set_debug_level (debug_level_type l) { - yydebug_ = l; + // Actually, it is yydebug which is really used. + yydebug = l; } #endif ]m4_popdef([b4_parse_param])dnl -b4_namespace_close[ - -]]) +b4_namespace_close]) # Let glr.c believe that the user arguments include the parser itself. m4_ifset([b4_parse_param], [m4_pushdef([b4_parse_param], - m4_dquote([[[b4_namespace_ref::b4_parser_class_name& yyparser], [[yyparser]]],] -m4_defn([b4_parse_param])))], + [[b4_namespace_ref::b4_parser_class_name[& yyparser], [[yyparser]]],] +m4_defn([b4_parse_param]))], [m4_pushdef([b4_parse_param], - [[[[b4_namespace_ref::b4_parser_class_name& yyparser], [[yyparser]]]]]) + [[b4_namespace_ref::b4_parser_class_name[& yyparser], [[yyparser]]]]) ]) m4_include(b4_pkgdatadir/[glr.c]) m4_popdef([b4_parse_param]) -m4_divert_push(0) -@output(b4_spec_defines_file@)@ +b4_output_begin([b4_spec_defines_file]) b4_copyright([Skeleton interface for Bison GLR parsers in C++], [2002-2006, 2009-2012])[ @@ -234,39 +240,20 @@ b4_copyright([Skeleton interface for Bison GLR parsers in C++], ]b4_percent_code_get([[requires]])[ -#include -#include -]b4_percent_define_ifdef([[location_type]], [], - [[#include "location.hh"]])[ +# include +# include +]b4_percent_define_ifdef([[api.location.type]], [], + [[# include "location.hh"]])[ ]b4_YYDEBUG_define[ -/* 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). */ - -#ifndef YYLLOC_DEFAULT -# define YYLLOC_DEFAULT(Current, Rhs, N) \ - do \ - if (N) \ - { \ - (Current).begin = YYRHSLOC (Rhs, 1).begin; \ - (Current).end = YYRHSLOC (Rhs, N).end; \ - } \ - else \ - { \ - (Current).begin = (Current).end = YYRHSLOC (Rhs, 0).end; \ - } \ - while (/*CONSTCOND*/ 0) -#endif - ]b4_namespace_open[ /// A Bison parser. class ]b4_parser_class_name[ { public: /// Symbol semantic values. -#ifndef ]b4_api_PREFIX[STYPE +# ifndef ]b4_api_PREFIX[STYPE ]m4_ifdef([b4_stype], [ union semantic_type { @@ -275,11 +262,11 @@ b4_user_stype [m4_if(b4_tag_seen_flag, 0, [[ typedef int semantic_type;]], [[ typedef ]b4_api_PREFIX[STYPE semantic_type;]])])[ -#else +# else typedef ]b4_api_PREFIX[STYPE semantic_type; -#endif +# endif /// Symbol locations. - typedef ]b4_percent_define_get([[location_type]], + typedef ]b4_percent_define_get([[api.location.type]], [[location]])[ location_type; /// Tokens. struct token @@ -336,7 +323,6 @@ b4_user_stype const location_type* yylocationp); private: /* Debugging. */ - int yydebug_; std::ostream* yycdebug_; # endif @@ -357,4 +343,4 @@ b4_percent_define_flag_if([[global_tokens_and_yystype]], ]b4_namespace_close[ ]b4_percent_code_get([[provides]])[ ]b4_cpp_guard_close([b4_spec_defines_file])[ -]m4_divert_pop(0) +]b4_output_end()