X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/7aaaad6c6dc0fae412d608dcf20a3977d8902cd1..77a1a208a9ff9110f28a958c3fb630b434976e1a:/data/lalr1.cc?ds=sidebyside diff --git a/data/lalr1.cc b/data/lalr1.cc index 7ad30e5c..75eaf571 100644 --- a/data/lalr1.cc +++ b/data/lalr1.cc @@ -22,7 +22,7 @@ m4_include(b4_pkgdatadir/[c++.m4]) # -------------------------------------------------------------- # Declare "parser::yy_" which contents is CONTENT. m4_define([b4_integral_parser_table_declare], -[m4_ifval([$3], [b4_c_comment([$3], [ ]) +[m4_ifval([$3], [b4_comment([$3], [ ]) ])dnl static const b4_int_type_for([$2]) yy$1_[[]];dnl ]) @@ -98,19 +98,19 @@ m4_define([b4_rhs_location], # Same as in C, but using references instead of pointers. m4_define([b4_symbol_action], [b4_symbol_if([$1], [has_$2], -[m4_pushdef([b4_dollar_dollar], - [b4_symbol_value_template([yysym.value], - b4_symbol_if([$1], [has_type], - [b4_symbol([$1], [type])]))])dnl -m4_pushdef([b4_at_dollar], [yysym.location])dnl +[m4_pushdef([b4_symbol_value], m4_defn([b4_symbol_value_template]))[]dnl +b4_dollar_pushdef([yysym.value], + b4_symbol_if([$1], [has_type], + [m4_dquote(b4_symbol([$1], [type]))]), + [yysym.location])dnl b4_symbol_case_([$1]) b4_syncline([b4_symbol([$1], [$2_line])], ["b4_symbol([$1], [$2_file])"]) b4_symbol([$1], [$2]) b4_syncline([@oline@], [@ofile@]) break; -m4_popdef([b4_at_dollar])dnl -m4_popdef([b4_dollar_dollar])dnl +m4_popdef([b4_symbol_value])[]dnl +b4_dollar_popdef[]dnl ])]) @@ -120,10 +120,6 @@ m4_pushdef([b4_copyright_years], m4_define([b4_parser_class_name], [b4_percent_define_get([[parser_class_name]])]) -# The header is mandatory. -b4_defines_if([], - [b4_fatal([b4_skeleton[: using %%defines is mandatory]])]) - b4_locations_if([b4_percent_define_ifdef([[location_type]], [], [# Backward compatibility. m4_define([b4_location_constructors]) @@ -131,43 +127,32 @@ b4_locations_if([b4_percent_define_ifdef([[location_type]], [], m4_include(b4_pkgdatadir/[stack.hh]) b4_variant_if([m4_include(b4_pkgdatadir/[variant.hh])]) -# We do want M4 expansion after # for CPP macros. -m4_changecom() -m4_divert_push(0)dnl -@output(b4_spec_defines_file@)@ -b4_copyright([Skeleton interface for Bison LALR(1) parsers in C++]) -[ -/** - ** \file ]b4_spec_defines_file[ - ** Define the ]b4_namespace_ref[::parser class. - */ - -/* C++ LALR(1) parser skeleton written by Akim Demaille. */ - -]b4_cpp_guard_open([b4_spec_defines_file])[ - -]b4_percent_code_get([[requires]])[ - -]b4_parse_assert_if([#include ])[ -#include -#include -#include -#include "stack.hh" +# b4_shared_declarations +# ---------------------- +# Declaration that might either go into the header (if --defines) +# or open coded in the parser body. +m4_define([b4_shared_declarations], +[b4_percent_code_get([[requires]])[ +]b4_parse_assert_if([# include ])[ +# include +# include +# include +# include ]b4_defines_if([[ +# include "stack.hh" ]b4_locations_if([b4_percent_define_ifdef([[location_type]], [], - [[#include "location.hh"]])])[ + [[# include "location.hh"]])])])[ -]b4_variant_if([b4_namespace_open -b4_variant_define -b4_namespace_close])[ +]b4_YYDEBUG_define[ -]b4_null_define[ +]b4_namespace_open[ -/* Enabling traces. */ -#ifndef YYDEBUG -# define YYDEBUG ]b4_parse_trace_if([1], [0])[ -#endif +]b4_defines_if([], +[b4_stack_define +b4_locations_if([b4_percent_define_ifdef([[location_type]], [], + [b4_position_define +b4_location_define])])])[ -]b4_namespace_open[ +]b4_variant_if([b4_variant_define])[ /// A Bison parser. class ]b4_parser_class_name[ @@ -182,7 +167,7 @@ b4_namespace_close])[ /// \returns 0 iff parsing succeeded. virtual int parse (); -#if YYDEBUG +#if ]b4_api_PREFIX[DEBUG /// The current debugging stream. std::ostream& debug_stream () const; /// Set the current debugging stream. @@ -196,10 +181,10 @@ b4_namespace_close])[ void set_debug_level (debug_level_type l); #endif - /// Report a syntax error.]b4_locations_if([ - /// \param loc where the syntax error is found.])[ + /// Report a syntax error.]b4_locations_if([[ + /// \param loc where the syntax error is found.]])[ /// \param msg a description of the syntax error. - virtual void error (]b4_locations_if([const location_type& loc, ])[const std::string& msg); + virtual void error (]b4_locations_if([[const location_type& loc, ]])[const std::string& msg); /// Report a syntax error. void error (const syntax_error& err); @@ -237,10 +222,10 @@ b4_namespace_close])[ /// Convert the symbol name \a n to a form suitable for a diagnostic. static std::string yytnamerr_ (const char *n);])[ -]b4_token_table_if([], [[#if YYDEBUG]])[ +]b4_token_table_if([], [[#if ]b4_api_PREFIX[DEBUG]])[ /// For a symbol, its name in clear. static const char* const yytname_[]; -]b4_token_table_if([[#if YYDEBUG]])[ +]b4_token_table_if([[#if ]b4_api_PREFIX[DEBUG]])[ ]b4_integral_parser_table_declare([rline], [b4_rline], [YYRLINE[YYN] -- Source line where rule number YYN was defined.])[ /// Report on the debug stream that the rule \a r is going to be reduced. @@ -251,12 +236,12 @@ b4_namespace_close])[ // Debugging. int yydebug_; std::ostream* yycdebug_; -#endif // YYDEBUG +#endif // ]b4_api_PREFIX[DEBUG /// Convert a scanner token number \a t to a symbol number. static inline token_number_type yytranslate_ (]b4_lex_symbol_if([token_type], [int])[ t); -#if YYDEBUG +#if ]b4_api_PREFIX[DEBUG /// \brief Display a symbol type, value and location. /// \param yyo The output stream. /// \param yysym The symbol. @@ -284,7 +269,7 @@ b4_namespace_close])[ inline stack_symbol_type (); /// Constructor. - inline stack_symbol_type (]b4_args([state_type s], + inline stack_symbol_type (]b4_join([state_type s], [const semantic_type& v], b4_locations_if([const location_type& l]))[); @@ -340,15 +325,38 @@ b4_public_types_define])[ ]b4_namespace_close[ ]b4_percent_define_flag_if([[global_tokens_and_yystype]], -[b4_token_defines(b4_tokens) +[b4_token_defines -#ifndef YYSTYPE +#ifndef ]b4_api_PREFIX[STYPE /* Redirection for backward compatibility. */ -# define YYSTYPE b4_namespace_ref::b4_parser_class_name::semantic_type +# define ]b4_api_PREFIX[STYPE b4_namespace_ref::b4_parser_class_name::semantic_type #endif ])[ ]b4_percent_code_get([[provides]])[ +]]) + +# We do want M4 expansion after # for CPP macros. +m4_changecom() +b4_defines_if( +[m4_divert_push(0)dnl +@output(b4_spec_defines_file@)@ +b4_copyright([Skeleton interface for Bison LALR(1) parsers in C++]) +[ +/** + ** \file ]b4_spec_defines_file[ + ** Define the ]b4_namespace_ref[::parser class. + */ + +/* C++ LALR(1) 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)dnl +]) + + +m4_divert_push(0)dnl @output(b4_parser_file_name@)@ b4_copyright([Skeleton implementation for Bison LALR(1) parsers in C++]) b4_percent_code_get([[top]])[]dnl @@ -357,16 +365,19 @@ m4_if(b4_prefix, [yy], [], // Take the name prefix into account. #define yylex b4_prefix[]lex])[ -/* First part of user declarations. */ +// First part of user declarations. ]b4_user_pre_prologue[ -#include "@basename(]b4_spec_defines_file[@)" +]b4_null_define[ + +]b4_defines_if([[#include "@basename(]b4_spec_defines_file[@)"]], + [b4_shared_declarations])[ /* User implementation prologue. */ -]b4_user_post_prologue -b4_percent_code_get[]dnl +]b4_user_post_prologue[ +]b4_percent_code_get[ -[#ifndef YY_ +#ifndef YY_ # if defined YYENABLE_NLS && YYENABLE_NLS # if ENABLE_NLS # include /* FIXME: INFRINGES ON USER NAME SPACE */ @@ -379,31 +390,14 @@ b4_percent_code_get[]dnl #endif ]b4_locations_if([dnl -[/* 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). */ - -#define YYRHSLOC(Rhs, K) ((Rhs)[K].location) -#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 (false) -#endif]])[ +[#define YYRHSLOC(Rhs, K) ((Rhs)[K].location) +]b4_yylloc_default_define])[ /* Suppress unused-variable warnings by "using" E. */ #define YYUSE(e) ((void) (e)) /* Enable debugging if requested. */ -#if YYDEBUG +#if ]b4_api_PREFIX[DEBUG /* A pseudo ostream that takes yydebug_ into account. */ # define YYCDEBUG if (yydebug_) (*yycdebug_) @@ -430,14 +424,14 @@ b4_percent_code_get[]dnl yystack_print_ (); \ } while (false) -#else /* !YYDEBUG */ +#else /* !]b4_api_PREFIX[DEBUG */ # define YYCDEBUG if (false) std::cerr # define YY_SYMBOL_PRINT(Title, Symbol) YYUSE(Symbol) # define YY_REDUCE_PRINT(Rule) static_cast(0) # define YY_STACK_PRINT() static_cast(0) -#endif /* !YYDEBUG */ +#endif /* !]b4_api_PREFIX[DEBUG */ #define yyerrok (yyerrstatus_ = 0) #define yyclearin (yyempty = true) @@ -490,7 +484,7 @@ b4_percent_code_get[]dnl /// Build a parser object. ]b4_parser_class_name::b4_parser_class_name[ (]b4_parse_param_decl[)]m4_ifset([b4_parse_param], [ :])[ -#if YYDEBUG +#if ]b4_api_PREFIX[DEBUG ]m4_ifset([b4_parse_param], [ ], [ :])[yydebug_ (false), yycdebug_ (&std::cerr)]m4_ifset([b4_parse_param], [,])[ #endif]b4_parse_param_cons[ @@ -515,7 +509,7 @@ b4_percent_code_get[]dnl { } - ]b4_parser_class_name[::stack_symbol_type::stack_symbol_type (]b4_args( + ]b4_parser_class_name[::stack_symbol_type::stack_symbol_type (]b4_join( [state_type s], [const semantic_type& v], b4_locations_if([const location_type& l]))[) @@ -552,7 +546,7 @@ b4_percent_code_get[]dnl b4_symbol_variant([[yytype]], [[yysym.value]], [[template destroy]])])[ } -#if YYDEBUG +#if ]b4_api_PREFIX[DEBUG template void ]b4_parser_class_name[::yy_print_ (std::ostream& yyo, @@ -581,13 +575,13 @@ b4_percent_code_get[]dnl if (m) YY_SYMBOL_PRINT (m, sym); ]b4_variant_if( -[[ yystack_.push (stack_symbol_type (]b4_args( +[[ yystack_.push (stack_symbol_type (]b4_join( [s], [semantic_type()], b4_locations_if([sym.location]))[)); ]b4_symbol_variant([[yystos_[s]]], [[yystack_[0].value]], [build], [sym.value])], -[[ yystack_.push (stack_symbol_type (]b4_args( +[[ yystack_.push (stack_symbol_type (]b4_join( [s], [sym.value], b4_locations_if([sym.location]))[));]])[ @@ -599,7 +593,7 @@ b4_percent_code_get[]dnl if (m) YY_SYMBOL_PRINT (m, s); ]b4_variant_if( -[[ yystack_.push (stack_symbol_type (]b4_args( +[[ yystack_.push (stack_symbol_type (]b4_join( [s.state], [semantic_type()], b4_locations_if([s.location]))[)); @@ -614,7 +608,7 @@ b4_percent_code_get[]dnl yystack_.pop (n); } -#if YYDEBUG +#if ]b4_api_PREFIX[DEBUG std::ostream& ]b4_parser_class_name[::debug_stream () const { @@ -639,7 +633,7 @@ b4_percent_code_get[]dnl { yydebug_ = l; } -#endif // YYDEBUG +#endif // ]b4_api_PREFIX[DEBUG inline ]b4_parser_class_name[::state_type ]b4_parser_class_name[::yy_lr_goto_state_ (state_type yystate, int yylhs) @@ -686,18 +680,16 @@ b4_percent_code_get[]dnl /// $$ and @@$. stack_symbol_type yylhs; - /// The return value of parse(). + /// The return value of parse (). int yyresult; YYCDEBUG << "Starting parse" << std::endl; ]m4_ifdef([b4_initial_action], [ -m4_pushdef([b4_at_dollar], [yyla.location])dnl -m4_pushdef([b4_dollar_dollar], [yyla.value])dnl +b4_dollar_pushdef([yyla.value], [], [yyla.location])dnl /* User initialization code. */ b4_user_initial_action -m4_popdef([b4_dollar_dollar])dnl -m4_popdef([b4_at_dollar])])dnl +b4_dollar_popdef])[]dnl [ /* Initialize the stack. The initial state will be set in yynewstate, since the latter expects the semantical and the @@ -729,20 +721,20 @@ m4_popdef([b4_at_dollar])])dnl { YYCDEBUG << "Reading a token: "; try - { + { ]b4_lex_symbol_if( -[ yyla = b4_c_function_call([yylex], [symbol_type], +[ yyla = b4_function_call([yylex], [symbol_type], m4_ifdef([b4_lex_param], b4_lex_param));], -[ yyla.type = yytranslate_ (b4_c_function_call([yylex], [int], - [[YYSTYPE*], [&yyla.value]][]dnl +[ yyla.type = yytranslate_ (b4_function_call([yylex], [int], + [b4_api_PREFIX[STYPE*], [&yyla.value]][]dnl b4_locations_if([, [[location*], [&yyla.location]]])dnl m4_ifdef([b4_lex_param], [, ]b4_lex_param)));])[ - } + } catch (const syntax_error& yyexc) - { - error (yyexc); - goto yyerrlab1; - } + { + error (yyexc); + goto yyerrlab1; + } yyempty = false; } YY_SYMBOL_PRINT ("Next token is", yyla); @@ -815,19 +807,19 @@ m4_ifdef([b4_lex_param], [, ]b4_lex_param)));])[ // Perform the reduction. YY_REDUCE_PRINT (yyn); try - { - switch (yyn) { + switch (yyn) + { ]b4_user_actions[ - default: - break; + default: + break; + } } - } catch (const syntax_error& yyexc) - { - error (yyexc); - YYERROR; - } + { + error (yyexc); + YYERROR; + } YY_SYMBOL_PRINT ("-> $$ =", yylhs); ]b4_variant_if([[ // Destroy the rhs symbols. @@ -860,7 +852,7 @@ m4_ifdef([b4_lex_param], [, ]b4_lex_param)));])[ if (!yyerrstatus_) { ++yynerrs_; - error (]b4_args(b4_locations_if([yyla.location]), + error (]b4_join(b4_locations_if([yyla.location]), [[yysyntax_error_ (yystack_[0].state, yyempty ? yyempty_ : yyla.type)]])[); } @@ -975,7 +967,7 @@ m4_ifdef([b4_lex_param], [, ]b4_lex_param)));])[ void ]b4_parser_class_name[::error (const syntax_error& yyexc) { - error (]b4_args(b4_locations_if([yyexc.location]), + error (]b4_join(b4_locations_if([yyexc.location]), [[yyexc.what()]])[); } @@ -1084,7 +1076,7 @@ b4_error_verbose_if([state_type yystate, int yytoken], ]b4_parser_tables_define[ -]b4_token_table_if([], [[#if YYDEBUG]])[ +]b4_token_table_if([], [[#if ]b4_api_PREFIX[DEBUG]])[ /* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM. First, the terminals, then, starting at \a yyntokens_, nonterminals. */ const char* @@ -1093,7 +1085,7 @@ b4_error_verbose_if([state_type yystate, int yytoken], ]b4_tname[ }; -]b4_token_table_if([[#if YYDEBUG]])[ +]b4_token_table_if([[#if ]b4_api_PREFIX[DEBUG]])[ ]b4_integral_parser_table_define([rline], [b4_rline])[ // Print the state stack on the debug stream. @@ -1123,7 +1115,7 @@ b4_error_verbose_if([state_type yystate, int yytoken], YY_SYMBOL_PRINT (" $" << yyi + 1 << " =", ]b4_rhs_data(yynrhs, yyi + 1)[); } -#endif // YYDEBUG +#endif // ]b4_api_PREFIX[DEBUG ]b4_lex_symbol_if([], [b4_yytranslate_define])[ ]b4_namespace_close[