X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/efeed023277585245908a7554eec5111137164ca..58b90cc2d82b068770bd38b5dff41e24a4bfeb37:/data/lalr1.cc diff --git a/data/lalr1.cc b/data/lalr1.cc index 52b823ed..bc1bec12 100644 --- a/data/lalr1.cc +++ b/data/lalr1.cc @@ -1,6 +1,8 @@ m4_divert(-1) + # C++ skeleton for Bison -# Copyright (C) 2002, 2003, 2004 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,97 +16,10 @@ 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], -[(yysemantic_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], -[(yylocation_stack_@{m4_eval([$1 - $2])@})]) - - -# b4_parse_param_decl -# ------------------- -# Extra formal arguments of the constructor. -# Change the parameter names from "foo" into "foo_yyarg", so that -# there is no collision bw the user chosen attribute name, and the -# argument name in the constructor. -m4_define([b4_parse_param_decl], -[m4_ifset([b4_parse_param], - [m4_map_sep([b4_parse_param_decl_1], [, ], [b4_parse_param])])]) - -m4_define([b4_parse_param_decl_1], -[$1_yyarg]) - - - -# b4_parse_param_cons -# ------------------- -# Extra initialisations of the constructor. -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_yyarg)]) - -# 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]) # We do want M4 expansion after # for CPP macros. m4_changecom() @@ -112,22 +27,25 @@ 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, 2004])[ + [2002, 2003, 2004, 2005])[ /* FIXME: This is wrong, we want computed header guards. 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 /* Using locations. */ #define YYLSP_NEEDED ]b4_locations_flag[ -]b4_token_defines(b4_tokens)[ +namespace yy +{ + class position; + class location; +} + +]b4_token_enums(b4_tokens)[ /* Copy the first part of user declarations. */ ]b4_pre_prologue[ @@ -135,19 +53,36 @@ b4_copyright([C++ Skeleton parser for LALR(1) parsing with Bison], ]/* Line __line__ of lalr1.cc. */ b4_syncline([@oline@], [@ofile@])[ +#include "stack.hh" +#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 +#if YYERROR_VERBOSE +# define YYERROR_VERBOSE_IF(x) x +#else +# define YYERROR_VERBOSE_IF(x) /* empty */ +#endif + +/* Enabling the token table. */ +#ifndef YYTOKEN_TABLE +# define YYTOKEN_TABLE ]b4_token_table[ +#endif + #if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED) ]m4_ifdef([b4_stype], -[b4_syncline([b4_stype_line], [b4_filename]) +[b4_syncline([b4_stype_line], [b4_file_name]) union YYSTYPE b4_stype; /* Line __line__ of lalr1.cc. */ b4_syncline([@oline@], [@ofile@])], @@ -183,48 +118,16 @@ do { \ namespace yy { - class ]b4_parser_class_name[; - template - 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 -{ /// A Bison parser. class ]b4_parser_class_name[ { - public: - /// Internal symbol numbers. - typedef Traits<]b4_parser_class_name[>::TokenNumberType TokenNumberType; - /// A type to store symbol numbers and -1. - typedef Traits<]b4_parser_class_name[>::RhsNumberType RhsNumberType; - /// State numbers. - typedef Traits<]b4_parser_class_name[>::StateType StateType; /// Symbol semantic values. - typedef Traits<]b4_parser_class_name[>::SemanticType SemanticType; + typedef YYSTYPE semantic_type; /// Symbol locations. - typedef Traits<]b4_parser_class_name[>::LocationType LocationType; - - /// State stack type. - typedef Stack StateStack; - /// Semantic value stack type. - typedef Stack SemanticStack; - /// Location stack type. - typedef Stack LocationStack; + typedef ]b4_location_type[ location_type; + public: /// Build a parser object. ]b4_parser_class_name[ (]b4_parse_param_decl[) : yydebug_ (false), @@ -253,17 +156,14 @@ namespace yy void set_debug_level (debug_level_type l); private: - - /// Call the scanner. - virtual void yylex_ (); - /// Report a syntax error. /// \param loc where the syntax error is found. /// \param msg a description of the syntax error. - virtual void error (const LocationType& loc, const std::string& msg); + virtual void error (const location_type& loc, const std::string& msg); - /// Generate an error message, and invoke error. - virtual void yyreport_syntax_error_ (); + /// Generate an error message. + /// \param tok the look-ahead token. + virtual std::string yysyntax_error_ (YYERROR_VERBOSE_IF (int tok)); #if YYDEBUG /// \brief Report a symbol on the debug stream. @@ -271,18 +171,29 @@ namespace yy /// \param yyvaluep Its semantic value. /// \param yylocationp Its location. virtual void yysymprint_ (int yytype, - const SemanticType* yyvaluep, - const LocationType* yylocationp); + 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. - StateStack yystate_stack_; + state_stack_type yystate_stack_; /// The semantic value stack. - SemanticStack yysemantic_stack_; + semantic_stack_type yysemantic_stack_; /// The location stack. - LocationStack yylocation_stack_; + location_stack_type yylocation_stack_; + /// Internal symbol numbers. + typedef ]b4_int_type_for([b4_translate])[ token_number_type; /* Tables. */ /// For a state, the index in \a yytable_ of its portion. static const ]b4_int_type_for([b4_pact])[ yypact_[]; @@ -314,14 +225,21 @@ namespace yy /// For a rule, its RHS length. static const ]b4_int_type_for([b4_r2])[ yyr2_[]; -#if YYDEBUG || YYERROR_VERBOSE +#if YYDEBUG || YYERROR_VERBOSE || YYTOKEN_TABLE /// For a symbol, its name in clear. - static const char* const yyname_[]; + 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 #if YYDEBUG + /// 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 RhsNumberType yyrhs_[]; + 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. @@ -335,7 +253,7 @@ namespace yy #endif /// Convert a scanner token number to a symbol number. - inline TokenNumberType yytranslate_ (int token); + inline token_number_type yytranslate_ (int token); /// \brief Reclaim the memory associated to a symbol. /// \param yymsg Why this token is reclaimed. @@ -344,8 +262,8 @@ namespace yy /// \param yylocationp Its location. inline void yydestruct_ (const char* yymsg, int yytype, - SemanticType* yyvaluep, - LocationType* yylocationp); + semantic_type* yyvaluep, + location_type* yylocationp); /// Pop \a n symbols the three stacks. inline void yypop_ (unsigned int n = 1); @@ -361,7 +279,7 @@ namespace yy static const int yyerrcode_; static const int yyntokens_; static const unsigned int yyuser_token_number_max_; - static const TokenNumberType yyundef_token_; + static const token_number_type yyundef_token_; /* State. */ int yyn_; @@ -376,21 +294,6 @@ namespace yy int yydebug_; std::ostream* yycdebug_; - /* Look-ahead and look-ahead in internal form. */ - int yylooka_; - int yyilooka_; - - /// Semantic value of the look-ahead. - SemanticType value; - /// Location of the look-ahead. - LocationType location; - /// The locations where the error started and ended. - Location yyerror_range_[2]; - - /// $$. - SemanticType yyval; - /// @@$. - LocationType yyloc; ]b4_parse_param_vars[ }; } @@ -399,7 +302,7 @@ namespace yy ])dnl @output @output_parser_name@ b4_copyright([C++ Skeleton parser for LALR(1) parsing with Bison], - [2002, 2003, 2004]) + [2002, 2003, 2004, 2005]) m4_if(b4_prefix[], [yy], [], [ // Take the name prefix into account. @@ -408,6 +311,18 @@ m4_if(b4_defines_flag, 0, [], [ #include @output_header_name@])[ +#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 + /* A pseudo ostream that takes yydebug_ into account. */ # define YYCDEBUG \ for (bool yydebugcond_ = yydebug_; yydebugcond_; yydebugcond_ = false) \ @@ -450,6 +365,47 @@ do { \ #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. | @@ -457,7 +413,7 @@ do { \ void yy::]b4_parser_class_name[::yysymprint_ (int yytype, - const SemanticType* yyvaluep, const LocationType* yylocationp) + const semantic_type* yyvaluep, const location_type* yylocationp) { /* Pacify ``unused variable'' warnings. */ (void) yyvaluep; @@ -467,7 +423,7 @@ yy::]b4_parser_class_name[::yysymprint_ (int yytype, (void) cdebug_; *yycdebug_ << (yytype < yyntokens_ ? "token" : "nterm") - << ' ' << yyname_[yytype] << " (" + << ' ' << yytname_[yytype] << " (" << *yylocationp << ": "; switch (yytype) { @@ -481,9 +437,10 @@ yy::]b4_parser_class_name[::yysymprint_ (int yytype, void yy::]b4_parser_class_name[::yydestruct_ (const char* yymsg, - int yytype, SemanticType* yyvaluep, LocationType* yylocationp) + int yytype, semantic_type* yyvaluep, location_type* yylocationp) { /* Pacify ``unused variable'' warnings. */ + (void) yymsg; (void) yyvaluep; (void) yylocationp; @@ -534,6 +491,24 @@ yy::]b4_parser_class_name[::set_debug_level (debug_level_type l) int yy::]b4_parser_class_name[::parse () { + /// Look-ahead and look-ahead in internal form. + int yychar; + int yytoken; + + /// 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; yynerrs_ = 0; @@ -541,11 +516,11 @@ yy::]b4_parser_class_name[::parse () /* Start. */ yystate_ = 0; - yylooka_ = yyempty_; + yychar = yyempty_; ]m4_ifdef([b4_initial_action], [ -m4_pushdef([b4_at_dollar], [location])dnl -m4_pushdef([b4_dollar_dollar], [value])dnl +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 @@ -557,11 +532,11 @@ b4_syncline([@oline@], [@ofile@])])dnl yynewstate, since the latter expects the semantical and the location values to have been already stored, initialize these stacks with a primary value. */ - yystate_stack_ = StateStack (0); - yysemantic_stack_ = SemanticStack (0); - yylocation_stack_ = LocationStack (0); - yysemantic_stack_.push (value); - yylocation_stack_.push (location); + 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: @@ -578,25 +553,32 @@ yybackup: goto yydefault; /* Read a look-ahead token. */ - if (yylooka_ == yyempty_) - yylex_ (); + if (yychar == yyempty_) + { + YYCDEBUG << "Reading a token: "; + 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 (yylooka_ <= yyeof_) + if (yychar <= yyeof_) { - yylooka_ = yyilooka_ = yyeof_; + yychar = yytoken = yyeof_; YYCDEBUG << "Now at end of input." << std::endl; } else { - yyilooka_ = yytranslate_ (yylooka_); - YY_SYMBOL_PRINT ("Next token is", yyilooka_, &value, &location); + yytoken = yytranslate_ (yychar); + YY_SYMBOL_PRINT ("Next token is", yytoken, &yylval, &yylloc); } /* If the proper action on seeing token ILOOKA_ is to reduce or to detect an error, take that action. */ - yyn_ += yyilooka_; - if (yyn_ < 0 || yylast_ < yyn_ || yycheck_[yyn_] != yyilooka_) + yyn_ += yytoken; + if (yyn_ < 0 || yylast_ < yyn_ || yycheck_[yyn_] != yytoken) goto yydefault; /* Reduce or error. */ @@ -619,14 +601,14 @@ yybackup: goto yyacceptlab; /* Shift the look-ahead token. */ - YY_SYMBOL_PRINT ("Shifting", yyilooka_, &value, &location); + YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc); /* Discard the token being shifted unless it is eof. */ - if (yylooka_ != yyeof_) - yylooka_ = yyempty_; + if (yychar != yyeof_) + yychar = yyempty_; - yysemantic_stack_.push (value); - yylocation_stack_.push (location); + yysemantic_stack_.push (yylval); + yylocation_stack_.push (yylloc); /* Count tokens shifted since error; after three, turn off error status. */ @@ -662,13 +644,14 @@ yyreduce: yyval = yysemantic_stack_[0]; { - Slice slice (yylocation_stack_, yylen_); + 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. */ @@ -696,36 +679,28 @@ b4_syncline([@oline@], [@ofile@])[ `------------------------------------*/ yyerrlab: /* If not already recovering from an error, report this error. */ - yyreport_syntax_error_ (); + if (!yyerrstatus_) + { + ++yynerrs_; + error (yylloc, yysyntax_error_ (YYERROR_VERBOSE_IF (yytoken))); + } - yyerror_range_[0] = location; + yyerror_range[0] = yylloc; if (yyerrstatus_ == 3) { /* If just tried and failed to reuse look-ahead token after an error, discard it. */ - /* Return failure if at end of input. */ - if (yylooka_ <= yyeof_) + if (yychar <= yyeof_) { - /* If at end of input, pop the error token, - then the rest of the stack, then return failure. */ - if (yylooka_ == yyeof_) - for (;;) - { - yyerror_range_[0] = yylocation_stack_[0]; - yypop_ (); - if (yystate_stack_.height () == 1) - YYABORT; - yydestruct_ ("Error: popping", - yystos_[yystate_stack_[0]], - &yysemantic_stack_[0], - &yylocation_stack_[0]); - } + /* Return failure if at end of input. */ + if (yychar == yyeof_) + YYABORT; } else { - yydestruct_ ("Error: discarding", yyilooka_, &value, &location); - yylooka_ = yyempty_; + yydestruct_ ("Error: discarding", yytoken, &yylval, &yylloc); + yychar = yyempty_; } } @@ -739,14 +714,13 @@ yyerrlab: `---------------------------------------------------*/ yyerrorlab: -#ifdef __GNUC__ - /* Pacify GCC when the user code never invokes YYERROR and the label - yyerrorlab therefore never appears in user code. */ - if (0) - goto yyerrorlab; -#endif + /* 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]; + yyerror_range[0] = yylocation_stack_[yylen_ - 1]; yypop_ (yylen_); yystate_ = yystate_stack_[0]; goto yyerrlab1; @@ -775,7 +749,7 @@ yyerrlab1: if (yystate_stack_.height () == 1) YYABORT; - yyerror_range_[0] = yylocation_stack_[0]; + yyerror_range[0] = yylocation_stack_[0]; yydestruct_ ("Error: popping", yystos_[yystate_], &yysemantic_stack_[0], &yylocation_stack_[0]); @@ -787,11 +761,11 @@ yyerrlab1: if (yyn_ == yyfinal_) goto yyacceptlab; - yyerror_range_[1] = location; - // Using LOCATION is tempting, but would change the location of + 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 (value); + YYLLOC_DEFAULT (yyloc, yyerror_range - 1, 2); + yysemantic_stack_.push (yylval); yylocation_stack_.push (yyloc); /* Shift the error token. */ @@ -803,70 +777,76 @@ yyerrlab1: /* Accept. */ yyacceptlab: - return 0; + yyresult_ = 0; + goto yyreturn; /* Abort. */ yyabortlab: - /* Free the lookahead. */ - yydestruct_ ("Error: discarding lookahead", yyilooka_, &value, &location); - yylooka_ = yyempty_; - return 1; -} + yyresult_ = 1; + goto yyreturn; -void -yy::]b4_parser_class_name[::yylex_ () -{ - YYCDEBUG << "Reading a token: "; -#if YYLSP_NEEDED - yylooka_ = yylex (&value, &location); -#else - yylooka_ = yylex (&value); -#endif +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_; } -// Generate an error message, and invoke error. -void -yy::]b4_parser_class_name[::yyreport_syntax_error_ () +// Generate an error message. +std::string +yy::]b4_parser_class_name[::yysyntax_error_ (YYERROR_VERBOSE_IF (int tok)) { - /* If not already recovering from an error, report this error. */ - if (!yyerrstatus_) - { - ++yynerrs_; - std::string message; + std::string res; #if YYERROR_VERBOSE - 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; + 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_) - ++count; - - message = "syntax error, unexpected "; - message += yyname_[yyilooka_]; - if (count < 5) - { - count = 0; - for (int x = yyxbegin; x < yyxend; ++x) - if (yycheck_[x + yyn_] == x && x != yyterror_) - { - message += (!count++) ? ", expecting " : " or "; - message += yyname_[x]; - } - } - } - else -#endif - message = "syntax error"; - error (location, message); + { + res += (!count++) ? ", expecting " : " or "; + res += yytnamerr_ (yytname_[x]); + } + } } + else +#endif + res = YY_("syntax error"); + return res; } @@ -951,11 +931,11 @@ 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 \a yyntokens_, nonterminals. */ const char* -const yy::]b4_parser_class_name[::yyname_[] = +const yy::]b4_parser_class_name[::yytname_[] = { ]b4_tname[ }; @@ -963,7 +943,7 @@ const yy::]b4_parser_class_name[::yyname_[] = #if YYDEBUG /* YYRHS -- A `-1'-separated list of the rules' RHS. */ -const yy::]b4_parser_class_name[::RhsNumberType +const yy::]b4_parser_class_name[::rhs_number_type yy::]b4_parser_class_name[::yyrhs_[] = { ]b4_rhs[ @@ -989,7 +969,7 @@ void yy::]b4_parser_class_name[::yystack_print_ () { *yycdebug_ << "Stack now"; - for (StateStack::const_iterator i = yystate_stack_.begin (); + for (state_stack_type::const_iterator i = yystate_stack_.begin (); i != yystate_stack_.end (); ++i) *yycdebug_ << ' ' << *i; *yycdebug_ << std::endl; @@ -1001,21 +981,21 @@ yy::]b4_parser_class_name[::yyreduce_print_ (int yyrule) { unsigned int yylno = yyrline_[yyrule]; /* Print the symbols being reduced, and their result. */ - *yycdebug_ << "Reducing stack by rule " << yyn_ - 1 - << " (line " << yylno << "), "; + *yycdebug_ << "Reducing stack by rule " << yyn_ - 1 + << " (line " << yylno << "), "; for (]b4_int_type_for([b4_prhs])[ i = yyprhs_[yyn_]; 0 <= yyrhs_[i]; ++i) - *yycdebug_ << yyname_[yyrhs_[i]] << ' '; - *yycdebug_ << "-> " << yyname_[yyr1_[yyn_]] << std::endl; + *yycdebug_ << yytname_[yyrhs_[i]] << ' '; + *yycdebug_ << "-> " << yytname_[yyr1_[yyn_]] << std::endl; } #endif // YYDEBUG /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */ -yy::]b4_parser_class_name[::TokenNumberType +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[ @@ -1036,12 +1016,12 @@ const int yy::]b4_parser_class_name[::yyerrcode_ = 256; const int yy::]b4_parser_class_name[::yyntokens_ = ]b4_tokens_number[; const unsigned int yy::]b4_parser_class_name[::yyuser_token_number_max_ = ]b4_user_token_number_max[; -const yy::]b4_parser_class_name[::TokenNumberType yy::]b4_parser_class_name[::yyundef_token_ = ]b4_undef_token_number[; +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, 2004])[ +b4_copyright([stack handling for Bison C++ parsers], [2002, 2003, 2004, 2005])[ #ifndef BISON_STACK_HH # define BISON_STACK_HH @@ -1051,7 +1031,7 @@ b4_copyright([Stack handling for Bison C++ parsers], [2002, 2003, 2004])[ namespace yy { template > - class Stack + class stack { public: @@ -1059,11 +1039,11 @@ namespace yy typedef typename S::reverse_iterator iterator; typedef typename S::const_reverse_iterator const_iterator; - Stack () : seq_ () + stack () : seq_ () { } - Stack (unsigned int n) : seq_ (n) + stack (unsigned int n) : seq_ (n) { } @@ -1111,12 +1091,13 @@ namespace yy S seq_; }; - template > - class Slice + /// Present a slice of the top of a stack. + template > + class slice { public: - Slice (const S& stack, + slice (const S& stack, unsigned int range) : stack_ (stack), range_ (range) { @@ -1139,11 +1120,11 @@ namespace yy #endif // not BISON_STACK_HH] dnl @output position.hh -b4_copyright([Position class for Bison C++ parsers], [2002, 2003, 2004])[ +b4_copyright([Position class for Bison C++ parsers], [2002, 2003, 2004, 2005])[ /** ** \file position.hh - ** Define the Location class. + ** Define the position class. */ #ifndef BISON_POSITION_HH @@ -1154,8 +1135,8 @@ b4_copyright([Position class for Bison C++ parsers], [2002, 2003, 2004])[ namespace yy { - /// Abstract a Position. - class Position + /// Abstract a position. + class position { public: /// Initial column number. @@ -1166,9 +1147,9 @@ namespace yy /** \name Ctor & dtor. ** \{ */ public: - /// Construct a Position. - Position () : - filename (), + /// Construct a position. + position () : + filename (0), line (initial_line), column (initial_column) { @@ -1200,63 +1181,63 @@ namespace yy public: /// File name to which this position refers. - std::string filename; + ]b4_filename_type[* filename; /// Current line number. unsigned int line; /// Current column number. unsigned int column; }; - /// Add and assign a Position. - inline const Position& - operator+= (Position& res, const int width) + /// Add and assign a position. + inline const position& + operator+= (position& res, const int width) { res.columns (width); return res; } - /// Add two Position objects. - inline const Position - operator+ (const Position& begin, const int width) + /// Add two position objects. + inline const position + operator+ (const position& begin, const int width) { - Position res = begin; + position res = begin; return res += width; } - /// Add and assign a Position. - inline const Position& - operator-= (Position& res, const int width) + /// Add and assign a position. + inline const position& + operator-= (position& res, const int width) { return res += -width; } - /// Add two Position objects. - inline const Position - operator- (const Position& begin, const int width) + /// 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 + ** \param pos a reference to the position to redirect */ inline std::ostream& - operator<< (std::ostream& ostr, const Position& pos) + operator<< (std::ostream& ostr, const position& pos) { - if (!pos.filename.empty ()) - ostr << pos.filename << ':'; + if (pos.filename) + 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, 2004])[ +b4_copyright([Location class for Bison C++ parsers], [2002, 2003, 2004, 2005])[ /** ** \file location.hh - ** Define the Location class. + ** Define the location class. */ #ifndef BISON_LOCATION_HH @@ -1269,14 +1250,14 @@ b4_copyright([Location class for Bison C++ parsers], [2002, 2003, 2004])[ namespace yy { - /// Abstract a Location. - class Location + /// Abstract a location. + class location { /** \name Ctor & dtor. ** \{ */ public: - /// Construct a Location. - Location (void) : + /// Construct a location. + location () : begin (), end () { @@ -1288,7 +1269,7 @@ namespace yy ** \{ */ public: /// Reset initial location to final location. - inline void step (void) + inline void step () { begin = end; } @@ -1309,29 +1290,29 @@ namespace yy public: /// Beginning of the located region. - Position begin; + position begin; /// End of the located region. - Position end; + position end; }; - /// Join two Location objects to create a Location. - inline const Location operator+ (const Location& begin, const Location& end) + /// Join two location objects to create a location. + inline const location operator+ (const location& begin, const location& end) { - Location res = begin; + location res = begin; res.end = end.end; return res; } - /// Add two Location objects. - inline const Location operator+ (const Location& begin, unsigned int width) + /// Add two location objects. + inline const location operator+ (const location& begin, unsigned int width) { - Location res = begin; + location res = begin; res.columns (width); return res; } - /// Add and assign a Location. - inline Location& operator+= (Location& res, unsigned int width) + /// Add and assign a location. + inline location& operator+= (location& res, unsigned int width) { res.columns (width); return res; @@ -1339,15 +1320,17 @@ namespace yy /** \brief Intercept output stream redirection. ** \param ostr the destination output stream - ** \param loc a reference to the Location to redirect + ** \param loc a reference to the location to redirect ** ** Avoid duplicate information. */ - inline std::ostream& operator<< (std::ostream& ostr, const Location& loc) + inline std::ostream& operator<< (std::ostream& ostr, const location& loc) { - Position last = loc.end - 1; + position last = loc.end - 1; ostr << loc.begin; - if (loc.begin.filename != last.filename) + if (last.filename + && (!loc.begin.filename + || *loc.begin.filename != *last.filename)) ostr << '-' << last; else if (loc.begin.line != last.line) ostr << '-' << last.line << '.' << last.column;