X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/0d1c3a04b76293183f5b1a1dcd3ac99e71de66c6..ab8fe29d0ca22f49bc97a452204935507a269d01:/data/lalr1.cc diff --git a/data/lalr1.cc b/data/lalr1.cc index 14864220..34398cc1 100644 --- a/data/lalr1.cc +++ b/data/lalr1.cc @@ -432,8 +432,9 @@ yy::]b4_parser_class_name[::parse () // 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 " << static_cast (rline_[n_]) << "), "; + << " (line " << yylno << "), "; for (]b4_int_type_for([b4_prhs])[ i = prhs_[n_]; 0 <= rhs_[i]; ++i) YYCDEBUG << name_[rhs_[i]] << ' '; @@ -497,13 +498,19 @@ 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) + for (int x = xbegin; x < xend; ++x) if (check_[x + n_] == x && x != terror_) { message += (!count++) ? ", expecting " : " or "; @@ -872,67 +879,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 LINES next lines. */ + inline void lines (int lines = 1) + { + column = initial_column; + line += lines; + } + + /** \brief (column related) Advance to the COLUMNS next columns. */ + inline void columns (int columns = 1) + { + int leftmost = initial_column; + int current = column; + if (leftmost <= current + columns) + column += columns; + 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 != "") 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 COLUMNS next columns. */ + inline void columns (unsigned columns = 1) + { + end += columns; + } + + /** \brief Extend the current location to the LINES next lines. */ + inline void lines (unsigned lines = 1) + { + end.lines (lines); + } + /** \} */ + + 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; + } - inline std::ostream& - operator<< (std::ostream& ostr, const Location& pos) + /** \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) { - 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; }