X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/7548fed236e50c5ba9933c373a537f1a1dd15224..7b98f503de68ee0d4320c8294ca08889479cf1c1:/data/lalr1.cc diff --git a/data/lalr1.cc b/data/lalr1.cc index 670b68e1..1ec45264 100644 --- a/data/lalr1.cc +++ b/data/lalr1.cc @@ -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,6 +81,39 @@ 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 @@ -140,7 +170,7 @@ b4_syncline([@oline@], [@ofile@])], b4_syncline([@oline@], [@ofile@])[ #ifndef YYLLOC_DEFAULT # define YYLLOC_DEFAULT(Current, Rhs, N) \ - Current.end = Rhs[N].end; + ((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 { } @@ -212,12 +242,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_[]; @@ -248,7 +278,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_; @@ -278,6 +307,7 @@ namespace yy /* Initial location. */ LocationType initlocation_; +]b4_parse_param_vars[ }; } @@ -296,6 +326,11 @@ m4_if(b4_defines_flag, 0, [], [#include @output_header_name@])[ # define YYCDEBUG if (0) cdebug_ #endif /* !YYDEBUG */ +#define YYACCEPT goto yyacceptlab +#define YYABORT goto yyabortlab +#define YYERROR goto yyerrlab1 + + int yy::]b4_parser_class_name[::parse () { @@ -428,8 +463,12 @@ yy::]b4_parser_class_name[::parse () #if YYDEBUG if (debug_) { + // Short files will use "unsigned char" for line numbers, + // in which case they will be output as character litterals + // by "<<". + unsigned yylno = rline_[n_]; YYCDEBUG << "Reducing via rule " << n_ - 1 - << " (line " << rline_[n_] << "), "; + << " (line " << yylno << "), "; for (]b4_int_type_for([b4_prhs])[ i = prhs_[n_]; 0 <= rhs_[i]; ++i) YYCDEBUG << name_[rhs_[i]] << ' '; @@ -493,17 +532,23 @@ b4_syncline([@oline@], [@ofile@])[ message += name_[ilooka_]; { int count = 0; - for (int x = (n_ < 0 ? -n_ : 0); x < ntokens_ + nnts_; ++x) + /* 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 x = (n_ < 0 ? -n_ : 0); x < ntokens_ + nnts_; ++x) - if (check_[x + n_] == x && x != terror_) + for (int x1 = xbegin; x1 < xend; ++x1) + if (check_[x1 + n_] == x1 && x1 != terror_) { message += (!count++) ? ", expecting " : " or "; - message += name_[x]; + message += name_[x1]; } } } @@ -515,7 +560,10 @@ b4_syncline([@oline@], [@ofile@])[ } goto yyerrlab1; - /* Error raised explicitly by an action. */ + + /*----------------------------------------------------. + | yyerrlab1 -- error raised explicitly by an action. | + `----------------------------------------------------*/ yyerrlab1: if (errstatus == 3) { @@ -625,7 +673,7 @@ yy::]b4_parser_class_name[::lex_ () /* 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_[] = { @@ -658,7 +706,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_[] = { @@ -744,12 +792,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_; } @@ -762,7 +810,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[; @@ -797,16 +844,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 @@ -852,9 +899,9 @@ namespace yy inline const T& - operator [] (unsigned index) const + operator [] (unsigned i) const { - return stack_[range_ - index]; + return stack_[range_ - i]; } private: @@ -866,67 +913,221 @@ namespace yy #endif // not BISON_STACK_HH] dnl -@output location.hh -b4_copyright([Location class for Bison C++ parsers], [2002, 2003])[ +@output position.hh +b4_copyright([Position class for Bison C++ parsers], [2002, 2003])[ -#ifndef BISON_LOCATION_HH -# define BISON_LOCATION_HH +/** + ** \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: - Position () - : filename (), line (1), column (0) - {} + /** \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; - int line; - int column; + /** \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 != "") + if (!pos.filename.empty ()) ostr << pos.filename << ':'; - ostr << pos.line << '.' << pos.column; - return ostr; + return ostr << pos.line << '.' << pos.column; } - inline Position - operator- (const Position& pos, int col) - { - Position res (pos); - res.column -= col; - return res; - } +} +#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; }; - /* Don't issue twice the line number when the location is on a single - line. */ + /** \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; + } - inline std::ostream& - operator<< (std::ostream& ostr, const Location& pos) + /** \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) { - ostr << pos.begin; - if (pos.begin.filename != pos.end.filename) - ostr << '-' << pos.end - 1; - else if (pos.begin.line != pos.end.line) - ostr << '-' << pos.end.line << '.' << pos.end.column - 1; - else if (pos.begin.column != pos.end.column - 1) - ostr << '-' << pos.end.column - 1; + 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; }