X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/5807bb9156930091850a52b5bb9ab9f89082b04e..66c209cf435b5bfc5cf982d8df9cc3ef05b4546b:/data/glr.cc?ds=inline diff --git a/data/glr.cc b/data/glr.cc index 8841f10b..0afceeac 100644 --- a/data/glr.cc +++ b/data/glr.cc @@ -1,6 +1,6 @@ # 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 @@ -43,12 +43,17 @@ # user must initialize the first positions (in particular the # filename member). +b4_token_ctor_if([b4_variant_if([], + [b4_fatal_at(b4_percent_define_get_loc(api.token.constructor), + [cannot use '%s' without '%s'], + [%define api.token.constructor], + [%define api.value.type variant]))])]) + # We require a pure interface. m4_define([b4_pure_flag], [1]) m4_include(b4_pkgdatadir/[c++.m4]) -b4_locations_if([b4_percent_define_ifdef([[api.location.type]], [], - [m4_include(b4_pkgdatadir/[location.cc])])]) +b4_bison_locations_if([m4_include(b4_pkgdatadir/[location.cc])]) m4_define([b4_parser_class_name], [b4_percent_define_get([[parser_class_name]])]) @@ -56,6 +61,17 @@ m4_define([b4_parser_class_name], # Save the parse parameters. m4_define([b4_parse_param_orig], m4_defn([b4_parse_param])) +# b4_parse_param_wrap +# ------------------- +# New ones. +m4_ifset([b4_parse_param], +[m4_define([b4_parse_param_wrap], + [[b4_namespace_ref::b4_parser_class_name[& yyparser], [[yyparser]]],] +m4_defn([b4_parse_param]))], +[m4_define([b4_parse_param_wrap], + [[b4_namespace_ref::b4_parser_class_name[& yyparser], [[yyparser]]]]) +]) + # b4_yy_symbol_print_define # ------------------------- @@ -84,10 +100,9 @@ b4_locations_if([, ]])[ # Hijack the initial action to initialize the locations. -]b4_locations_if([b4_percent_define_ifdef([[api.location.type]], [], -[m4_define([b4_initial_action], +]b4_bison_locations_if([m4_define([b4_initial_action], [yylloc.initialize ();]m4_ifdef([b4_initial_action], [ -m4_defn([b4_initial_action])]))])])[ +m4_defn([b4_initial_action])]))])[ # Hijack the post prologue to insert early definition of YYLLOC_DEFAULT # and declaration of yyerror. @@ -103,10 +118,28 @@ m4_defn([b4_initial_action])]))])])[ [[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@])[ + /*------------------. | Report an error. | `------------------*/ @@ -217,23 +250,20 @@ b4_namespace_close # Declaration that might either go into the header (if --defines) # or open coded in the parser body. m4_define([b4_shared_declarations], -[dnl In this section, the parse params are the original parse_params. -m4_pushdef([b4_parse_param], m4_defn([b4_parse_param_orig]))dnl +[m4_pushdef([b4_parse_param], m4_defn([b4_parse_param_orig]))dnl b4_percent_code_get([[requires]])[ #include #include #include ]b4_defines_if([ -b4_locations_if([b4_percent_define_ifdef([[api.location.type]], [], - [[#include "location.hh"]])])])[ +b4_bison_locations_if([[#include "location.hh"]])])[ ]b4_YYDEBUG_define[ ]b4_namespace_open[ ]b4_defines_if([], -[b4_locations_if([b4_percent_define_ifdef([[api.location.type]], [], - [b4_position_define -b4_location_define])])])[ +[b4_bison_locations_if([b4_position_define +b4_location_define])])[ /// A Bison parser. class ]b4_parser_class_name[ @@ -284,7 +314,7 @@ b4_location_define])])])[ const semantic_type* yyvaluep]b4_locations_if([[, const location_type* yylocationp]])[); private: - /* Debugging. */ + // Debugging. std::ostream* yycdebug_; #endif @@ -308,28 +338,19 @@ b4_percent_define_flag_if([[global_tokens_and_yystype]], ]) 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++], - [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_close([b4_spec_defines_file])[ -]m4_divert_pop(0) -m4_changecom[#])]) +]b4_output_end()]) # Let glr.c (and b4_shared_declarations) believe that the user # arguments include the parser itself. -m4_ifset([b4_parse_param], -[m4_pushdef([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]]]]) -]) +m4_pushdef([b4_parse_param], m4_defn([b4_parse_param_wrap])) m4_include(b4_pkgdatadir/[glr.c]) m4_popdef([b4_parse_param])