X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/5de9c593019d717db3073a37e2acf6a30e7f352d..fe1b448ada5e3a79ae3f523e08b5004396f30ca9:/data/lalr1.cc?ds=sidebyside diff --git a/data/lalr1.cc b/data/lalr1.cc index 5798edf6..c3678887 100644 --- a/data/lalr1.cc +++ b/data/lalr1.cc @@ -18,6 +18,38 @@ m4_include(b4_pkgdatadir/[c++.m4]) +# b4_subtract(LHS, RHS) +# --------------------- +# Evaluate LHS - RHS if they are integer literals, otherwise expand +# to (LHS) - (RHS). +m4_define([b4_subtract], +[m4_bmatch([$1$2], [^[0123456789]*$], + [m4_eval([$1 - $2])], + [($1) - ($2)])]) + + +# b4_args(ARG1, ...) +# _b4_args(ARG1, ...) +# ------------------- +# Join with comma, skipping empty arguments. +# b4_args calls itself recursively until it sees the first non-empty +# argument, then calls _b4_args which prepends each non-empty argument +# with a comma. +m4_define([b4_args], +[m4_if([$#$1], + [1], [], + [m4_ifval([$1], + [$1[]_$0(m4_shift($@))], + [$0(m4_shift($@))])])]) + +# _b4_args(ARGS1, ...) +# -------------------- +m4_define([_b4_args], +[m4_if([$#$1], + [1], [], + [m4_ifval([$1], [, $1])[]$0(m4_shift($@))])]) + + # b4_table_define(TABLE-NAME, CONTENT) # ------------------------------------ # Define "parser::yy_" which contents is CONTENT. @@ -53,6 +85,12 @@ b4_variant_if([ ]) # b4_variant_if +# b4_lex_symbol_if([IF-YYLEX-RETURNS-A-COMPLETE-SYMBOL], [IF-NOT]) +# ---------------------------------------------------------------- +m4_define([b4_lex_symbol_if], +[b4_percent_define_ifdef([[lex_symbol]], [$1], [$2])]) + + # b4_assert_if([IF-ASSERTIONS-ARE-USED], [IF-NOT]) # ------------------------------------------------ m4_define([b4_assert_if], @@ -78,7 +116,7 @@ m4_define([b4_lhs_location], # Return the data corresponding to the symbol #NUM, where the current # rule has RULE-LENGTH symbols on RHS. m4_define([b4_rhs_data], - [yystack_@{($1) - ($2)@}]) + [yystack_@{b4_subtract($@)@}]) # b4_rhs_state(RULE-LENGTH, NUM) @@ -105,6 +143,36 @@ m4_define([b4_rhs_location], [b4_rhs_data([$1], [$2]).location]) +# b4_symbol_(NUM, FIELD) +# ---------------------- +# Recover a FIELD about symbol #NUM. Thanks to m4_indir, fails if +# undefined. +m4_define([b4_symbol_], +[m4_indir([b4_symbol($1, $2)])]) + + +# b4_symbol(NUM, FIELD) +# --------------------- +# Recover a FIELD about symbol #NUM. Thanks to m4_indir, fails if +# undefined. If FIELD = id, prepend the prefix. +m4_define([b4_symbol], +[m4_case([$2], + [id], [m4_do([b4_percent_define_get([token.prefix])], + [b4_symbol_([$1], [id])])], + [b4_symbol_($@)])]) + + +# b4_symbol_if(NUM, FIELD, IF-TRUE, IF-FALSE) +# ------------------------------------------- +# If FIELD about symbol #NUM is 1 expand IF-TRUE, if is 0, expand IF-FALSE. +# Otherwise an error. +m4_define([b4_symbol_if], +[m4_case(b4_symbol([$1], [$2]), + [1], [$3], + [0], [$4], + [m4_fatal([$0: field $2 of $1 is not a Boolean:] b4_symbol([$1], [$2]))])]) + + # b4_symbol_actions(FILENAME, LINENO, # SYMBOL-TAG, SYMBOL-NUM, # SYMBOL-ACTION, SYMBOL-TYPENAME) @@ -124,17 +192,174 @@ m4_popdef([b4_dollar_dollar])dnl ]) -# b4_symbol_action_(SYMBOL-TAG, SYMBOL-NUM, SYMBOL-TYPENAME) -# ---------------------------------------------------------- -# Invoke b4_dollar_dollar(SYMBOL_TYPENAME) for each symbol. -m4_define([b4_symbol_action_], -[m4_ifval($3, -[ case $2: // $1 - b4_dollar_dollar($@); +# b4_symbol_case_(SYMBOL-NUM) +# --------------------------- +# Issue a "case NUM" for SYMBOL-NUM. +m4_define([b4_symbol_case_], +[ case b4_symbol([$1], [number]): // b4_symbol([$1], [tag]) +]) + + +# b4_type_action_(NUMS) +# --------------------- +# Run actions for the symbol NUMS that all have the same type-name. +# Skip NUMS that have no type-name. +m4_define([b4_type_action_], +[b4_symbol_if([$1], [has_type], +[m4_map([b4_symbol_case_], [$@])[]dnl + b4_dollar_dollar([b4_symbol([$1], [number])], + [b4_symbol([$1], [tag])], + [b4_symbol([$1], [type])]); break; + ])]) +# b4_symbol_constructor_declaration_(SYMBOL-NUMBER) +# ------------------------------------------------- +# Declare the overloaded version of make_symbol for the (common) type of +# these SYMBOL-NUMBERS. Use at class-level. +m4_define([b4_symbol_constructor_declaration_], +[b4_symbol_if([$1], [is_token], [b4_symbol_if([$1], [has_id], +[ static inline + symbol_type + make_[]b4_symbol_([$1], [id]) (dnl +b4_args(b4_symbol_if([$1], [has_type], + [const b4_symbol([$1], [type])& v]), + b4_locations_if([const location_type& l]))); + +])])]) + + +# b4_symbol_constructor_declarations +# ---------------------------------- +# Declare symbol constructors for all the value types. +# Use at class-level. +m4_define([b4_symbol_constructor_declarations], +[b4_variant_if([ + // Symbol constructors declarations. +m4_map([b4_symbol_constructor_declaration_], m4_defn([b4_symbol_numbers]))])]) + + + +# b4_symbol_constructor_definition_(SYMBOL-NUMBER) +# ------------------------------------------------ +# Define symbol constructor for this SYMBOL-NUMBER. +m4_define([b4_symbol_constructor_definition_], +[b4_symbol_if([$1], [is_token], [b4_symbol_if([$1], [has_id], +[ b4_parser_class_name::symbol_type + b4_parser_class_name::make_[]b4_symbol_([$1], [id]) (dnl +b4_args(b4_symbol_if([$1], [has_type], + [const b4_symbol([$1], [type])& v]), + b4_locations_if([const location_type& l]))) + { + return symbol_type (b4_args([yytranslate_ (token::b4_symbol([$1], [id]))], + b4_symbol_if([$1], [has_type], [v]), + b4_locations_if([l]))); + } + +])])]) + + +# b4_symbol_constructor_definitions +# ---------------------------------- +# Define the overloaded versions of make_symbol for all the value types. +m4_define([b4_symbol_constructor_definitions], +[[ // symbol_base_type. + template + ]b4_parser_class_name[::symbol_base_type::symbol_base_type () + : value()]b4_locations_if([ + , location()])[ + { + }]b4_locations_if([[ + + template + ]b4_parser_class_name[::symbol_base_type::symbol_base_type (const location_type& l) + : value() + , location(l) + { + }]])[ + + template + ]b4_parser_class_name[::symbol_base_type::symbol_base_type (]b4_args( + [const semantic_type& v], + b4_locations_if([const location_type& l]))[) + : value(v)]b4_locations_if([ + , location(l)])[ + { + } + + template + const Exact& + ]b4_parser_class_name[::symbol_base_type::self () const + { + return static_cast(*this); + } + + template + Exact& + ]b4_parser_class_name[::symbol_base_type::self () + { + return static_cast(*this); + } + + template + int + ]b4_parser_class_name[::symbol_base_type::type_get () const + { + return self ().type_get_ (); + } + + // symbol_type. + ]b4_parser_class_name[::symbol_type::symbol_type () + : super_type () + , type () + { + } + + ]b4_parser_class_name[::symbol_type::symbol_type (]b4_args( + [int t], + b4_locations_if([const location_type& l]))[) + : super_type (]b4_locations_if([l])[) + , type (t) + { + } + + ]b4_parser_class_name[::symbol_type::symbol_type (]b4_args( + [int t], + [const semantic_type& v], + b4_locations_if([const location_type& l]))[) + : super_type (v]b4_locations_if([, l])[) + , type (t) + { + } + + int + ]b4_parser_class_name[::symbol_type::type_get_ () const + { + return type; + } +]b4_lex_symbol_if([[ + ]b4_parser_class_name[::token_type + ]b4_parser_class_name[::symbol_type::token () const + { + // YYTOKNUM[NUM] -- (External) token number corresponding to the + // (internal) symbol number NUM (which must be that of a token). */ + static + const ]b4_int_type_for([b4_toknum])[ + yytoken_number_[] = + { + ]b4_toknum[ + }; + return static_cast (yytoken_number_[type]); + } +]])[ + +]b4_variant_if( +[ // Implementation of make_symbol for each symbol type. +m4_map([b4_symbol_constructor_definition_], m4_defn([b4_symbol_numbers]))])]) + + # b4_symbol_variant(YYTYPE, YYVAL, ACTION, [ARGS]) # ------------------------------------------------ # Run some ACTION ("build", or "destroy") on YYVAL of symbol type @@ -144,9 +369,9 @@ m4_define([b4_symbol_variant], [$2.$3<$][3>(m4_shift3($@))])dnl switch ($1) { -m4_map([b4_symbol_action_], m4_defn([b4_type_names])) - default: - break; +m4_map([b4_type_action_], m4_defn([b4_type_names]))[]dnl + default: + break; } m4_popdef([b4_dollar_dollar])dnl ]) @@ -166,20 +391,56 @@ m4_define([_b4_char_sizeof_dummy], dummy[]_b4_char_sizeof_counter]) -# b4_char_sizeof(SYMBOL-TAG, SYMBOL-NUM, SYMBOL-TYPENAME) -# ------------------------------------------------------- +# b4_char_sizeof_(SYMBOL-NUM) +# --------------------------- +# A comment describing this symbol. +m4_define([b4_char_sizeof_], +[ // b4_symbol([$1], [tag]) +]) + +# b4_char_sizeof(SYMBOL-NUMS) +# -------------------------- # To be mapped on the list of type names to produce: # # char dummy1[sizeof(type_name_1)]; # char dummy2[sizeof(type_name_2)]; # # for defined type names. -# $3 is doubly-quoted, do not quote it again. m4_define([b4_char_sizeof], -[m4_ifval($3, +[b4_symbol_if([$1], [has_type], [ - char _b4_char_sizeof_dummy@{sizeof($3)@}; // $1])dnl -]) +m4_map([b4_char_sizeof_], [$@])dnl + char _b4_char_sizeof_dummy@{sizeof([b4_symbol([$1], [type])])@}; +])]) + + +# b4_yytranslate_definition +# ------------------------- +# Define yytranslate_. Sometimes we want it in the header file, +# sometimes the cc file suffices. +m4_define([b4_yytranslate_definition], +[[ // Symbol number corresponding to token number t. + ]b4_parser_class_name[::token_number_type + ]b4_parser_class_name[::yytranslate_ (]b4_lex_symbol_if([token_type], + [int])[ t) + { + static + const token_number_type + translate_table[] = + { +]b4_translate[ + }; + const unsigned int user_token_number_max_ = ]b4_user_token_number_max[; + const token_number_type undef_token_ = ]b4_undef_token_number[; + + if (static_cast(t) <= yyeof_) + return yyeof_; + else if (static_cast (t) <= user_token_number_max_) + return translate_table[t]; + else + return undef_token_; + } +]]) m4_pushdef([b4_copyright_years], @@ -192,15 +453,15 @@ m4_define([b4_parser_class_name], b4_defines_if([], [b4_fatal([b4_skeleton[: using %%defines is mandatory]])]) -# Backward compatibility. +b4_locations_if( +[# Backward compatibility. m4_define([b4_location_constructors]) -m4_include(b4_pkgdatadir/[location.cc]) +m4_include(b4_pkgdatadir/[location.cc])]) # We do want M4 expansion after # for CPP macros. m4_changecom() m4_divert_push(0)dnl -b4_defines_if( -[@output(b4_spec_defines_file@)@ +@output(b4_spec_defines_file@)@ b4_copyright([Skeleton interface for Bison LALR(1) parsers in C++]) dnl FIXME: This is wrong, we want computed header guards. [ @@ -217,8 +478,8 @@ dnl FIXME: This is wrong, we want computed header guards. #include "stack.hh" ]b4_namespace_open[ - class position; - class location; +]b4_locations_if([ class position; + class location;])[ ]b4_variant_if( [[ /// A char[S] buffer to store and retrieve objects. @@ -231,11 +492,12 @@ dnl FIXME: This is wrong, we want computed header guards. {]b4_assert_if([ /// Whether something is contained. bool built; - - /// Initially uninitialized. - variant () - : built(false) - {}])[ +])[ + /// Empty construction. + inline + variant ()]b4_assert_if([ + : built(false)])[ + {} /// Instantiate a \a T in here. template @@ -247,6 +509,25 @@ dnl FIXME: This is wrong, we want computed header guards. return *new (buffer) T; } + /// Instantiate a \a T in here from \a t. + template + inline T& + build(const T& t) + {]b4_assert_if([ + assert(!built); + built = true;])[ + return *new (buffer) T(t); + } + + /// Construct and fill. + template + inline + variant (const T& t)]b4_assert_if([ + : built(true)])[ + { + new (buffer) T(t); + } + /// Accessor to a built \a T. template inline T& @@ -299,7 +580,7 @@ dnl FIXME: This is wrong, we want computed header guards. ]])[ ]b4_namespace_close[ -#include "location.hh" +]b4_locations_if([#include "location.hh"])[ /* Enabling traces. */ #ifndef YYDEBUG @@ -319,7 +600,8 @@ dnl FIXME: This is wrong, we want computed header guards. # define YYTOKEN_TABLE ]b4_token_table[ #endif -/* YYLLOC_DEFAULT -- Set CURRENT to span from RHS[1] to RHS[N]. +]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). */ @@ -336,7 +618,7 @@ do { \ (Current).begin = (Current).end = (Rhs)[0].location.end; \ } \ } while (false) -#endif +#endif]])[ ]b4_namespace_open[ @@ -348,8 +630,7 @@ do { \ ]b4_variant_if( [ /// An auxiliary type to compute the largest semantic type. union union_type - {]m4_map([b4_char_sizeof], m4_defn([b4_type_names]))[ - }; + {]m4_map([b4_char_sizeof], m4_defn([b4_type_names]))[}; /// Symbol semantic values. typedef variant semantic_type;], @@ -363,9 +644,9 @@ m4_ifdef([b4_stype], [[ typedef YYSTYPE semantic_type;]])])])[ #else typedef YYSTYPE semantic_type; -#endif +#endif]b4_locations_if([ /// Symbol locations. - typedef ]b4_percent_define_get([[location_type]])[ location_type; + typedef b4_percent_define_get([[location_type]]) location_type;])[ /// Tokens. struct token { @@ -397,10 +678,10 @@ m4_ifdef([b4_stype], #endif private: - /// Report a syntax error. - /// \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 (const location_type& loc, const std::string& msg); + virtual void error (]b4_locations_if([const location_type& loc, ])[const std::string& msg); /// Generate an error message. /// \param state the state where the error occurred. @@ -446,18 +727,14 @@ m4_ifdef([b4_stype], #if YYDEBUG || YYERROR_VERBOSE || YYTOKEN_TABLE /// For a symbol, its name in clear. static const char* const yytname_[]; -#endif +#endif]b4_error_verbose_if([ -#if YYERROR_VERBOSE /// Convert the symbol name \a n to a form suitable for a diagnostic. - virtual std::string yytnamerr_ (const char *n); -#endif + static std::string yytnamerr_ (const char *n);])[ #if YYDEBUG /// For each rule, its source line number. static const ]b4_int_type_for([b4_rline])[ yyrline_[]; - /// For each scanner token number, its symbol number. - static const ]b4_int_type_for([b4_toknum])[ yytoken_number_[]; /// Report on the debug stream that the rule \a r is going to be reduced. virtual void yy_reduce_print_ (int r); /// Print the state stack on the debug stream. @@ -469,7 +746,7 @@ m4_ifdef([b4_stype], #endif /// Convert a scanner token number \a t to a symbol number. - token_number_type yytranslate_ (int t); + static inline token_number_type yytranslate_ (]b4_lex_symbol_if([token_type], [int])[ t); /// A complete symbol, with its type. template @@ -478,8 +755,11 @@ m4_ifdef([b4_stype], /// Default constructor. inline symbol_base_type (); - /// Constructor. - inline symbol_base_type (const semantic_type& v, const location_type& l); + /// Constructor.]b4_locations_if([ + inline symbol_base_type (const location_type& l)])[; + inline symbol_base_type (]b4_args( + [const semantic_type& v], + b4_locations_if([const location_type& l]))[); /// Return this with its exact type. const Exact& self () const; @@ -489,10 +769,10 @@ m4_ifdef([b4_stype], int type_get () const; /// The semantic value. - semantic_type value; + semantic_type value;]b4_locations_if([ /// The location. - location_type location; + location_type location;])[ }; #if YYDEBUG @@ -512,6 +792,7 @@ m4_ifdef([b4_stype], inline void yy_destroy_ (const char* yymsg, symbol_base_type& yysym) const; + public: /// Element of the stack: a state and its attributes. struct symbol_type : symbol_base_type { @@ -522,16 +803,26 @@ m4_ifdef([b4_stype], inline symbol_type (); /// Constructor. - inline symbol_type (int t, - const semantic_type& v, const location_type& l); + inline symbol_type (]b4_args([int t], + [const semantic_type& v], + b4_locations_if([const location_type& l]))[); + + inline symbol_type (]b4_args([int t], + b4_locations_if([const location_type& l]))[); /// The symbol type. int type; /// Return the type corresponding to this state. inline int type_get_ () const; + + /// Its token. + inline token_type token () const; }; +]b4_symbol_constructor_declarations[ + + private: /// Element of the stack: a state and its attributes. struct stack_symbol_type : symbol_base_type { @@ -542,8 +833,9 @@ m4_ifdef([b4_stype], inline stack_symbol_type (); /// Constructor. - inline stack_symbol_type (state_type s, - const semantic_type& v, const location_type& l); + inline stack_symbol_type (]b4_args([state_type s], + [const semantic_type& v], + b4_locations_if([const location_type& l]))[); /// The state. state_type state; @@ -577,20 +869,23 @@ m4_ifdef([b4_stype], inline void yypop_ (unsigned int n = 1); /* Constants. */ - static const int yyeof_; - /* LAST_ -- Last index in TABLE_. */ - static const int yylast_; - static const int yynnts_; - static const int yyempty_; - static const int yyfinal_; - static const int yyterror_; - static const int yyerrcode_; - static const int yyntokens_; - static const unsigned int yyuser_token_number_max_; - static const token_number_type yyundef_token_; + enum + { + yyeof_ = 0, + yylast_ = ]b4_last[, //< Last index in yytable_. + yynnts_ = ]b4_nterms_number[, //< Number of nonterminal symbols. + yyempty_ = -2, + yyfinal_ = ]b4_final_state_number[, //< Termination state number. + yyterror_ = 1, + yyerrcode_ = 256, + yyntokens_ = ]b4_tokens_number[, //< Number of tokens. + }; + ]b4_parse_param_vars[ }; +]b4_lex_symbol_if([b4_yytranslate_definition])[ +]b4_lex_symbol_if([b4_symbol_constructor_definitions])[ ]b4_namespace_close[ ]b4_percent_define_flag_if([[global_tokens_and_yystype]], @@ -604,7 +899,6 @@ m4_ifdef([b4_stype], b4_percent_code_get([[provides]])[]dnl [#endif /* ! defined PARSER_HEADER_H */] -])dnl @output(b4_parser_file_name@)@ b4_copyright([Skeleton implementation for Bison LALR(1) parsers in C++]) b4_percent_code_get([[top]])[]dnl @@ -614,10 +908,9 @@ m4_if(b4_prefix, [yy], [], #define yylex b4_prefix[]lex])[ /* First part of user declarations. */ -]b4_user_pre_prologue +]b4_user_pre_prologue[ -b4_defines_if([[ -#include "@basename(]b4_spec_defines_file[@)"]])[ +#include "@basename(]b4_spec_defines_file[@)" /* User implementation prologue. */ ]b4_user_post_prologue @@ -675,16 +968,15 @@ b4_percent_code_get[]dnl #endif /* !YYDEBUG */ -#define yyerrok (yyerrstatus_ = 0) -#define yyclearin (yychar = yyempty_) +#define yyerrok (yyerrstatus_ = 0) +#define yyclearin (yyempty = true) -#define YYACCEPT goto yyacceptlab -#define YYABORT goto yyabortlab -#define YYERROR goto yyerrorlab +#define YYACCEPT goto yyacceptlab +#define YYABORT goto yyabortlab +#define YYERROR goto yyerrorlab #define YYRECOVERING() (!!yyerrstatus_) -]b4_namespace_open[ -#if YYERROR_VERBOSE +]b4_namespace_open[]b4_error_verbose_if([[ /* Return YYSTR after stripping away unnecessary quotes and backslashes, so that it's suitable for yyerror. The heuristic is @@ -722,8 +1014,7 @@ b4_percent_code_get[]dnl return yystr; } - -#endif +]])[ /// Build a parser object. ]b4_parser_class_name::b4_parser_class_name[ (]b4_parse_param_decl[)]m4_ifset([b4_parse_param], [ @@ -744,61 +1035,7 @@ b4_percent_code_get[]dnl | Symbol types. | `---------------*/ - // symbol_base_type. - template - ]b4_parser_class_name[::symbol_base_type::symbol_base_type () - : value() - , location() - { - } - - template - ]b4_parser_class_name[::symbol_base_type::symbol_base_type (const semantic_type& v, const location_type& l) - : value(v) - , location(l) - { - } - - template - const Exact& - ]b4_parser_class_name[::symbol_base_type::self () const - { - return static_cast(*this); - } - - template - Exact& - ]b4_parser_class_name[::symbol_base_type::self () - { - return static_cast(*this); - } - - template - int - ]b4_parser_class_name[::symbol_base_type::type_get () const - { - return self ().type_get_ (); - } - - // symbol_type. - ]b4_parser_class_name[::symbol_type::symbol_type () - : super_type () - , type () - { - } - - ]b4_parser_class_name[::symbol_type::symbol_type (int t, - const semantic_type& v, const location_type& l) - : super_type (v, l) - , type (t) - { - } - - int - ]b4_parser_class_name[::symbol_type::type_get_ () const - { - return type; - } +]b4_lex_symbol_if([], [b4_symbol_constructor_definitions])[ // stack_symbol_type. ]b4_parser_class_name[::stack_symbol_type::stack_symbol_type () @@ -807,9 +1044,11 @@ b4_percent_code_get[]dnl { } - ]b4_parser_class_name[::stack_symbol_type::stack_symbol_type (state_type s, - const semantic_type& v, const location_type& l) - : super_type (v, l) + ]b4_parser_class_name[::stack_symbol_type::stack_symbol_type (]b4_args( + [state_type s], + [const semantic_type& v], + b4_locations_if([const location_type& l]))[) + : super_type (v]b4_locations_if([, l])[) , state (s) { } @@ -834,13 +1073,13 @@ b4_percent_code_get[]dnl // User destructor. switch (yytype) { - ]m4_map([b4_symbol_actions], m4_defn([b4_symbol_destructors]))[ +]m4_map([b4_symbol_actions], m4_defn([b4_symbol_destructors]))[ default: break; }]b4_variant_if([ // Type destructor. - b4_symbol_variant([[yytype]], [[yysym.value]], [[template destroy]])])[ + b4_symbol_variant([[yytype]], [[yysym.value]], [[template destroy]])])[ } #if YYDEBUG @@ -851,12 +1090,12 @@ b4_percent_code_get[]dnl { int yytype = yysym.type_get (); yyo << (yytype < yyntokens_ ? "token" : "nterm") - << ' ' << yytname_[yytype] << " (" - << yysym.location << ": "; + << ' ' << yytname_[yytype] << " ("]b4_locations_if([ + << yysym.location << ": "])[; switch (yytype) { - ]m4_map([b4_symbol_actions], m4_defn([b4_symbol_printers]))dnl -[ default: +]m4_map([b4_symbol_actions], m4_defn([b4_symbol_printers]))[ + default: break; } yyo << ')'; @@ -870,10 +1109,16 @@ b4_percent_code_get[]dnl if (m) YY_SYMBOL_PRINT (m, sym); ]b4_variant_if( -[[ yystack_.push (stack_symbol_type (s, semantic_type(), sym.location)); +[[ yystack_.push (stack_symbol_type (]b4_args( + [s], + [semantic_type()], + b4_locations_if([sym.location]))[)); ]b4_symbol_variant([[yystos_[s]]], [[yystack_[0].value]], [build], [sym.value])], -[ yystack_.push (stack_symbol_type (s, sym.value, sym.location));])[ +[[ yystack_.push (stack_symbol_type (]b4_args( + [s], + [sym.value], + b4_locations_if([sym.location]))[));]])[ } void @@ -882,7 +1127,10 @@ b4_percent_code_get[]dnl if (m) YY_SYMBOL_PRINT (m, s); ]b4_variant_if( -[[ yystack_.push (stack_symbol_type (s.state, semantic_type(), s.location)); +[[ yystack_.push (stack_symbol_type (]b4_args( + [s.state], + [semantic_type()], + b4_locations_if([s.location]))[)); ]b4_symbol_variant([[yystos_[s.state]]], [[yystack_[0].value]], [build], [s.value])], [ yystack_.push (s);])[ @@ -924,8 +1172,8 @@ b4_percent_code_get[]dnl int ]b4_parser_class_name[::parse () { - /// Coded type of the lookahead. - int yychar = yyempty_; + /// Whether yyla contains a lookahead. + bool yyempty = true; /* State. */ int yyn; @@ -937,10 +1185,10 @@ b4_percent_code_get[]dnl int yyerrstatus_ = 0; /// The lookahead symbol. - symbol_type yyla; + symbol_type yyla;]b4_locations_if([[ /// The locations where the error started and ended. - stack_symbol_type yyerror_range[2]; + stack_symbol_type yyerror_range[2];]])[ /// $$ and @@$. stack_symbol_type yylhs; @@ -986,27 +1234,19 @@ m4_popdef([b4_at_dollar])])dnl goto yydefault; /* Read a lookahead token. */ - if (yychar == yyempty_) + if (yyempty) { - YYCDEBUG << "Reading a token: "; - yychar = ]b4_c_function_call([yylex], [int], + YYCDEBUG << "Reading a token: "; +]b4_lex_symbol_if( +[ yyla = b4_c_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 b4_locations_if([, [[location*], [&yyla.location]]])dnl -m4_ifdef([b4_lex_param], [, ]b4_lex_param))[; - } - - - /* Convert token to internal form. */ - if (yychar <= yyeof_) - { - yychar = yyla.type = yyeof_; - YYCDEBUG << "Now at end of input." << std::endl; - } - else - { - yyla.type = yytranslate_ (yychar); - YY_SYMBOL_PRINT ("Next token is", yyla); +m4_ifdef([b4_lex_param], [, ]b4_lex_param)));])[ + yyempty = false; } + YY_SYMBOL_PRINT ("Next token is", yyla); /* If the proper action on seeing token YYLA.TYPE is to reduce or to detect an error, take that action. */ @@ -1025,7 +1265,7 @@ m4_ifdef([b4_lex_param], [, ]b4_lex_param))[; } /* Discard the token being shifted. */ - yychar = yyempty_; + yyempty = true; /* Count tokens shifted since error; after three, turn off error status. */ @@ -1065,18 +1305,19 @@ m4_ifdef([b4_lex_param], [, ]b4_lex_param))[; yylhs.value = yystack_@{yylen - 1@}.value; else yylhs.value = yystack_@{0@}.value;])[ - +]b4_locations_if([dnl +[ // Compute the default @@$. { slice slice (yystack_, yylen); YYLLOC_DEFAULT (yylhs.location, slice, yylen); - } + }]])[ // Perform the reduction. YY_REDUCE_PRINT (yyn); switch (yyn) { - ]b4_user_actions[ +]b4_user_actions[ default: break; } @@ -1119,25 +1360,24 @@ m4_ifdef([b4_lex_param], [, ]b4_lex_param))[; if (!yyerrstatus_) { ++yynerrs_; - error (yyla.location, yysyntax_error_ (yystate, yyla.type)); + error (]b4_args(b4_locations_if([yyla.location]), + [yysyntax_error_ (yystate, yyla.type)])[); } - yyerror_range[0].location = yyla.location; +]b4_locations_if([[ + yyerror_range[0].location = yyla.location;]])[ if (yyerrstatus_ == 3) { /* If just tried and failed to reuse lookahead token after an - error, discard it. */ - - if (yychar <= yyeof_) - { - /* Return failure if at end of input. */ - if (yychar == yyeof_) - YYABORT; - } - else - { - yy_destroy_ ("Error: discarding", yyla); - yychar = yyempty_; + error, discard it. */ + + /* Return failure if at end of input. */ + if (yyla.type == yyeof_) + YYABORT; + else + { + yy_destroy_ ("Error: discarding", yyla); + yyempty = true; } } @@ -1157,7 +1397,8 @@ m4_ifdef([b4_lex_param], [, ]b4_lex_param))[; if (false) goto yyerrorlab; - yyerror_range[0].location = yystack_[yylen - 1].location; +]b4_locations_if([[ + yyerror_range[0].location = yystack_[yylen - 1].location;]])[ /* Do not reclaim the symbols of the rule which action triggered this YYERROR. */ yypop_ (yylen); @@ -1189,16 +1430,16 @@ m4_ifdef([b4_lex_param], [, ]b4_lex_param))[; // Pop the current state because it cannot handle the error token. if (yystack_.size () == 1) YYABORT; - - yyerror_range[0].location = yystack_[0].location; +]b4_locations_if([[ + yyerror_range[0].location = yystack_[0].location;]])[ yy_destroy_ ("Error: popping", yystack_[0]); yypop_ (); yystate = yystack_[0].state; YY_STACK_PRINT (); } - +]b4_locations_if([[ yyerror_range[1].location = yyla.location; - YYLLOC_DEFAULT (error_token.location, (yyerror_range - 1), 2); + YYLLOC_DEFAULT (error_token.location, (yyerror_range - 1), 2);]])[ /* Shift the error token. */ error_token.state = yystate = yyn; @@ -1217,7 +1458,7 @@ m4_ifdef([b4_lex_param], [, ]b4_lex_param))[; goto yyreturn; yyreturn: - if (yychar != yyempty_) + if (!yyempty) yy_destroy_ ("Cleanup: discarding lookahead", yyla); /* Do not reclaim the symbols of the rule which action triggered @@ -1234,12 +1475,11 @@ m4_ifdef([b4_lex_param], [, ]b4_lex_param))[; // Generate an error message. std::string - ]b4_parser_class_name[::yysyntax_error_ (int yystate, int]dnl -b4_error_verbose_if([ tok])[) + ]b4_parser_class_name[::yysyntax_error_ (]dnl +b4_error_verbose_if([int yystate, int yytoken], + [int, int])[) { - std::string res; - YYUSE (yystate); -#if YYERROR_VERBOSE + std::string yyres;]b4_error_verbose_if([[ int yyn = yypact_[yystate]; if (yypact_ninf_ < yyn && yyn <= yylast_) { @@ -1250,36 +1490,55 @@ b4_error_verbose_if([ tok])[) /* Stay within bounds of both yycheck and yytname. */ int yychecklim = yylast_ - yyn + 1; int yyxend = yychecklim < yyntokens_ ? yychecklim : yyntokens_; - int count = 0; - for (int x = yyxbegin; x < yyxend; ++x) - if (yycheck_[x + yyn] == x && x != yyterror_) - ++count; - - // FIXME: This method of building the message is not compatible - // with internationalization. It should work like yacc.c does it. - // That is, first build a string that looks like this: - // "syntax error, unexpected %s or %s or %s" - // Then, invoke YY_ on this string. - // Finally, use the string as a format to output - // yytname_[tok], etc. - // Until this gets fixed, this message appears in English only. - res = "syntax error, unexpected "; - res += yytnamerr_ (yytname_[tok]); - if (count < 5) - { - count = 0; - for (int x = yyxbegin; x < yyxend; ++x) - if (yycheck_[x + yyn] == x && x != yyterror_) - { - res += (!count++) ? ", expecting " : " or "; - res += yytnamerr_ (yytname_[x]); - } - } + + // Number of "expected" tokens. + size_t yycount = 0; + // Its maximum. + enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 }; + // Arguments of yyformat. + char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM]; + yyarg[yycount++] = yytname_[yytoken]; + for (int yyx = yyxbegin; yyx < yyxend; ++yyx) + if (yycheck_[yyx + yyn] == yyx && yyx != yyterror_) + { + if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM) + { + yycount = 1; + break; + } + else + yyarg[yycount++] = yytname_[yyx]; + } + + char const* yyformat = 0; + switch (yycount) + { +#define YYCASE_(N, S) \ + case N: \ + yyformat = S; \ + break + YYCASE_(1, YY_("syntax error, unexpected %s")); + YYCASE_(2, YY_("syntax error, unexpected %s, expecting %s")); + YYCASE_(3, YY_("syntax error, unexpected %s, expecting %s or %s")); + YYCASE_(4, YY_("syntax error, unexpected %s, expecting %s or %s or %s")); + YYCASE_(5, YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s")); +#undef YYCASE_ + } + // Argument number. + size_t yyi = 0; + for (char const* yyp = yyformat; *yyp; ++yyp) + if (yyp[0] == '%' && yyp[1] == 's' && yyi < yycount) + { + yyres += yytnamerr_ (yyarg[yyi++]); + ++yyp; + } + else + yyres += *yyp; } else -#endif - res = YY_("syntax error"); - return res; + ]])dnl +[ yyres = YY_("syntax error"); + return yyres; } @@ -1312,12 +1571,6 @@ b4_error_verbose_if([ tok])[) symbol of state STATE-NUM. */ ]b4_table_define([stos], [b4_stos])[; -#if YYDEBUG - /* TOKEN_NUMBER_[YYLEX-NUM] -- Internal symbol number corresponding - to YYLEX-NUM. */ - ]b4_table_define([token_number], [b4_toknum])[; -#endif - /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */ ]b4_table_define([r1], [b4_r1])[; @@ -1367,34 +1620,7 @@ b4_error_verbose_if([ tok])[) } #endif // YYDEBUG - /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */ - ]b4_parser_class_name[::token_number_type - ]b4_parser_class_name[::yytranslate_ (int t) - { - static - const token_number_type - translate_table[] = - { - ]b4_translate[ - }; - if ((unsigned int) t <= yyuser_token_number_max_) - return translate_table[t]; - else - return yyundef_token_; - } - - const int ]b4_parser_class_name[::yyeof_ = 0; - const int ]b4_parser_class_name[::yylast_ = ]b4_last[; - const int ]b4_parser_class_name[::yynnts_ = ]b4_nterms_number[; - const int ]b4_parser_class_name[::yyempty_ = -2; - const int ]b4_parser_class_name[::yyfinal_ = ]b4_final_state_number[; - const int ]b4_parser_class_name[::yyterror_ = 1; - const int ]b4_parser_class_name[::yyerrcode_ = 256; - const int ]b4_parser_class_name[::yyntokens_ = ]b4_tokens_number[; - - const unsigned int ]b4_parser_class_name[::yyuser_token_number_max_ = ]b4_user_token_number_max[; - const ]b4_parser_class_name[::token_number_type ]b4_parser_class_name[::yyundef_token_ = ]b4_undef_token_number[; - +]b4_lex_symbol_if([], [b4_yytranslate_definition])[ ]b4_namespace_close[ ]b4_epilogue[]dnl