X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/ef51bfa744db744dc4b2eff1ba9d6334c807f8e6..435575cb5e28bfc20263413e837c24a95373b3d4:/data/location.cc diff --git a/data/location.cc b/data/location.cc index f4fc9cc5..987843b2 100644 --- a/data/location.cc +++ b/data/location.cc @@ -1,6 +1,6 @@ # C++ skeleton for Bison -# Copyright (C) 2002-2007, 2009-2012 Free Software Foundation, Inc. +# Copyright (C) 2002-2013 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 @@ -15,66 +15,55 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -# We do want M4 expansion after # for CPP macros. -m4_changecom() -m4_divert_push(0)dnl -@output(b4_dir_prefix[]position.hh@)@ -b4_copyright([Positions for Bison parsers in C++], - [2002-2007, 2009-2012])[ +m4_pushdef([b4_copyright_years], + [2002-2013]) -/** - ** \file position.hh - ** Define the ]b4_namespace_ref[::position class. - */ - -#ifndef BISON_POSITION_HH -# define BISON_POSITION_HH - -# include -# include -# include - -]b4_null_define[ - -]b4_namespace_open[ - /// Abstract a position. +# b4_position_define +# ------------------ +# Define class position. +m4_define([b4_position_define], +[[ /// Abstract a position. class position { public: -]m4_ifdef([b4_location_constructors], [ +]m4_ifdef([b4_location_constructors], [[ /// Construct a position. - position () - : filename (YY_NULL), line (]b4_location_initial_line[), column (]b4_location_initial_column[) + explicit position (]b4_percent_define_get([[filename_type]])[* f = YY_NULL, + unsigned int l = ]b4_location_initial_line[u, + unsigned int c = ]b4_location_initial_column[u) + : filename (f) + , line (l) + , column (c) { } -])[ +]])[ /// Initialization. - inline void initialize (]b4_percent_define_get([[filename_type]])[* fn = YY_NULL) + void initialize (]b4_percent_define_get([[filename_type]])[* fn = YY_NULL, + unsigned int l = ]b4_location_initial_line[u, + unsigned int c = ]b4_location_initial_column[u) { filename = fn; - line = ]b4_location_initial_line[; - column = ]b4_location_initial_column[; + line = l; + column = c; } /** \name Line and Column related manipulators ** \{ */ - public: /// (line related) Advance to the COUNT next lines. - inline void lines (int count = 1) + void lines (int count = 1) { - column = ]b4_location_initial_column[; + column = ]b4_location_initial_column[u; line += count; } /// (column related) Advance to the COUNT next columns. - inline void columns (int count = 1) + void columns (int count = 1) { column = std::max (]b4_location_initial_column[u, column + count); } /** \} */ - public: /// File name to which this position refers. ]b4_percent_define_get([[filename_type]])[* filename; /// Current line number. @@ -84,7 +73,7 @@ b4_copyright([Positions for Bison parsers in C++], }; /// Add and assign a position. - inline const position& + inline position& operator+= (position& res, const int width) { res.columns (width); @@ -100,7 +89,7 @@ b4_copyright([Positions for Bison parsers in C++], } /// Add and assign a position. - inline const position& + inline position& operator-= (position& res, const int width) { return res += -width; @@ -135,50 +124,55 @@ b4_copyright([Positions for Bison parsers in C++], ** \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) + template + inline std::basic_ostream& + operator<< (std::basic_ostream& ostr, const position& pos) { if (pos.filename) ostr << *pos.filename << ':'; return ostr << pos.line << '.' << pos.column; } +]]) -]b4_namespace_close[ -#endif // not BISON_POSITION_HH] -@output(b4_dir_prefix[]location.hh@)@ -b4_copyright([Locations for Bison parsers in C++], - [2002-2007, 2009-2011])[ - -/** - ** \file location.hh - ** Define the ]b4_namespace_ref[::location class. - */ - -#ifndef BISON_LOCATION_HH -# define BISON_LOCATION_HH -# include -# include -# include "position.hh" - -]b4_namespace_open[ - - /// Abstract a location. +# b4_location_define +# ------------------ +m4_define([b4_location_define], +[[ /// Abstract a location. class location { public: ]m4_ifdef([b4_location_constructors], [ - /// Construct a location. - location () - : begin (), end () + /// Construct a location from \a b to \a e. + location (const position& b, const position& e) + : begin (b) + , end (e) + { + } + + /// Construct a 0-width location in \a p. + explicit location (const position& p = position ()) + : begin (p) + , end (p) + { + } + + /// Construct a 0-width location in \a f, \a l, \a c. + explicit location (]b4_percent_define_get([[filename_type]])[* f, + unsigned int l = ]b4_location_initial_line[u, + unsigned int c = ]b4_location_initial_column[u) + : begin (f, l, c) + , end (f, l, c) { } ])[ /// Initialization. - inline void initialize (]b4_percent_define_get([[filename_type]])[* fn = YY_NULL) + void initialize (]b4_percent_define_get([[filename_type]])[* f = YY_NULL, + unsigned int l = ]b4_location_initial_line[u, + unsigned int c = ]b4_location_initial_column[u) { - begin.initialize (fn); + begin.initialize (f, l, c); end = begin; } @@ -186,19 +180,19 @@ b4_copyright([Locations for Bison parsers in C++], ** \{ */ public: /// Reset initial location to final location. - inline void step () + void step () { begin = end; } /// Extend the current location to the COUNT next columns. - inline void columns (unsigned int count = 1) + void columns (unsigned int count = 1) { end += count; } /// Extend the current location to the COUNT next lines. - inline void lines (unsigned int count = 1) + void lines (unsigned int count = 1) { end.lines (count); } @@ -255,23 +249,68 @@ b4_copyright([Locations for Bison parsers in C++], ** ** Avoid duplicate information. */ - inline std::ostream& operator<< (std::ostream& ostr, const location& loc) + template + inline std::basic_ostream& + operator<< (std::basic_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; + unsigned int end_col = 0 < loc.end.column ? loc.end.column - 1 : 0; + ostr << loc.begin// << "(" << loc.end << ") " +; + if (loc.end.filename + && (!loc.begin.filename + || *loc.begin.filename != *loc.end.filename)) + ostr << '-' << loc.end.filename << ':' << loc.end.line << '.' << end_col; + else if (loc.begin.line < loc.end.line) + ostr << '-' << loc.end.line << '.' << end_col; + else if (loc.begin.column < end_col) + ostr << '-' << end_col; return ostr; } +]]) + + +b4_defines_if([ +b4_output_begin([b4_dir_prefix[]position.hh]) +b4_copyright([Positions for Bison parsers in C++])[ + +/** + ** \file ]b4_dir_prefix[position.hh + ** Define the ]b4_namespace_ref[::position class. + */ + +]b4_cpp_guard_open([b4_dir_prefix[]position.hh])[ + +# include // std::max +# include +# include + +]b4_null_define[ +]b4_namespace_open[ +]b4_position_define[ ]b4_namespace_close[ +]b4_cpp_guard_close([b4_dir_prefix[]position.hh]) +b4_output_end() + + +b4_output_begin([b4_dir_prefix[]location.hh]) +b4_copyright([Locations for Bison parsers in C++])[ + +/** + ** \file ]b4_dir_prefix[location.hh + ** Define the ]b4_namespace_ref[::location class. + */ + +]b4_cpp_guard_open([b4_dir_prefix[]location.hh])[ + +# include "position.hh" + +]b4_namespace_open[ +]b4_location_define[ +]b4_namespace_close[ +]b4_cpp_guard_close([b4_dir_prefix[]location.hh]) +b4_output_end() +]) + -#endif // not BISON_LOCATION_HH] -m4_divert_pop(0) -m4_changecom([#]) +m4_popdef([b4_copyright_years])