X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/25f66e1a6aec208a99763911e156ea203a8a66b9..b50d2359d7608270561abd5c3cbf6e84834c2019:/data/lalr1.cc?ds=sidebyside diff --git a/data/lalr1.cc b/data/lalr1.cc index d92bfd12..c00de055 100644 --- a/data/lalr1.cc +++ b/data/lalr1.cc @@ -1,6 +1,8 @@ m4_divert(-1) + # C++ skeleton for Bison -# Copyright (C) 2002, 2003 Free Software Foundation, Inc. + +# Copyright (C) 2002, 2003, 2004, 2005 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 @@ -14,105 +16,11 @@ m4_divert(-1) # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -# 02111-1307 USA - -## ---------------- ## -## Default values. ## -## ---------------- ## - -# Default Parser class name. -m4_define_default([b4_parser_class_name], [Parser]) - - - -## ----------------- ## -## Semantic Values. ## -## ----------------- ## - - -# b4_lhs_value([TYPE]) -# -------------------- -# Expansion of $$. -m4_define([b4_lhs_value], -[yyval[]m4_ifval([$1], [.$1])]) - - -# b4_rhs_value(RULE-LENGTH, NUM, [TYPE]) -# -------------------------------------- -# Expansion of $NUM, where the current rule has RULE-LENGTH -# symbols on RHS. -m4_define([b4_rhs_value], -[semantic_stack_@{m4_eval([$1 - $2])@}m4_ifval([$3], [.$3])]) - -m4_define_default([b4_location_type], [Location]) - -# b4_lhs_location() -# ----------------- -# Expansion of @$. -m4_define([b4_lhs_location], -[yyloc]) - - -# b4_rhs_location(RULE-LENGTH, NUM) -# --------------------------------- -# Expansion of @NUM, where the current rule has RULE-LENGTH symbols -# on RHS. -m4_define([b4_rhs_location], -[location_stack_@{m4_eval([$1 - $2])@}]) - - -m4_define([b4_inherit], - [m4_ifdef([b4_root], - [: public b4_root -], - [])]) - -m4_define([b4_param], - [m4_ifdef([b4_root], - [, - const Param& param], - [])]) - -m4_define([b4_constructor], - [m4_ifdef([b4_root], - [b4_root (param), - ], - [])]) - - -# b4_parse_param_decl -# ------------------- -# Constructor's extra arguments. -m4_define([b4_parse_param_decl], - [m4_ifset([b4_parse_param], [, b4_c_ansi_formals(b4_parse_param)])]) - -# b4_parse_param_cons -# ------------------- -# constructor's extra initialisations. -m4_define([b4_parse_param_cons], - [m4_ifset([b4_parse_param], - [, - b4_cc_constructor_calls(b4_parse_param)])]) -m4_define([b4_cc_constructor_calls], - [m4_map_sep([b4_cc_constructor_call], [, - ], [$@])]) -m4_define([b4_cc_constructor_call], - [$2($2)]) - -# b4_parse_param_vars -# ------------------- -# Extra instance variables. -m4_define([b4_parse_param_vars], - [m4_ifset([b4_parse_param], - [ - /* User arguments. */ -b4_cc_var_decls(b4_parse_param)])]) -m4_define([b4_cc_var_decls], - [m4_map_sep([b4_cc_var_decl], [ -], [$@])]) -m4_define([b4_cc_var_decl], - [ $1;]) +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +# 02110-1301 USA + +m4_include(b4_pkgdatadir/[c++.m4]) +m4_include(b4_pkgdatadir/[location.cc]) # We do want M4 expansion after # for CPP macros. m4_changecom() @@ -120,106 +28,99 @@ m4_divert(0)dnl m4_if(b4_defines_flag, 0, [], [@output @output_header_name@ b4_copyright([C++ Skeleton parser for LALR(1) parsing with Bison], - [2002, 2003])[ -/* FIXME: This is wrong, we want computed header guards. - I don't know why the macros are missing now. :( */ + [2002, 2003, 2004, 2005]) +dnl FIXME: This is wrong, we want computed header guards. +dnl FIXME: I don\'t know why the macros are missing now. :( +[ #ifndef PARSER_HEADER_H # define PARSER_HEADER_H -#include "stack.hh" -#include "location.hh" - #include #include +#include "stack.hh" -/* Using locations. */ -#define YYLSP_NEEDED ]b4_locations_flag[ - -]b4_token_defines(b4_tokens)[ +namespace yy +{ + class position; + class location; +} -/* Copy the first part of user declarations. */ +/* First part of user declarations. */ ]b4_pre_prologue[ ]/* Line __line__ of lalr1.cc. */ b4_syncline([@oline@], [@ofile@])[ +]dnl Include location.hh here: it might depend on headers included above. +[#include "location.hh" + /* Enabling traces. */ #ifndef YYDEBUG # define YYDEBUG ]b4_debug[ #endif -/* Enabling verbose error message. */ -#ifndef YYERROR_VERBOSE +/* Enabling verbose error messages. */ +#ifdef YYERROR_VERBOSE +# undef YYERROR_VERBOSE +# define YYERROR_VERBOSE 1 +#else # define YYERROR_VERBOSE ]b4_error_verbose[ #endif -#ifndef YYSTYPE -]m4_ifdef([b4_stype], -[b4_syncline([b4_stype_line], [b4_filename]) -typedef union b4_stype yystype; -/* Line __line__ of lalr1.cc. */ -b4_syncline([@oline@], [@ofile@])], -[typedef int yystype;])[ -# define YYSTYPE yystype +/* Enabling the token table. */ +#ifndef YYTOKEN_TABLE +# define YYTOKEN_TABLE ]b4_token_table[ #endif -/* Copy the second part of user declarations. */ -]b4_post_prologue[ +/* 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). */ -]/* Line __line__ of lalr1.cc. */ -b4_syncline([@oline@], [@ofile@])[ #ifndef YYLLOC_DEFAULT -# define YYLLOC_DEFAULT(Current, Rhs, N) \ - ((Current).end = Rhs[N].end) +# define YYLLOC_DEFAULT(Current, Rhs, N) \ +do { \ + if (N) \ + { \ + (Current).begin = (Rhs)[1].begin; \ + (Current).end = (Rhs)[N].end; \ + } \ + else \ + { \ + (Current).begin = (Current).end = (Rhs)[0].end; \ + } \ +} while (0) #endif namespace yy { - class ]b4_parser_class_name[; - template < typename P > - struct Traits - { - }; - - template < > - struct Traits< ]b4_parser_class_name[ > - { - typedef ]b4_int_type_for([b4_translate])[ TokenNumberType; - typedef ]b4_int_type_for([b4_rhs])[ RhsNumberType; - typedef int StateType; - typedef yystype SemanticType; - typedef ]b4_location_type[ LocationType; - }; -} - -namespace yy -{ - class ]b4_parser_class_name b4_inherit[ + /// A Bison parser. + class ]b4_parser_class_name[ { public: - - typedef Traits< ]b4_parser_class_name[ >::TokenNumberType TokenNumberType; - typedef Traits< ]b4_parser_class_name[ >::RhsNumberType RhsNumberType; - typedef Traits< ]b4_parser_class_name[ >::StateType StateType; - typedef Traits< ]b4_parser_class_name[ >::SemanticType SemanticType; - typedef Traits< ]b4_parser_class_name[ >::LocationType LocationType; - - typedef Stack< StateType > StateStack; - typedef Stack< SemanticType > SemanticStack; - typedef Stack< LocationType > LocationStack; - -#if YYLSP_NEEDED - ]b4_parser_class_name[ (bool debug, - LocationType initlocation][]b4_param[]b4_parse_param_decl[) : - ]b4_constructor[][debug_ (debug), - cdebug_ (std::cerr), - initlocation_ (initlocation)]b4_parse_param_cons[ + /// Symbol semantic values. +#if ! defined (YYSTYPE) +]m4_ifdef([b4_stype], +[b4_syncline([b4_stype_line], [b4_file_name]) + union semantic_type b4_stype; +/* Line __line__ of lalr1.cc. */ +b4_syncline([@oline@], [@ofile@])], +[ typedef int semantic_type;])[ #else - ]b4_parser_class_name[ (bool debug][]b4_param[]b4_parse_param_decl[) : - ]b4_constructor[][debug_ (debug), - cdebug_ (std::cerr)]b4_parse_param_cons[ + typedef YYSTYPE semantic_type; #endif + /// Symbol locations. + typedef ]b4_location_type[ location_type; + /// Tokens. + struct token + { + ]b4_token_enums(b4_tokens)[ + }; + + /// Build a parser object. + ]b4_parser_class_name[ (]b4_parse_param_decl[) : + yydebug_ (false), + yycdebug_ (&std::cerr)]b4_parse_param_cons[ { } @@ -227,375 +128,577 @@ namespace yy { } + /// Parse. + /// \returns 0 iff parsing succeeded. virtual int parse (); - private: + /// The current debugging stream. + std::ostream& debug_stream () const; + /// Set the current debugging stream. + void set_debug_stream (std::ostream &); - virtual void lex_ (); - virtual void error_ (); - virtual void print_ (); + /// Type for debugging levels. + typedef int debug_level_type; + /// The current debugging level. + debug_level_type debug_level () const; + /// Set the current debugging level. + void set_debug_level (debug_level_type l); - /* Stacks. */ - StateStack state_stack_; - SemanticStack semantic_stack_; - LocationStack location_stack_; + private: + /// Report a syntax error. + /// \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); + /// Generate an error message. + /// \param state the state where the error occurred. + /// \param tok the look-ahead token. + virtual std::string yysyntax_error_ (int yystate]dnl +b4_error_verbose_if([, int tok])[); + +#if YYDEBUG + /// \brief Report a symbol on the debug stream. + /// \param yytype The token type. + /// \param yyvaluep Its semantic value. + /// \param yylocationp Its location. + virtual void yysymprint_ (int yytype, + const semantic_type* yyvaluep, + const location_type* yylocationp); +#endif /* ! YYDEBUG */ + + + /// State numbers. + typedef int state_type; + /// State stack type. + typedef stack state_stack_type; + /// Semantic value stack type. + typedef stack semantic_stack_type; + /// location stack type. + typedef stack location_stack_type; + + /// The state stack. + state_stack_type yystate_stack_; + /// The semantic value stack. + semantic_stack_type yysemantic_stack_; + /// The location stack. + location_stack_type yylocation_stack_; + + /// Internal symbol numbers. + typedef ]b4_int_type_for([b4_translate])[ token_number_type; /* Tables. */ - static const ]b4_int_type_for([b4_pact])[ pact_[]; - static const ]b4_int_type(b4_pact_ninf, b4_pact_ninf)[ pact_ninf_; - static const ]b4_int_type_for([b4_defact])[ defact_[]; - static const ]b4_int_type_for([b4_pgoto])[ pgoto_[]; - static const ]b4_int_type_for([b4_defgoto])[ defgoto_[]; - static const ]b4_int_type_for([b4_table])[ table_[]; - static const ]b4_int_type(b4_table_ninf, b4_table_ninf)[ table_ninf_; - static const ]b4_int_type_for([b4_check])[ check_[]; - static const ]b4_int_type_for([b4_r1])[ r1_[]; - static const ]b4_int_type_for([b4_r2])[ r2_[]; - -#if YYDEBUG || YYERROR_VERBOSE - static const char* const name_[]; + /// For a state, the index in \a yytable_ of its portion. + static const ]b4_int_type_for([b4_pact])[ yypact_[]; + static const ]b4_int_type(b4_pact_ninf, b4_pact_ninf)[ yypact_ninf_; + + /// For a state, default rule to reduce. + /// Unless\a yytable_ specifies something else to do. + /// Zero means the default is an error. + static const ]b4_int_type_for([b4_defact])[ yydefact_[]; + + static const ]b4_int_type_for([b4_pgoto])[ yypgoto_[]; + static const ]b4_int_type_for([b4_defgoto])[ yydefgoto_[]; + + /// What to do in a state. + /// \a yytable_[yypact_[s]]: what to do in state \a s. + /// - if positive, shift that token. + /// - if negative, reduce the rule which number is the opposite. + /// - if zero, do what YYDEFACT says. + static const ]b4_int_type_for([b4_table])[ yytable_[]; + static const ]b4_int_type(b4_table_ninf, b4_table_ninf)[ yytable_ninf_; + + static const ]b4_int_type_for([b4_check])[ yycheck_[]; + + /// For a state, its accessing symbol. + static const ]b4_int_type_for([b4_stos])[ yystos_[]; + + /// For a rule, its LHS. + static const ]b4_int_type_for([b4_r1])[ yyr1_[]; + /// For a rule, its RHS length. + static const ]b4_int_type_for([b4_r2])[ yyr2_[]; + +#if YYDEBUG || YYERROR_VERBOSE || YYTOKEN_TABLE + /// For a symbol, its name in clear. + static const char* const yytname_[]; +#endif + +#if YYERROR_VERBOSE + /// Convert the symbol name \a n to a form suitable for a diagnostic. + virtual std::string yytnamerr_ (const char *n); #endif - /* More tables, for debugging. */ #if YYDEBUG - static const RhsNumberType rhs_[]; - static const ]b4_int_type_for([b4_prhs])[ prhs_[]; - static const ]b4_int_type_for([b4_rline])[ rline_[]; - static const ]b4_int_type_for([b4_stos])[ stos_[]; - static const ]b4_int_type_for([b4_toknum])[ token_number_[]; - virtual void reduce_print_ (int yyrule); - virtual void stack_print_ (); + /// A type to store symbol numbers and -1. + typedef ]b4_int_type_for([b4_rhs])[ rhs_number_type; + /// A `-1'-separated list of the rules' RHS. + static const rhs_number_type yyrhs_[]; + /// For each rule, the index of the first RHS symbol in \a yyrhs_. + static const ]b4_int_type_for([b4_prhs])[ yyprhs_[]; + /// 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 yyreduce_print_ (int r); + /// Print the state stack on the debug stream. + virtual void yystack_print_ (); #endif - /* Even more tables. */ - static inline TokenNumberType translate_ (int token); + /// Convert a scanner token number to a symbol number. + inline token_number_type yytranslate_ (int token); + + /// \brief Reclaim the memory associated to a symbol. + /// \param yymsg Why this token is reclaimed. + /// \param yytype The symbol type. + /// \param yyvaluep Its semantic value. + /// \param yylocationp Its location. + inline void yydestruct_ (const char* yymsg, + int yytype, + semantic_type* yyvaluep, + location_type* yylocationp); + + /// Pop \a n symbols the three stacks. + inline void yypop_ (unsigned int n = 1); /* Constants. */ - static const int eof_; + static const int yyeof_; /* LAST_ -- Last index in TABLE_. */ - static const int last_; - static const int nnts_; - static const int empty_; - static const int final_; - static const int terror_; - static const int errcode_; - static const int ntokens_; - static const unsigned user_token_number_max_; - static const TokenNumberType undef_token_; - - /* State. */ - int n_; - int len_; - int state_; + 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_; /* Debugging. */ - int debug_; - std::ostream &cdebug_; - - /* Lookahead and lookahead in internal form. */ - int looka_; - int ilooka_; - - /* Message. */ - std::string message; - - /* Semantic value and location of lookahead token. */ - SemanticType value; - LocationType location; + int yydebug_; + std::ostream* yycdebug_; - /* @@$ and $$. */ - SemanticType yyval; - LocationType yyloc; - - /* Initial location. */ - LocationType initlocation_; ]b4_parse_param_vars[ }; } +]m4_ifset([b4_global_tokens_and_yystype], +[b4_token_defines(b4_tokens) + +#ifndef YYSTYPE + /* Redirection for backward compatibility. */ +# define YYSTYPE yy::b4_parser_class_name::semantic_type +#endif +])[ #endif /* ! defined PARSER_HEADER_H */] ])dnl @output @output_parser_name@ b4_copyright([C++ Skeleton parser for LALR(1) parsing with Bison], - [2002, 2003]) + [2002, 2003, 2004, 2005]) +m4_if(b4_prefix[], [yy], [], +[ +// Take the name prefix into account. +#define yylex b4_prefix[]lex]) +m4_if(b4_defines_flag, 0, [], +[ +#include @output_header_name@])[ + +/* User implementation prologue. */ +]b4_post_prologue[ + +]/* Line __line__ of lalr1.cc. */ +b4_syncline([@oline@], [@ofile@])[ + +#ifndef YY_ +# if YYENABLE_NLS +# if ENABLE_NLS +# include /* FIXME: INFRINGES ON USER NAME SPACE */ +# define YY_(msgid) dgettext ("bison-runtime", msgid) +# endif +# endif +# ifndef YY_ +# define YY_(msgid) msgid +# endif +#endif -m4_if(b4_defines_flag, 0, [], [#include @output_header_name@])[ +/* A pseudo ostream that takes yydebug_ into account. */ +# define YYCDEBUG \ + for (bool yydebugcond_ = yydebug_; yydebugcond_; yydebugcond_ = false) \ + (*yycdebug_) /* Enable debugging if requested. */ #if YYDEBUG -# define YYCDEBUG if (debug_) cdebug_ + +# define YY_SYMBOL_PRINT(Title, Type, Value, Location) \ +do { \ + if (yydebug_) \ + { \ + *yycdebug_ << (Title) << ' '; \ + yysymprint_ ((Type), (Value), (Location)); \ + *yycdebug_ << std::endl; \ + } \ +} while (0) + # define YY_REDUCE_PRINT(Rule) \ do { \ - if (debug_) \ - reduce_print_ (Rule); \ + if (yydebug_) \ + yyreduce_print_ (Rule); \ } while (0) + # define YY_STACK_PRINT() \ do { \ - if (debug_) \ - stack_print_ (); \ + if (yydebug_) \ + yystack_print_ (); \ } while (0) + #else /* !YYDEBUG */ -# define YYCDEBUG if (0) cdebug_ + +# define YY_SYMBOL_PRINT(Title, Type, Value, Location) # define YY_REDUCE_PRINT(Rule) # define YY_STACK_PRINT() + #endif /* !YYDEBUG */ #define YYACCEPT goto yyacceptlab #define YYABORT goto yyabortlab #define YYERROR goto yyerrorlab +#if YYERROR_VERBOSE + +/* Return YYSTR after stripping away unnecessary quotes and + backslashes, so that it's suitable for yyerror. The heuristic is + that double-quoting is unnecessary unless the string contains an + apostrophe, a comma, or backslash (other than backslash-backslash). + YYSTR is taken from yytname. */ +std::string +yy::]b4_parser_class_name[::yytnamerr_ (const char *yystr) +{ + if (*yystr == '"') + { + std::string yyr = ""; + char const *yyp = yystr; + + for (;;) + switch (*++yyp) + { + case '\'': + case ',': + goto do_not_strip_quotes; + + case '\\': + if (*++yyp != '\\') + goto do_not_strip_quotes; + /* Fall through. */ + default: + yyr += *yyp; + break; + + case '"': + return yyr; + } + do_not_strip_quotes: ; + } + + return yystr; +} + +#endif + +#if YYDEBUG +/*--------------------------------. +| Print this symbol on YYOUTPUT. | +`--------------------------------*/ + +void +yy::]b4_parser_class_name[::yysymprint_ (int yytype, + const semantic_type* yyvaluep, const location_type* yylocationp) +{ + /* Pacify ``unused variable'' warnings. */ + (void) yyvaluep; + (void) yylocationp; + /* Backward compatibility, but should be removed eventually. */ + std::ostream& cdebug_ = *yycdebug_; + (void) cdebug_; + + *yycdebug_ << (yytype < yyntokens_ ? "token" : "nterm") + << ' ' << yytname_[yytype] << " (" + << *yylocationp << ": "; + switch (yytype) + { +]m4_map([b4_symbol_actions], m4_defn([b4_symbol_printers]))dnl +[ default: + break; + } + *yycdebug_ << ')'; +} +#endif /* ! YYDEBUG */ + +void +yy::]b4_parser_class_name[::yydestruct_ (const char* yymsg, + int yytype, semantic_type* yyvaluep, location_type* yylocationp) +{ + /* Pacify ``unused variable'' warnings. */ + (void) yymsg; + (void) yyvaluep; + (void) yylocationp; + + YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp); + + switch (yytype) + { +]m4_map([b4_symbol_actions], m4_defn([b4_symbol_destructors]))[ + default: + break; + } +} + +void +yy::]b4_parser_class_name[::yypop_ (unsigned int n) +{ + yystate_stack_.pop (n); + yysemantic_stack_.pop (n); + yylocation_stack_.pop (n); +} + +std::ostream& +yy::]b4_parser_class_name[::debug_stream () const +{ + return *yycdebug_; +} + +void +yy::]b4_parser_class_name[::set_debug_stream (std::ostream& o) +{ + yycdebug_ = &o; +} + + +yy::]b4_parser_class_name[::debug_level_type +yy::]b4_parser_class_name[::debug_level () const +{ + return yydebug_; +} + +void +yy::]b4_parser_class_name[::set_debug_level (debug_level_type l) +{ + yydebug_ = l; +} + int yy::]b4_parser_class_name[::parse () { - int nerrs = 0; - int errstatus = 0; + /// Look-ahead and look-ahead in internal form. + int yychar = yyempty_; + int yytoken = 0; + + /* State. */ + int yyn; + int yylen; + int yystate = 0; - /* Initialize the stacks. The initial state will be pushed in + /* Error handling. */ + int yynerrs_ = 0; + int yyerrstatus_ = 0; + + /// Semantic value of the look-ahead. + semantic_type yylval; + /// Location of the look-ahead. + location_type yylloc; + /// The locations where the error started and ended. + location yyerror_range[2]; + + /// $$. + semantic_type yyval; + /// @@$. + location_type yyloc; + + int yyresult; + + YYCDEBUG << "Starting parse" << std::endl; + +]m4_ifdef([b4_initial_action], [ +m4_pushdef([b4_at_dollar], [yylloc])dnl +m4_pushdef([b4_dollar_dollar], [yylval])dnl + /* User initialization code. */ + b4_initial_action +m4_popdef([b4_dollar_dollar])dnl +m4_popdef([b4_at_dollar])dnl +/* Line __line__ of yacc.c. */ +b4_syncline([@oline@], [@ofile@])])dnl + +[ /* Initialize the stacks. The initial state will be pushed in yynewstate, since the latter expects the semantical and the location values to have been already stored, initialize these stacks with a primary value. */ - state_stack_ = StateStack (0); - semantic_stack_ = SemanticStack (1); - location_stack_ = LocationStack (1); - - /* Start. */ - state_ = 0; - looka_ = empty_; -#if YYLSP_NEEDED - location = initlocation_; -#endif - YYCDEBUG << "Starting parse" << std::endl; + yystate_stack_ = state_stack_type (0); + yysemantic_stack_ = semantic_stack_type (0); + yylocation_stack_ = location_stack_type (0); + yysemantic_stack_.push (yylval); + yylocation_stack_.push (yylloc); /* New state. */ - yynewstate: - state_stack_.push (state_); - YYCDEBUG << "Entering state " << state_ << std::endl; +yynewstate: + yystate_stack_.push (yystate); + YYCDEBUG << "Entering state " << yystate << std::endl; goto yybackup; /* Backup. */ - yybackup: +yybackup: - /* Try to take a decision without lookahead. */ - n_ = pact_[state_]; - if (n_ == pact_ninf_) + /* Try to take a decision without look-ahead. */ + yyn = yypact_[yystate]; + if (yyn == yypact_ninf_) goto yydefault; - /* Read a lookahead token. */ - if (looka_ == empty_) + /* Read a look-ahead token. */ + if (yychar == yyempty_) { YYCDEBUG << "Reading a token: "; - lex_ (); + yychar = ]b4_c_function_call([yylex], [int], +[[YYSTYPE*], [&yylval]][]dnl +b4_location_if([, [[location*], [&yylloc]]])dnl +m4_ifdef([b4_lex_param], [, ]b4_lex_param))[; } + /* Convert token to internal form. */ - if (looka_ <= 0) + if (yychar <= yyeof_) { - looka_ = eof_; - ilooka_ = 0; + yychar = yytoken = yyeof_; YYCDEBUG << "Now at end of input." << std::endl; } else { - ilooka_ = translate_ (looka_); -#if YYDEBUG - if (debug_) - { - YYCDEBUG << "Next token is " << looka_ - << " (" << name_[ilooka_]; - print_ (); - YYCDEBUG << ')' << std::endl; - } -#endif + yytoken = yytranslate_ (yychar); + YY_SYMBOL_PRINT ("Next token is", yytoken, &yylval, &yylloc); } /* If the proper action on seeing token YYTOKEN is to reduce or to detect an error, take that action. */ - n_ += ilooka_; - if (n_ < 0 || last_ < n_ || check_[n_] != ilooka_) + yyn += yytoken; + if (yyn < 0 || yylast_ < yyn || yycheck_[yyn] != yytoken) goto yydefault; /* Reduce or error. */ - n_ = table_[n_]; - if (n_ < 0) + yyn = yytable_[yyn]; + if (yyn <= 0) { - if (n_ == table_ninf_) + if (yyn == 0 || yyn == yytable_ninf_) goto yyerrlab; - else - { - n_ = -n_; - goto yyreduce; - } + yyn = -yyn; + goto yyreduce; } - else if (n_ == 0) - goto yyerrlab; /* Accept? */ - if (n_ == final_) + if (yyn == yyfinal_) goto yyacceptlab; - /* Shift the lookahead token. */ -#if YYDEBUG - YYCDEBUG << "Shifting token " << looka_ - << " (" << name_[ilooka_] << "), "; -#endif + /* Shift the look-ahead token. */ + YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc); /* Discard the token being shifted unless it is eof. */ - if (looka_ != eof_) - looka_ = empty_; + if (yychar != yyeof_) + yychar = yyempty_; - semantic_stack_.push (value); - location_stack_.push (location); + yysemantic_stack_.push (yylval); + yylocation_stack_.push (yylloc); /* Count tokens shifted since error; after three, turn off error status. */ - if (errstatus) - --errstatus; + if (yyerrstatus_) + --yyerrstatus_; - state_ = n_; + yystate = yyn; goto yynewstate; /*-----------------------------------------------------------. | yydefault -- do the default action for the current state. | `-----------------------------------------------------------*/ - yydefault: - n_ = defact_[state_]; - if (n_ == 0) +yydefault: + yyn = yydefact_[yystate]; + if (yyn == 0) goto yyerrlab; goto yyreduce; /*-----------------------------. | yyreduce -- Do a reduction. | `-----------------------------*/ - yyreduce: - len_ = r2_[n_]; +yyreduce: + yylen = yyr2_[yyn]; /* If LEN_ is nonzero, implement the default value of the action: `$$ = $1'. Otherwise, use the top of the stack. Otherwise, the following line sets YYVAL to garbage. This behavior is undocumented and Bison users should not rely upon it. */ - if (len_) - { - yyval = semantic_stack_[len_ - 1]; - yyloc = location_stack_[len_ - 1]; - } + if (yylen) + yyval = yysemantic_stack_[yylen - 1]; else - { - yyval = semantic_stack_[0]; - yyloc = location_stack_[0]; - } + yyval = yysemantic_stack_[0]; - if (len_) - { - Slice< LocationType, LocationStack > slice (location_stack_, len_); - YYLLOC_DEFAULT (yyloc, slice, len_); - } - YY_REDUCE_PRINT (n_); - switch (n_) + { + slice slice (yylocation_stack_, yylen); + YYLLOC_DEFAULT (yyloc, slice, yylen); + } + YY_REDUCE_PRINT (yyn); + switch (yyn) { ]b4_actions[ + default: break; } ]/* Line __line__ of lalr1.cc. */ b4_syncline([@oline@], [@ofile@])[ - state_stack_.pop (len_); - semantic_stack_.pop (len_); - location_stack_.pop (len_); + yypop_ (yylen); YY_STACK_PRINT (); - semantic_stack_.push (yyval); - location_stack_.push (yyloc); + yysemantic_stack_.push (yyval); + yylocation_stack_.push (yyloc); /* Shift the result of the reduction. */ - n_ = r1_[n_]; - state_ = pgoto_[n_ - ntokens_] + state_stack_[0]; - if (0 <= state_ && state_ <= last_ && check_[state_] == state_stack_[0]) - state_ = table_[state_]; + yyn = yyr1_[yyn]; + yystate = yypgoto_[yyn - yyntokens_] + yystate_stack_[0]; + if (0 <= yystate && yystate <= yylast_ + && yycheck_[yystate] == yystate_stack_[0]) + yystate = yytable_[yystate]; else - state_ = defgoto_[n_ - ntokens_]; + yystate = yydefgoto_[yyn - yyntokens_]; goto yynewstate; /*------------------------------------. | yyerrlab -- here on detecting error | `------------------------------------*/ - yyerrlab: +yyerrlab: /* If not already recovering from an error, report this error. */ - if (!errstatus) + if (!yyerrstatus_) { - ++nerrs; - -#if YYERROR_VERBOSE - n_ = pact_[state_]; - if (pact_ninf_ < n_ && n_ < last_) - { - message = "syntax error, unexpected "; - message += name_[ilooka_]; - { - int count = 0; - /* Start YYX at -YYN if negative to avoid negative indexes in - YYCHECK. */ - int xbegin = n_ < 0 ? -n_ : 0; - /* Stay within bounds of both yycheck and yytname. */ - int checklim = last_ - n_; - int xend = checklim < ntokens_ ? checklim : ntokens_; - for (int x = xbegin; x < xend; ++x) - if (check_[x + n_] == x && x != terror_) - ++count; - if (count < 5) - { - count = 0; - for (int x1 = xbegin; x1 < xend; ++x1) - if (check_[x1 + n_] == x1 && x1 != terror_) - { - message += (!count++) ? ", expecting " : " or "; - message += name_[x1]; - } - } - } - } - else -#endif - message = "syntax error"; - error_ (); + ++yynerrs_; + error (yylloc, yysyntax_error_ (yystate]dnl +b4_error_verbose_if([, yytoken])[)); } - if (errstatus == 3) + yyerror_range[0] = yylloc; + if (yyerrstatus_ == 3) { - /* If just tried and failed to reuse lookahead token after an + /* If just tried and failed to reuse look-ahead token after an error, discard it. */ - /* Return failure if at end of input. */ - if (looka_ <= eof_) + if (yychar <= yyeof_) { - /* If at end of input, pop the error token, - then the rest of the stack, then return failure. */ - if (looka_ == eof_) - for (;;) - { - state_stack_.pop (); - semantic_stack_.pop (); - location_stack_.pop (); - if (state_stack_.height () == 1) - YYABORT; -// YYDSYMPRINTF ("Error: popping", yystos[*yyssp], yyvsp, yylsp); -// FIXME: yydestruct (yystos[*yyssp], yyvsp]b4_location_if([, yylsp])[); - } + /* Return failure if at end of input. */ + if (yychar == yyeof_) + YYABORT; } else { -#if YYDEBUG - YYCDEBUG << "Discarding token " << looka_ - << " (" << name_[ilooka_] << ")." << std::endl; -// yydestruct (yytoken, &yylval]b4_location_if([, &yylloc])[); -#endif - looka_ = empty_; + yydestruct_ ("Error: discarding", yytoken, &yylval, &yylloc); + yychar = yyempty_; } } - /* Else will try to reuse lookahead token after shifting the error + /* Else will try to reuse look-ahead token after shifting the error token. */ goto yyerrlab1; @@ -605,101 +708,148 @@ b4_syncline([@oline@], [@ofile@])[ `---------------------------------------------------*/ yyerrorlab: - state_stack_.pop (len_); - semantic_stack_.pop (len_); - location_stack_.pop (len_); - state_ = state_stack_[0]; + /* Pacify compilers like GCC when the user code never invokes + YYERROR and the label yyerrorlab therefore never appears in user + code. */ + if (false) + goto yyerrorlab; + + yyerror_range[0] = yylocation_stack_[yylen - 1]; + yypop_ (yylen); + yystate = yystate_stack_[0]; goto yyerrlab1; /*-------------------------------------------------------------. | yyerrlab1 -- common code for both syntax error and YYERROR. | `-------------------------------------------------------------*/ yyerrlab1: - errstatus = 3; /* Each real token shifted decrements this. */ + yyerrstatus_ = 3; /* Each real token shifted decrements this. */ for (;;) { - n_ = pact_[state_]; - if (n_ != pact_ninf_) + yyn = yypact_[yystate]; + if (yyn != yypact_ninf_) { - n_ += terror_; - if (0 <= n_ && n_ <= last_ && check_[n_] == terror_) + yyn += yyterror_; + if (0 <= yyn && yyn <= yylast_ && yycheck_[yyn] == yyterror_) { - n_ = table_[n_]; - if (0 < n_) + yyn = yytable_[yyn]; + if (0 < yyn) break; } } /* Pop the current state because it cannot handle the error token. */ - if (state_stack_.height () == 1) + if (yystate_stack_.height () == 1) YYABORT; -#if YYDEBUG - if (debug_) - { - if (stos_[state_] < ntokens_) - { - YYCDEBUG << "Error: popping token " - << token_number_[stos_[state_]] - << " (" << name_[stos_[state_]]; -# ifdef YYPRINT - YYPRINT (stderr, token_number_[stos_[state_]], - semantic_stack_.top ()); -# endif - YYCDEBUG << ')' << std::endl; - } - else - { - YYCDEBUG << "Error: popping nonterminal (" - << name_[stos_[state_]] << ')' << std::endl; - } - } -#endif - - state_stack_.pop (); - semantic_stack_.pop (); - location_stack_.pop (); - state_ = state_stack_[0]; + yyerror_range[0] = yylocation_stack_[0]; + yydestruct_ ("Error: popping", + yystos_[yystate], + &yysemantic_stack_[0], &yylocation_stack_[0]); + yypop_ (); + yystate = yystate_stack_[0]; YY_STACK_PRINT (); } - if (n_ == final_) + if (yyn == yyfinal_) goto yyacceptlab; - YYCDEBUG << "Shifting error token, "; + yyerror_range[1] = yylloc; + // Using YYLLOC is tempting, but would change the location of + // the look-ahead. YYLOC is available though. + YYLLOC_DEFAULT (yyloc, yyerror_range - 1, 2); + yysemantic_stack_.push (yylval); + yylocation_stack_.push (yyloc); - semantic_stack_.push (value); - location_stack_.push (location); + /* Shift the error token. */ + YY_SYMBOL_PRINT ("Shifting", yystos_[yyn], + &yysemantic_stack_[0], &yylocation_stack_[0]); - state_ = n_; + yystate = yyn; goto yynewstate; /* Accept. */ - yyacceptlab: - return 0; +yyacceptlab: + yyresult = 0; + goto yyreturn; /* Abort. */ - yyabortlab: - return 1; +yyabortlab: + yyresult = 1; + goto yyreturn; + +yyreturn: + if (yychar != yyeof_ && yychar != yyempty_) + yydestruct_ ("Cleanup: discarding lookahead", yytoken, &yylval, &yylloc); + + while (yystate_stack_.height () != 1) + { + yydestruct_ ("Cleanup: popping", + yystos_[yystate_stack_[0]], + &yysemantic_stack_[0], + &yylocation_stack_[0]); + yypop_ (); + } + + return yyresult; } -void -yy::]b4_parser_class_name[::lex_ () +// Generate an error message. +std::string +yy::]b4_parser_class_name[::yysyntax_error_ (int yystate]dnl +b4_error_verbose_if([, int tok])[) { -#if YYLSP_NEEDED - looka_ = yylex (&value, &location); -#else - looka_ = yylex (&value); + std::string res; +#if YYERROR_VERBOSE + int yyn = yypact_[yystate]; + if (yypact_ninf_ < yyn && yyn < yylast_) + { + /* Start YYX at -YYN if negative to avoid negative indexes in + YYCHECK. */ + int yyxbegin = yyn < 0 ? -yyn : 0; + + /* Stay within bounds of both yycheck and yytname. */ + int yychecklim = yylast_ - yyn; + 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]); + } + } + } + else #endif + res = YY_("syntax error"); + return res; } /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing STATE-NUM. */ -const ]b4_int_type(b4_pact_ninf, b4_pact_ninf) yy::b4_parser_class_name::pact_ninf_ = b4_pact_ninf[; +const ]b4_int_type(b4_pact_ninf, b4_pact_ninf) yy::b4_parser_class_name::yypact_ninf_ = b4_pact_ninf[; const ]b4_int_type_for([b4_pact])[ -yy::]b4_parser_class_name[::pact_[] = +yy::]b4_parser_class_name[::yypact_[] = { ]b4_pact[ }; @@ -708,21 +858,21 @@ yy::]b4_parser_class_name[::pact_[] = doesn't specify something else to do. Zero means the default is an error. */ const ]b4_int_type_for([b4_defact])[ -yy::]b4_parser_class_name[::defact_[] = +yy::]b4_parser_class_name[::yydefact_[] = { ]b4_defact[ }; /* YYPGOTO[NTERM-NUM]. */ const ]b4_int_type_for([b4_pgoto])[ -yy::]b4_parser_class_name[::pgoto_[] = +yy::]b4_parser_class_name[::yypgoto_[] = { ]b4_pgoto[ }; /* YYDEFGOTO[NTERM-NUM]. */ const ]b4_int_type_for([b4_defgoto])[ -yy::]b4_parser_class_name[::defgoto_[] = +yy::]b4_parser_class_name[::yydefgoto_[] = { ]b4_defgoto[ }; @@ -730,33 +880,33 @@ yy::]b4_parser_class_name[::defgoto_[] = /* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If positive, shift that token. If negative, reduce the rule which number is the opposite. If zero, do what YYDEFACT says. */ -const ]b4_int_type(b4_table_ninf, b4_table_ninf) yy::b4_parser_class_name::table_ninf_ = b4_table_ninf[; +const ]b4_int_type(b4_table_ninf, b4_table_ninf) yy::b4_parser_class_name::yytable_ninf_ = b4_table_ninf[; const ]b4_int_type_for([b4_table])[ -yy::]b4_parser_class_name[::table_[] = +yy::]b4_parser_class_name[::yytable_[] = { ]b4_table[ }; /* YYCHECK. */ const ]b4_int_type_for([b4_check])[ -yy::]b4_parser_class_name[::check_[] = +yy::]b4_parser_class_name[::yycheck_[] = { ]b4_check[ }; -#if YYDEBUG /* STOS_[STATE-NUM] -- The (internal number of the) accessing symbol of state STATE-NUM. */ const ]b4_int_type_for([b4_stos])[ -yy::]b4_parser_class_name[::stos_[] = +yy::]b4_parser_class_name[::yystos_[] = { ]b4_stos[ }; -/* TOKEN_NUMBER_[YYLEX-NUM] -- Internal token number corresponding +#if YYDEBUG +/* TOKEN_NUMBER_[YYLEX-NUM] -- Internal symbol number corresponding to YYLEX-NUM. */ const ]b4_int_type_for([b4_toknum])[ -yy::]b4_parser_class_name[::token_number_[] = +yy::]b4_parser_class_name[::yytoken_number_[] = { ]b4_toknum[ }; @@ -764,23 +914,23 @@ yy::]b4_parser_class_name[::token_number_[] = /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */ const ]b4_int_type_for([b4_r1])[ -yy::]b4_parser_class_name[::r1_[] = +yy::]b4_parser_class_name[::yyr1_[] = { ]b4_r1[ }; /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */ const ]b4_int_type_for([b4_r2])[ -yy::]b4_parser_class_name[::r2_[] = +yy::]b4_parser_class_name[::yyr2_[] = { ]b4_r2[ }; -#if YYDEBUG || YYERROR_VERBOSE +#if YYDEBUG || YYERROR_VERBOSE || YYTOKEN_TABLE /* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM. - First, the terminals, then, starting at YYNTOKENS, nonterminals. */ + First, the terminals, then, starting at \a yyntokens_, nonterminals. */ const char* -const yy::]b4_parser_class_name[::name_[] = +const yy::]b4_parser_class_name[::yytname_[] = { ]b4_tname[ }; @@ -788,8 +938,8 @@ const yy::]b4_parser_class_name[::name_[] = #if YYDEBUG /* YYRHS -- A `-1'-separated list of the rules' RHS. */ -const yy::]b4_parser_class_name[::RhsNumberType -yy::]b4_parser_class_name[::rhs_[] = +const yy::]b4_parser_class_name[::rhs_number_type +yy::]b4_parser_class_name[::yyrhs_[] = { ]b4_rhs[ }; @@ -797,78 +947,76 @@ yy::]b4_parser_class_name[::rhs_[] = /* YYPRHS[YYN] -- Index of the first RHS symbol of rule number YYN in YYRHS. */ const ]b4_int_type_for([b4_prhs])[ -yy::]b4_parser_class_name[::prhs_[] = +yy::]b4_parser_class_name[::yyprhs_[] = { ]b4_prhs[ }; -/* YYRLINE[YYN] -- source line where rule number YYN was defined. */ +/* YYRLINE[YYN] -- Source line where rule number YYN was defined. */ const ]b4_int_type_for([b4_rline])[ -yy::]b4_parser_class_name[::rline_[] = +yy::]b4_parser_class_name[::yyrline_[] = { ]b4_rline[ }; -/** Print the state stack from its BOTTOM up to its TOP (included). */ - +// Print the state stack on the debug stream. void -yy::]b4_parser_class_name[::stack_print_ () +yy::]b4_parser_class_name[::yystack_print_ () { - cdebug_ << "state stack now"; - for (StateStack::ConstIterator i = state_stack_.begin (); - i != state_stack_.end (); ++i) - cdebug_ << ' ' << *i; - cdebug_ << std::endl; + *yycdebug_ << "Stack now"; + for (state_stack_type::const_iterator i = yystate_stack_.begin (); + i != yystate_stack_.end (); ++i) + *yycdebug_ << ' ' << *i; + *yycdebug_ << std::endl; } -/** Report that the YYRULE is going to be reduced. */ - +// Report on the debug stream that the rule \a yyrule is going to be reduced. void -yy::]b4_parser_class_name[::reduce_print_ (int yyrule) +yy::]b4_parser_class_name[::yyreduce_print_ (int yyrule) { - int yyi; - unsigned int yylno = rline_[yyrule]; + unsigned int yylno = yyrline_[yyrule]; /* Print the symbols being reduced, and their result. */ - cdebug_ << "Reducing via rule " << n_ - 1 << " (line " << yylno << "), "; - for (]b4_int_type_for([b4_prhs])[ i = prhs_[n_]; - 0 <= rhs_[i]; ++i) - cdebug_ << name_[rhs_[i]] << ' '; - cdebug_ << "-> " << name_[r1_[n_]] << std::endl; + *yycdebug_ << "Reducing stack by rule " << yyrule - 1 + << " (line " << yylno << "), "; + for (]b4_int_type_for([b4_prhs])[ i = yyprhs_[yyrule]; + 0 <= yyrhs_[i]; ++i) + *yycdebug_ << yytname_[yyrhs_[i]] << ' '; + *yycdebug_ << "-> " << yytname_[yyr1_[yyrule]] << std::endl; } #endif // YYDEBUG /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */ -yy::]b4_parser_class_name[::TokenNumberType -yy::]b4_parser_class_name[::translate_ (int token) +yy::]b4_parser_class_name[::token_number_type +yy::]b4_parser_class_name[::yytranslate_ (int token) { static - const TokenNumberType + const token_number_type translate_table[] = { ]b4_translate[ }; - if ((unsigned) token <= user_token_number_max_) + if ((unsigned int) token <= yyuser_token_number_max_) return translate_table[token]; else - return undef_token_; + return yyundef_token_; } -const int yy::]b4_parser_class_name[::eof_ = 0; -const int yy::]b4_parser_class_name[::last_ = ]b4_last[; -const int yy::]b4_parser_class_name[::nnts_ = ]b4_nterms_number[; -const int yy::]b4_parser_class_name[::empty_ = -2; -const int yy::]b4_parser_class_name[::final_ = ]b4_final_state_number[; -const int yy::]b4_parser_class_name[::terror_ = 1; -const int yy::]b4_parser_class_name[::errcode_ = 256; -const int yy::]b4_parser_class_name[::ntokens_ = ]b4_tokens_number[; +const int yy::]b4_parser_class_name[::yyeof_ = 0; +const int yy::]b4_parser_class_name[::yylast_ = ]b4_last[; +const int yy::]b4_parser_class_name[::yynnts_ = ]b4_nterms_number[; +const int yy::]b4_parser_class_name[::yyempty_ = -2; +const int yy::]b4_parser_class_name[::yyfinal_ = ]b4_final_state_number[; +const int yy::]b4_parser_class_name[::yyterror_ = 1; +const int yy::]b4_parser_class_name[::yyerrcode_ = 256; +const int yy::]b4_parser_class_name[::yyntokens_ = ]b4_tokens_number[; -const unsigned yy::]b4_parser_class_name[::user_token_number_max_ = ]b4_user_token_number_max[; -const yy::]b4_parser_class_name[::TokenNumberType yy::]b4_parser_class_name[::undef_token_ = ]b4_undef_token_number[; +const unsigned int yy::]b4_parser_class_name[::yyuser_token_number_max_ = ]b4_user_token_number_max[; +const yy::]b4_parser_class_name[::token_number_type yy::]b4_parser_class_name[::yyundef_token_ = ]b4_undef_token_number[; ]b4_epilogue dnl -@output stack.hh -b4_copyright([Stack handling for Bison C++ parsers], [2002, 2003])[ +@output b4_dir_prefix[]stack.hh +b4_copyright([stack handling for Bison C++ parsers], [2002, 2003, 2004, 2005])[ #ifndef BISON_STACK_HH # define BISON_STACK_HH @@ -877,32 +1025,33 @@ b4_copyright([Stack handling for Bison C++ parsers], [2002, 2003])[ namespace yy { - template < class T, class S = std::deque< T > > - class Stack + template > + class stack { public: - typedef typename S::iterator Iterator; - typedef typename S::const_iterator ConstIterator; + // Hide our reversed order. + typedef typename S::reverse_iterator iterator; + typedef typename S::const_reverse_iterator const_iterator; - Stack () : seq_ () + stack () : seq_ () { } - Stack (unsigned n) : seq_ (n) + stack (unsigned int n) : seq_ (n) { } inline T& - operator [] (unsigned i) + operator [] (unsigned int i) { return seq_[i]; } inline const T& - operator [] (unsigned i) const + operator [] (unsigned int i) const { return seq_[i]; } @@ -916,41 +1065,42 @@ namespace yy inline void - pop (unsigned n = 1) + pop (unsigned int n = 1) { for (; n; --n) seq_.pop_front (); } inline - unsigned + unsigned int height () const { return seq_.size (); } - inline ConstIterator begin () const { return seq_.begin (); } - inline ConstIterator end () const { return seq_.end (); } + inline const_iterator begin () const { return seq_.rbegin (); } + inline const_iterator end () const { return seq_.rend (); } private: S seq_; }; - template < class T, class S = Stack< T > > - class Slice + /// Present a slice of the top of a stack. + template > + class slice { public: - Slice (const S& stack, - unsigned range) : stack_ (stack), - range_ (range) + slice (const S& stack, + unsigned int range) : stack_ (stack), + range_ (range) { } inline const T& - operator [] (unsigned i) const + operator [] (unsigned int i) const { return stack_[range_ - i]; } @@ -958,230 +1108,9 @@ namespace yy private: const S& stack_; - unsigned range_; + unsigned int range_; }; } #endif // not BISON_STACK_HH] -dnl -@output position.hh -b4_copyright([Position class for Bison C++ parsers], [2002, 2003])[ - -/** - ** \file position.hh - ** Define the Location class. - */ - -#ifndef BISON_POSITION_HH -# define BISON_POSITION_HH - -# include -# include - -namespace yy -{ - /** \brief Abstract a Position. */ - class Position - { - public: - /** \brief Initial column number. */ - static const unsigned int initial_column = 0; - /** \brief Initial line number. */ - static const unsigned int initial_line = 1; - - /** \name Ctor & dtor. - ** \{ */ - public: - /** \brief Construct a Position. */ - Position () : - filename (), - line (initial_line), - column (initial_column) - { - } - /** \} */ - - - /** \name Line and Column related manipulators - ** \{ */ - public: - /** \brief (line related) Advance to the COUNT next lines. */ - inline void lines (int count = 1) - { - column = initial_column; - line += count; - } - - /** \brief (column related) Advance to the COUNT next columns. */ - inline void columns (int count = 1) - { - int leftmost = initial_column; - int current = column; - if (leftmost <= current + count) - column += count; - else - column = initial_column; - } - /** \} */ - - public: - /** \brief File name to which this position refers. */ - std::string filename; - /** \brief Current line number. */ - unsigned int line; - /** \brief Current column number. */ - unsigned int column; - }; - - /** \brief Add and assign a Position. */ - inline const Position& - operator+= (Position& res, const int width) - { - res.columns (width); - return res; - } - - /** \brief Add two Position objects. */ - inline const Position - operator+ (const Position& begin, const int width) - { - Position res = begin; - return res += width; - } - - /** \brief Add and assign a Position. */ - inline const Position& - operator-= (Position& res, const int width) - { - return res += -width; - } - - /** \brief Add two Position objects. */ - inline const Position - operator- (const Position& begin, const int width) - { - return begin + -width; - } - - /** \brief Intercept output stream redirection. - ** \param ostr the destination output stream - ** \param pos a reference to the Position to redirect - */ - inline std::ostream& - operator<< (std::ostream& ostr, const Position& pos) - { - if (!pos.filename.empty ()) - ostr << pos.filename << ':'; - return ostr << pos.line << '.' << pos.column; - } - -} -#endif // not BISON_POSITION_HH] -@output location.hh -b4_copyright([Location class for Bison C++ parsers], [2002, 2003])[ - -/** - ** \file location.hh - ** Define the Location class. - */ - -#ifndef BISON_LOCATION_HH -# define BISON_LOCATION_HH - -# include -# include -# include "position.hh" - -namespace yy -{ - - /** \brief Abstract a Location. */ - class Location - { - /** \name Ctor & dtor. - ** \{ */ - public: - /** \brief Construct a Location. */ - Location (void) : - begin (), - end () - { - } - /** \} */ - - - /** \name Line and Column related manipulators - ** \{ */ - public: - /** \brief Reset initial location to final location. */ - inline void step (void) - { - begin = end; - } - - /** \brief Extend the current location to the COUNT next columns. */ - inline void columns (unsigned int count = 1) - { - end += count; - } - - /** \brief Extend the current location to the COUNT next lines. */ - inline void lines (unsigned int count = 1) - { - end.lines (count); - } - /** \} */ - - - public: - /** \brief Beginning of the located region. */ - Position begin; - /** \brief End of the located region. */ - Position end; - }; - - /** \brief Join two Location objects to create a Location. */ - inline const Location operator+ (const Location& begin, const Location& end) - { - Location res = begin; - res.end = end.end; - return res; - } - - /** \brief Add two Location objects */ - inline const Location operator+ (const Location& begin, unsigned width) - { - Location res = begin; - res.columns (width); - return res; - } - - /** \brief Add and assign a Location */ - inline Location &operator+= (Location& res, unsigned width) - { - res.columns (width); - return res; - } - - /** \brief Intercept output stream redirection. - ** \param ostr the destination output stream - ** \param loc a reference to the Location to redirect - ** - ** Avoid duplicate information. - */ - inline std::ostream& operator<< (std::ostream& ostr, const Location& loc) - { - Position last = loc.end - 1; - ostr << loc.begin; - if (loc.begin.filename != last.filename) - ostr << '-' << last; - else if (loc.begin.line != last.line) - ostr << '-' << last.line << '.' << last.column; - else if (loc.begin.column != last.column) - ostr << '-' << last.column; - return ostr; - } - -} - -#endif // not BISON_LOCATION_HH] +m4_divert(-1)