X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/3ae831b4137245b9f7015f45223ca9abf35f25c1..fc8f2965383e318c8be2a20865edb7303f0420ee:/data/lalr1.cc diff --git a/data/lalr1.cc b/data/lalr1.cc index a2329e3a..4fe3c2ad 100644 --- a/data/lalr1.cc +++ b/data/lalr1.cc @@ -1,6 +1,6 @@ m4_divert(-1) # C++ skeleton for Bison -# Copyright (C) 2002 Free Software Foundation, Inc. +# Copyright (C) 2002, 2003 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 @@ -21,9 +21,6 @@ m4_divert(-1) ## Default values. ## ## ---------------- ## -# Stack parameters. -m4_define_default([b4_stack_depth_init], [200]) - # Default Parser class name. m4_define_default([b4_parser_class_name], [Parser]) @@ -84,12 +81,46 @@ m4_define([b4_constructor], [])]) +# 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;]) + # We do want M4 expansion after # for CPP macros. m4_changecom() m4_divert(0)dnl -@output @output_header_name@ +m4_if(b4_defines_flag, 0, [], +[@output @output_header_name@ b4_copyright([C++ Skeleton parser for LALR(1) parsing with Bison], - [2002])[ + [2002, 2003])[ /* FIXME: This is wrong, we want computed header guards. I don't know why the macros are missing now. :( */ #ifndef PARSER_HEADER_H @@ -139,8 +170,7 @@ b4_syncline([@oline@], [@ofile@])], b4_syncline([@oline@], [@ofile@])[ #ifndef YYLLOC_DEFAULT # define YYLLOC_DEFAULT(Current, Rhs, N) \ - Current.last_line = Rhs[N].last_line; \ - Current.last_column = Rhs[N].last_column; + ((Current).end = Rhs[N].end) #endif namespace yy @@ -181,14 +211,14 @@ namespace yy #if YYLSP_NEEDED ]b4_parser_class_name[ (bool debug, - LocationType initlocation][]b4_param[) : + LocationType initlocation][]b4_param[]b4_parse_param_decl[) : ]b4_constructor[][debug_ (debug), cdebug_ (std::cerr), - initlocation_ (initlocation) + initlocation_ (initlocation)]b4_parse_param_cons[ #else - ]b4_parser_class_name[ (bool debug][]b4_param[) : + ]b4_parser_class_name[ (bool debug][]b4_param[]b4_parse_param_decl[) : ]b4_constructor[][debug_ (debug), - cdebug_ (std::cerr) + cdebug_ (std::cerr)]b4_parse_param_cons[ #endif { } @@ -204,6 +234,7 @@ namespace yy virtual void lex_ (); virtual void error_ (); virtual void print_ (); + virtual void report_syntax_error_ (); /* Stacks. */ StateStack state_stack_; @@ -212,12 +243,12 @@ namespace yy /* Tables. */ static const ]b4_int_type_for([b4_pact])[ pact_[]; - static const ]b4_int_type_for([b4_pact])[ pact_ninf_; + 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_for([b4_table])[ table_ninf_; + 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_[]; @@ -233,6 +264,8 @@ namespace yy 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_ (); #endif /* Even more tables. */ @@ -248,7 +281,6 @@ namespace yy static const int terror_; static const int errcode_; static const int ntokens_; - static const int initdepth_; static const unsigned user_token_number_max_; static const TokenNumberType undef_token_; @@ -257,6 +289,10 @@ namespace yy int len_; int state_; + /* Error handling. */ + int nerrs_; + int errstatus_; + /* Debugging. */ int debug_; std::ostream &cdebug_; @@ -278,29 +314,47 @@ namespace yy /* Initial location. */ LocationType initlocation_; +]b4_parse_param_vars[ }; } #endif /* ! defined PARSER_HEADER_H */] -dnl +])dnl @output @output_parser_name@ b4_copyright([C++ Skeleton parser for LALR(1) parsing with Bison], - [2002])[ + [2002, 2003]) -#include @output_header_name@ +m4_if(b4_defines_flag, 0, [], [#include @output_header_name@])[ /* Enable debugging if requested. */ #if YYDEBUG # define YYCDEBUG if (debug_) cdebug_ +# define YY_REDUCE_PRINT(Rule) \ +do { \ + if (debug_) \ + reduce_print_ (Rule); \ +} while (0) +# define YY_STACK_PRINT() \ +do { \ + if (debug_) \ + stack_print_ (); \ +} while (0) #else /* !YYDEBUG */ # define YYCDEBUG if (0) cdebug_ +# define YY_REDUCE_PRINT(Rule) +# define YY_STACK_PRINT() #endif /* !YYDEBUG */ +#define YYACCEPT goto yyacceptlab +#define YYABORT goto yyabortlab +#define YYERROR goto yyerrorlab + + int yy::]b4_parser_class_name[::parse () { - int nerrs = 0; - int errstatus = 0; + nerrs_ = 0; + errstatus_ = 0; /* Initialize the stacks. The initial state will be pushed in yynewstate, since the latter expects the semantical and the @@ -360,6 +414,8 @@ yy::]b4_parser_class_name[::parse () #endif } + /* 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_) goto yydefault; @@ -384,8 +440,10 @@ yy::]b4_parser_class_name[::parse () goto yyacceptlab; /* Shift the lookahead token. */ +#if YYDEBUG YYCDEBUG << "Shifting token " << looka_ - << " (" << name_[ilooka_] << "), "; + << " (" << name_[ilooka_] << "), "; +#endif /* Discard the token being shifted unless it is eof. */ if (looka_ != eof_) @@ -396,22 +454,32 @@ yy::]b4_parser_class_name[::parse () /* Count tokens shifted since error; after three, turn off error status. */ - if (errstatus) - --errstatus; + if (errstatus_) + --errstatus_; state_ = n_; goto yynewstate; - /* Default action. */ +/*-----------------------------------------------------------. +| yydefault -- do the default action for the current state. | +`-----------------------------------------------------------*/ yydefault: n_ = defact_[state_]; if (n_ == 0) goto yyerrlab; goto yyreduce; - /* Reduce. */ +/*-----------------------------. +| yyreduce -- Do a reduction. | +`-----------------------------*/ yyreduce: len_ = r2_[n_]; + /* 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]; @@ -423,24 +491,12 @@ yy::]b4_parser_class_name[::parse () yyloc = location_stack_[0]; } -#if YYDEBUG - if (debug_) - { - YYCDEBUG << "Reducing via rule " << n_ - 1 - << " (line " << rline_[n_] << "), "; - for (]b4_int_type_for([b4_prhs])[ i = prhs_[n_]; - 0 <= rhs_[i]; ++i) - YYCDEBUG << name_[rhs_[i]] << ' '; - YYCDEBUG << "-> " << name_[r1_[n_]] << std::endl; - } -#endif - if (len_) { Slice< LocationType, LocationStack > slice (location_stack_, len_); YYLLOC_DEFAULT (yyloc, slice, len_); } - + YY_REDUCE_PRINT (n_); switch (n_) { ]b4_actions[ @@ -453,16 +509,7 @@ b4_syncline([@oline@], [@ofile@])[ semantic_stack_.pop (len_); location_stack_.pop (len_); -#if YYDEBUG - if (debug_) - { - YYCDEBUG << "state stack now"; - for (StateStack::ConstIterator i = state_stack_.begin (); - i != state_stack_.end (); ++i) - YYCDEBUG << ' ' << *i; - YYCDEBUG << std::endl; - } -#endif + YY_STACK_PRINT (); semantic_stack_.push (yyval); location_stack_.push (yyloc); @@ -476,62 +523,74 @@ b4_syncline([@oline@], [@ofile@])[ state_ = defgoto_[n_ - ntokens_]; goto yynewstate; - /* Report and recover from errors. This is very incomplete. */ +/*------------------------------------. +| yyerrlab -- here on detecting error | +`------------------------------------*/ yyerrlab: /* If not already recovering from an error, report this error. */ - if (!errstatus) - { - ++nerrs; + report_syntax_error_ (); -#if YYERROR_VERBOSE - n_ = pact_[state_]; - if (pact_ninf_ < n_ && n_ < last_) - { - message = "syntax error, unexpected "; - message += name_[ilooka_]; - { - int count = 0; - for (int x = (n_ < 0 ? -n_ : 0); x < ntokens_ + nnts_; ++x) - if (check_[x + n_] == x && x != terror_) - ++count; - if (count < 5) - { - count = 0; - for (int x = (n_ < 0 ? -n_ : 0); x < ntokens_ + nnts_; ++x) - if (check_[x + n_] == x && x != terror_) - { - message += (!count++) ? ", expecting " : " or "; - message += name_[x]; - } - } - } - } - else -#endif - message = "syntax error"; - error_ (); - } - goto yyerrlab1; - - /* Error raised explicitly by an action. */ - yyerrlab1: - if (errstatus == 3) + if (errstatus_ == 3) { /* If just tried and failed to reuse lookahead token after an error, discard it. */ /* Return failure if at end of input. */ - if (looka_ == eof_) - goto yyabortlab; - YYCDEBUG << "Discarding token " << looka_ - << " (" << name_[ilooka_] << ")." << std::endl; - looka_ = empty_; + if (looka_ <= eof_) + { + /* 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])[); + } + } + else + { +#if YYDEBUG + YYCDEBUG << "Discarding token " << looka_ + << " (" << name_[ilooka_] << ")." << std::endl; +// yydestruct (yytoken, &yylval]b4_location_if([, &yylloc])[); +#endif + looka_ = empty_; + } } /* Else will try to reuse lookahead token after shifting the error token. */ + goto yyerrlab1; + + +/*---------------------------------------------------. +| yyerrorlab -- error raised explicitly by YYERROR. | +`---------------------------------------------------*/ +yyerrorlab: - errstatus = 3; +#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 + + state_stack_.pop (len_); + semantic_stack_.pop (len_); + location_stack_.pop (len_); + state_ = state_stack_[0]; + goto yyerrlab1; + +/*-------------------------------------------------------------. +| yyerrlab1 -- common code for both syntax error and YYERROR. | +`-------------------------------------------------------------*/ +yyerrlab1: + errstatus_ = 3; /* Each real token shifted decrements this. */ for (;;) { @@ -549,7 +608,7 @@ b4_syncline([@oline@], [@ofile@])[ /* Pop the current state because it cannot handle the error token. */ if (state_stack_.height () == 1) - goto yyabortlab; + YYABORT; #if YYDEBUG if (debug_) @@ -573,20 +632,11 @@ b4_syncline([@oline@], [@ofile@])[ } #endif - state_ = (state_stack_.pop (), state_stack_[0]); + state_stack_.pop (); semantic_stack_.pop (); - location_stack_.pop ();; - -#if YYDEBUG - if (debug_) - { - YYCDEBUG << "Error: state stack now"; - for (StateStack::ConstIterator i = state_stack_.begin (); - i != state_stack_.end (); ++i) - YYCDEBUG << ' ' << *i; - YYCDEBUG << std::endl; - } -#endif + location_stack_.pop (); + state_ = state_stack_[0]; + YY_STACK_PRINT (); } if (n_ == final_) @@ -619,9 +669,49 @@ yy::]b4_parser_class_name[::lex_ () #endif } +/** Generate an error message, and invoke yyerror. */ +void +yy::]b4_parser_class_name[::report_syntax_error_ () +{ + /* If not already recovering from an error, report this error. */ + if (!errstatus_) + { + ++nerrs_; + +#if YYERROR_VERBOSE + n_ = pact_[state_]; + if (pact_ninf_ < n_ && n_ < last_) + { + message = "syntax error, unexpected "; + message += name_[ilooka_]; + { + int count = 0; + for (int x = (n_ < 0 ? -n_ : 0); x < ntokens_ + nnts_; ++x) + if (check_[x + n_] == x && x != terror_) + ++count; + if (count < 5) + { + count = 0; + for (int x = (n_ < 0 ? -n_ : 0); x < ntokens_ + nnts_; ++x) + if (check_[x + n_] == x && x != terror_) + { + message += (!count++) ? ", expecting " : " or "; + message += name_[x]; + } + } + } + } + else +#endif + message = "syntax error"; + error_ (); + } +} + + /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing STATE-NUM. */ -const ]b4_int_type_for([b4_pact]) 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::pact_ninf_ = b4_pact_ninf[; const ]b4_int_type_for([b4_pact])[ yy::]b4_parser_class_name[::pact_[] = { @@ -654,7 +744,7 @@ 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_for([b4_table]) 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::table_ninf_ = b4_table_ninf[; const ]b4_int_type_for([b4_table])[ yy::]b4_parser_class_name[::table_[] = { @@ -732,7 +822,33 @@ yy::]b4_parser_class_name[::rline_[] = { ]b4_rline[ }; -#endif + +/** Print the state stack from its BOTTOM up to its TOP (included). */ + +void +yy::]b4_parser_class_name[::stack_print_ () +{ + cdebug_ << "state stack now"; + for (StateStack::ConstIterator i = state_stack_.begin (); + i != state_stack_.end (); ++i) + cdebug_ << ' ' << *i; + cdebug_ << std::endl; +} + +/** Report that the YYRULE is going to be reduced. */ + +void +yy::]b4_parser_class_name[::reduce_print_ (int yyrule) +{ + unsigned int yylno = rline_[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; +} +#endif // YYDEBUG /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */ yy::]b4_parser_class_name[::TokenNumberType @@ -740,12 +856,12 @@ yy::]b4_parser_class_name[::translate_ (int token) { static const TokenNumberType - translate_[] = + translate_table[] = { ]b4_translate[ }; if ((unsigned) token <= user_token_number_max_) - return translate_[token]; + return translate_table[token]; else return undef_token_; } @@ -758,7 +874,6 @@ 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[::initdepth_ = ]b4_stack_depth_init[; 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[; @@ -766,7 +881,7 @@ const yy::]b4_parser_class_name[::TokenNumberType yy::]b4_parser_class_name[::un ]b4_epilogue dnl @output stack.hh -b4_copyright([2002])[ +b4_copyright([Stack handling for Bison C++ parsers], [2002, 2003])[ #ifndef BISON_STACK_HH # define BISON_STACK_HH @@ -793,16 +908,16 @@ namespace yy inline T& - operator [] (unsigned index) + operator [] (unsigned i) { - return seq_[index]; + return seq_[i]; } inline const T& - operator [] (unsigned index) const + operator [] (unsigned i) const { - return seq_[index]; + return seq_[i]; } inline @@ -848,9 +963,9 @@ namespace yy inline const T& - operator [] (unsigned index) const + operator [] (unsigned i) const { - return stack_[range_ - index]; + return stack_[range_ - i]; } private: @@ -862,25 +977,224 @@ namespace yy #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([2002])[ +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 { - struct Position + + /** \brief Abstract a Location. */ + class Location { - int line; - int column; + /** \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; }; - struct Location + /** \brief Join two Location objects to create a Location. */ + inline const Location operator+ (const Location& begin, const Location& end) { - Position first; - Position last; - }; + 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]