From 5d003116191a0ab2ad43c787bfd7f67adf715a43 Mon Sep 17 00:00:00 2001 From: Akim Demaille Date: Thu, 20 Feb 2003 13:36:08 +0000 Subject: [PATCH] =?utf8?q?*=20data/lalr1.cc=20(position.hh):=20New=20subfi?= =?utf8?q?le,=20including=20the=20extended=20and=20Doxygen'ed=20documentat?= =?utf8?q?ion=20of=20class=20Position.=20(location.hh):=20Use=20it.=20Docu?= =?utf8?q?ment=20a`=20la=20Doxygen.=20With=20the=20help=20of=20Beno=EEt=20?= =?utf8?q?Perrot.?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- ChangeLog | 8 +++ data/lalr1.cc | 192 ++++++++++++++++++++++++++++++++++++++++++++------ 2 files changed, 178 insertions(+), 22 deletions(-) diff --git a/ChangeLog b/ChangeLog index a406c7d3..34de6a3c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2003-02-20 Akim Demaille + + * data/lalr1.cc (position.hh): New subfile, including the extended + and Doxygen'ed documentation of class Position. + (location.hh): Use it. + Document a` la Doxygen. + With the help of Benoît Perrot. + 2003-02-20 Akim Demaille * tests/calc.at (AT_CHECK_PUSHDEFS, AT_CHECK_POPDEFS): Define diff --git a/data/lalr1.cc b/data/lalr1.cc index 14864220..7a08a73d 100644 --- a/data/lalr1.cc +++ b/data/lalr1.cc @@ -872,59 +872,207 @@ 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) + { + column += columns; + } + /** \} */ + + 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; + } + + /** \brief Add two Location objects */ + inline const Location operator+ (const Location& begin, unsigned width) + { + Location res = begin; + res.columns (width); + return res; + } - inline std::ostream& - operator<< (std::ostream& ostr, const Location& pos) + /** \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 pos a reference to the Position to redirect + ** + ** Don't issue twice the line number when the location is on a single line. + */ + inline std::ostream& operator<< (std::ostream& ostr, const Location& pos) { ostr << pos.begin; if (pos.begin.filename != pos.end.filename) -- 2.47.2