X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/9e0876fb0cd09964f07046749a320855e78560ef..b50d2359d7608270561abd5c3cbf6e84834c2019:/data/lalr1.cc diff --git a/data/lalr1.cc b/data/lalr1.cc index e492173a..c00de055 100644 --- a/data/lalr1.cc +++ b/data/lalr1.cc @@ -19,95 +19,8 @@ m4_divert(-1) # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA # 02110-1301 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]) -m4_define_default([b4_filename_type], [std::string]) - -# 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;]) - - +m4_include(b4_pkgdatadir/[c++.m4]) +m4_include(b4_pkgdatadir/[location.cc]) # We do want M4 expansion after # for CPP macros. m4_changecom() @@ -115,17 +28,16 @@ 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, 2005])[ -/* 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 #include - -/* Using locations. */ -#define YYLSP_NEEDED ]b4_locations_flag[ +#include "stack.hh" namespace yy { @@ -133,44 +45,33 @@ namespace yy class location; } -]b4_token_defines(b4_tokens)[ - -/* Copy the first part of user declarations. */ +/* First part of user declarations. */ ]b4_pre_prologue[ ]/* Line __line__ of lalr1.cc. */ b4_syncline([@oline@], [@ofile@])[ -#include "stack.hh" -#include "location.hh" +]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 -#if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED) -]m4_ifdef([b4_stype], -[b4_syncline([b4_stype_line], [b4_filename]) -union YYSTYPE b4_stype; -/* Line __line__ of lalr1.cc. */ -b4_syncline([@oline@], [@ofile@])], -[typedef int YYSTYPE;])[ -# define yystype YYSTYPE /* obsolescent; will be withdrawn */ -# define YYSTYPE_IS_DECLARED 1 -# define YYSTYPE_IS_TRIVIAL 1 +/* Enabling the token table. */ +#ifndef YYTOKEN_TABLE +# define YYTOKEN_TABLE ]b4_token_table[ #endif -/* Copy the second part of user declarations. */ -]b4_post_prologue[ - -]/* Line __line__ of lalr1.cc. */ -b4_syncline([@oline@], [@ofile@])[ /* 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). */ @@ -192,35 +93,30 @@ 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])[ token_number_type; - typedef ]b4_int_type_for([b4_rhs])[ rhs_number_type; - typedef int state_type; - typedef YYSTYPE semantic_type; - typedef ]b4_location_type[ location_type; - }; -} - -namespace yy -{ /// A Bison parser. class ]b4_parser_class_name[ { + public: /// Symbol semantic values. - typedef traits<]b4_parser_class_name[>::semantic_type semantic_type; +#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 + typedef YYSTYPE semantic_type; +#endif /// Symbol locations. - typedef traits<]b4_parser_class_name[>::location_type location_type; + typedef ]b4_location_type[ location_type; + /// Tokens. + struct token + { + ]b4_token_enums(b4_tokens)[ + }; - public: /// Build a parser object. ]b4_parser_class_name[ (]b4_parse_param_decl[) : yydebug_ (false), @@ -249,17 +145,16 @@ 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 location_type& loc, const std::string& msg); - /// Generate an error message, and invoke error. - virtual void yyreport_syntax_error_ (); + /// 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. @@ -273,7 +168,7 @@ namespace yy /// State numbers. - typedef traits<]b4_parser_class_name[>::state_type state_type; + typedef int state_type; /// State stack type. typedef stack state_stack_type; /// Semantic value stack type. @@ -289,7 +184,7 @@ namespace yy location_stack_type yylocation_stack_; /// Internal symbol numbers. - typedef traits<]b4_parser_class_name[>::token_number_type token_number_type; + 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_[]; @@ -321,7 +216,7 @@ 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 yytname_[]; #endif @@ -333,7 +228,7 @@ namespace yy #if YYDEBUG /// A type to store symbol numbers and -1. - typedef traits<]b4_parser_class_name[>::rhs_number_type rhs_number_type; + 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_. @@ -377,38 +272,22 @@ namespace yy static const unsigned int yyuser_token_number_max_; static const token_number_type yyundef_token_; - /* State. */ - int yyn_; - int yylen_; - int yystate_; - - /* Error handling. */ - int yynerrs_; - int yyerrstatus_; - /* Debugging. */ int yydebug_; std::ostream* yycdebug_; - /* Look-ahead and look-ahead in internal form. */ - int yylooka_; - int yyilooka_; - - /// 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; ]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@ @@ -422,6 +301,12 @@ 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 @@ -602,16 +487,34 @@ yy::]b4_parser_class_name[::set_debug_level (debug_level_type l) int yy::]b4_parser_class_name[::parse () { - int yyresult_; + /// Look-ahead and look-ahead in internal form. + int yychar = yyempty_; + int yytoken = 0; - YYCDEBUG << "Starting parse" << std::endl; + /* State. */ + int yyn; + int yylen; + int yystate = 0; + + /* Error handling. */ + int yynerrs_ = 0; + int yyerrstatus_ = 0; - yynerrs_ = 0; - 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]; - /* Start. */ - yystate_ = 0; - yylooka_ = yyempty_; + /// $$. + 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 @@ -635,65 +538,67 @@ b4_syncline([@oline@], [@ofile@])])dnl /* New state. */ yynewstate: - yystate_stack_.push (yystate_); - YYCDEBUG << "Entering state " << yystate_ << std::endl; + yystate_stack_.push (yystate); + YYCDEBUG << "Entering state " << yystate << std::endl; goto yybackup; /* Backup. */ yybackup: /* Try to take a decision without look-ahead. */ - yyn_ = yypact_[yystate_]; - if (yyn_ == yypact_ninf_) + yyn = yypact_[yystate]; + if (yyn == yypact_ninf_) 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_, &yylval, &yylloc); + 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 + /* If the proper action on seeing token YYTOKEN 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. */ - yyn_ = yytable_[yyn_]; - if (yyn_ < 0) + yyn = yytable_[yyn]; + if (yyn <= 0) { - if (yyn_ == yytable_ninf_) + if (yyn == 0 || yyn == yytable_ninf_) goto yyerrlab; - else - { - yyn_ = -yyn_; - goto yyreduce; - } + yyn = -yyn; + goto yyreduce; } - else if (yyn_ == 0) - goto yyerrlab; /* Accept? */ - if (yyn_ == yyfinal_) + if (yyn == yyfinal_) goto yyacceptlab; /* Shift the look-ahead token. */ - YY_SYMBOL_PRINT ("Shifting", yyilooka_, &yylval, &yylloc); + 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 (yylval); yylocation_stack_.push (yylloc); @@ -703,15 +608,15 @@ yybackup: if (yyerrstatus_) --yyerrstatus_; - yystate_ = yyn_; + yystate = yyn; goto yynewstate; /*-----------------------------------------------------------. | yydefault -- do the default action for the current state. | `-----------------------------------------------------------*/ yydefault: - yyn_ = yydefact_[yystate_]; - if (yyn_ == 0) + yyn = yydefact_[yystate]; + if (yyn == 0) goto yyerrlab; goto yyreduce; @@ -719,24 +624,24 @@ yydefault: | yyreduce -- Do a reduction. | `-----------------------------*/ yyreduce: - yylen_ = yyr2_[yyn_]; + 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 (yylen_) - yyval = yysemantic_stack_[yylen_ - 1]; + if (yylen) + yyval = yysemantic_stack_[yylen - 1]; else yyval = yysemantic_stack_[0]; { - slice slice (yylocation_stack_, yylen_); - YYLLOC_DEFAULT (yyloc, slice, yylen_); + slice slice (yylocation_stack_, yylen); + YYLLOC_DEFAULT (yyloc, slice, yylen); } - YY_REDUCE_PRINT (yyn_); - switch (yyn_) + YY_REDUCE_PRINT (yyn); + switch (yyn) { ]b4_actions[ default: break; @@ -745,7 +650,7 @@ yyreduce: ]/* Line __line__ of lalr1.cc. */ b4_syncline([@oline@], [@ofile@])[ - yypop_ (yylen_); + yypop_ (yylen); YY_STACK_PRINT (); @@ -753,13 +658,13 @@ b4_syncline([@oline@], [@ofile@])[ yylocation_stack_.push (yyloc); /* Shift the result of the reduction. */ - yyn_ = yyr1_[yyn_]; - yystate_ = yypgoto_[yyn_ - yyntokens_] + yystate_stack_[0]; - if (0 <= yystate_ && yystate_ <= yylast_ - && yycheck_[yystate_] == yystate_stack_[0]) - yystate_ = yytable_[yystate_]; + yyn = yyr1_[yyn]; + yystate = yypgoto_[yyn - yyntokens_] + yystate_stack_[0]; + if (0 <= yystate && yystate <= yylast_ + && yycheck_[yystate] == yystate_stack_[0]) + yystate = yytable_[yystate]; else - yystate_ = yydefgoto_[yyn_ - yyntokens_]; + yystate = yydefgoto_[yyn - yyntokens_]; goto yynewstate; /*------------------------------------. @@ -767,24 +672,29 @@ 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_ (yystate]dnl +b4_error_verbose_if([, yytoken])[)); + } - yyerror_range_[0] = yylloc; + yyerror_range[0] = yylloc; if (yyerrstatus_ == 3) { /* If just tried and failed to reuse look-ahead token after an error, discard it. */ - if (yylooka_ <= yyeof_) + if (yychar <= yyeof_) { /* Return failure if at end of input. */ - if (yylooka_ == yyeof_) + if (yychar == yyeof_) YYABORT; } else { - yydestruct_ ("Error: discarding", yyilooka_, &yylval, &yylloc); - yylooka_ = yyempty_; + yydestruct_ ("Error: discarding", yytoken, &yylval, &yylloc); + yychar = yyempty_; } } @@ -804,9 +714,9 @@ yyerrorlab: if (false) goto yyerrorlab; - yyerror_range_[0] = yylocation_stack_[yylen_ - 1]; - yypop_ (yylen_); - yystate_ = yystate_stack_[0]; + yyerror_range[0] = yylocation_stack_[yylen - 1]; + yypop_ (yylen); + yystate = yystate_stack_[0]; goto yyerrlab1; /*-------------------------------------------------------------. @@ -817,14 +727,14 @@ yyerrlab1: for (;;) { - yyn_ = yypact_[yystate_]; - if (yyn_ != yypact_ninf_) + yyn = yypact_[yystate]; + if (yyn != yypact_ninf_) { - yyn_ += yyterror_; - if (0 <= yyn_ && yyn_ <= yylast_ && yycheck_[yyn_] == yyterror_) + yyn += yyterror_; + if (0 <= yyn && yyn <= yylast_ && yycheck_[yyn] == yyterror_) { - yyn_ = yytable_[yyn_]; - if (0 < yyn_) + yyn = yytable_[yyn]; + if (0 < yyn) break; } } @@ -833,119 +743,105 @@ yyerrlab1: if (yystate_stack_.height () == 1) YYABORT; - yyerror_range_[0] = yylocation_stack_[0]; + yyerror_range[0] = yylocation_stack_[0]; yydestruct_ ("Error: popping", - yystos_[yystate_], + yystos_[yystate], &yysemantic_stack_[0], &yylocation_stack_[0]); yypop_ (); - yystate_ = yystate_stack_[0]; + yystate = yystate_stack_[0]; YY_STACK_PRINT (); } - if (yyn_ == yyfinal_) + if (yyn == yyfinal_) goto yyacceptlab; - yyerror_range_[1] = yylloc; + 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); + YYLLOC_DEFAULT (yyloc, yyerror_range - 1, 2); yysemantic_stack_.push (yylval); yylocation_stack_.push (yyloc); /* Shift the error token. */ - YY_SYMBOL_PRINT ("Shifting", yystos_[yyn_], + YY_SYMBOL_PRINT ("Shifting", yystos_[yyn], &yysemantic_stack_[0], &yylocation_stack_[0]); - yystate_ = yyn_; + yystate = yyn; goto yynewstate; /* Accept. */ yyacceptlab: - yyresult_ = 0; + yyresult = 0; goto yyreturn; /* Abort. */ yyabortlab: - yyresult_ = 1; + yyresult = 1; goto yyreturn; yyreturn: - if (yylooka_ != yyeof_ && yylooka_ != yyempty_) - yydestruct_ ("Error: discarding lookahead", yyilooka_, &yylval, &yylloc); + if (yychar != yyeof_ && yychar != yyempty_) + yydestruct_ ("Cleanup: discarding lookahead", yytoken, &yylval, &yylloc); while (yystate_stack_.height () != 1) { - yydestruct_ ("Error: popping", + yydestruct_ ("Cleanup: popping", yystos_[yystate_stack_[0]], &yysemantic_stack_[0], &yylocation_stack_[0]); yypop_ (); } - return yyresult_; -} - -void -yy::]b4_parser_class_name[::yylex_ () -{ - YYCDEBUG << "Reading a token: "; - yylooka_ = ]b4_c_function_call([yylex], [int], -[[YYSTYPE*], [&yylval]][]dnl -b4_location_if([, [[location*], [&yylloc]]])dnl -m4_ifdef([b4_lex_param], [, ]b4_lex_param))[; + 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_ (int yystate]dnl +b4_error_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; + 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_) - ++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_[yyilooka_], etc. - // Until this gets fixed, this message appears in English only. - message = "syntax error, unexpected "; - message += yytnamerr_ (yytname_[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 += yytnamerr_ (yytname_[x]); - } - } - } - else -#endif - message = YY_("syntax error"); - error (yylloc, message); + if (yycheck_[x + yyn] == x && x != yyterror_) + { + res += (!count++) ? ", expecting " : " or "; + res += yytnamerr_ (yytname_[x]); + } + } } + else +#endif + res = YY_("syntax error"); + return res; } @@ -1030,7 +926,7 @@ 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* @@ -1080,12 +976,12 @@ 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 + *yycdebug_ << "Reducing stack by rule " << yyrule - 1 << " (line " << yylno << "), "; - for (]b4_int_type_for([b4_prhs])[ i = yyprhs_[yyn_]; + for (]b4_int_type_for([b4_prhs])[ i = yyprhs_[yyrule]; 0 <= yyrhs_[i]; ++i) *yycdebug_ << yytname_[yyrhs_[i]] << ' '; - *yycdebug_ << "-> " << yytname_[yyr1_[yyn_]] << std::endl; + *yycdebug_ << "-> " << yytname_[yyr1_[yyrule]] << std::endl; } #endif // YYDEBUG @@ -1119,7 +1015,7 @@ const yy::]b4_parser_class_name[::token_number_type yy::]b4_parser_class_name[:: ]b4_epilogue dnl -@output stack.hh +@output b4_dir_prefix[]stack.hh b4_copyright([stack handling for Bison C++ parsers], [2002, 2003, 2004, 2005])[ #ifndef BISON_STACK_HH @@ -1217,227 +1113,4 @@ namespace yy } #endif // not BISON_STACK_HH] -dnl -@output position.hh -b4_copyright([Position class for Bison C++ parsers], [2002, 2003, 2004, 2005])[ - -/** - ** \file position.hh - ** Define the position class. - */ - -#ifndef BISON_POSITION_HH -# define BISON_POSITION_HH - -# include -# include - -namespace yy -{ - /// Abstract a position. - class position - { - public: - /// Initial column number. - static const unsigned int initial_column = 0; - /// Initial line number. - static const unsigned int initial_line = 1; - - /** \name Ctor & dtor. - ** \{ */ - public: - /// Construct a position. - position () : - filename (0), - line (initial_line), - column (initial_column) - { - } - /** \} */ - - - /** \name Line and Column related manipulators - ** \{ */ - public: - /// (line related) Advance to the COUNT next lines. - inline void lines (int count = 1) - { - column = initial_column; - line += count; - } - - /// (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: - /// File name to which this position refers. - ]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) - { - res.columns (width); - return res; - } - - /// Add two position objects. - inline const position - operator+ (const position& begin, const int width) - { - position res = begin; - return res += 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) - { - 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) - 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, 2005])[ - -/** - ** \file location.hh - ** Define the location class. - */ - -#ifndef BISON_LOCATION_HH -# define BISON_LOCATION_HH - -# include -# include -# include "position.hh" - -namespace yy -{ - - /// Abstract a location. - class location - { - /** \name Ctor & dtor. - ** \{ */ - public: - /// Construct a location. - location () : - begin (), - end () - { - } - /** \} */ - - - /** \name Line and Column related manipulators - ** \{ */ - public: - /// Reset initial location to final location. - inline void step () - { - begin = end; - } - - /// Extend the current location to the COUNT next columns. - inline void columns (unsigned int count = 1) - { - end += count; - } - - /// Extend the current location to the COUNT next lines. - inline void lines (unsigned int count = 1) - { - end.lines (count); - } - /** \} */ - - - public: - /// Beginning of the located region. - position begin; - /// End of the located region. - position end; - }; - - /// 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; - } - - /// Add two location objects. - inline const location operator+ (const location& begin, unsigned int width) - { - location res = begin; - res.columns (width); - return res; - } - - /// Add and assign a location. - inline location& operator+= (location& res, unsigned int 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 (last.filename - && (!loc.begin.filename - || *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)