X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/4626a15dd155e1895262c48945a1c2b1d79b481f..5422d56a718805a2470558808355e04182a12d65:/data/location.cc diff --git a/data/location.cc b/data/location.cc index a134bfa8..601e07cb 100644 --- a/data/location.cc +++ b/data/location.cc @@ -1,35 +1,30 @@ -m4_divert(-1) - # C++ skeleton for Bison -# Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +# Copyright (C) 2002-2007, 2009-2011 Free Software Foundation, Inc. -# This program is free software; you can redistribute it and/or modify +# 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 -# the Free Software Foundation; either version 2 of the License, or +# the Free Software Foundation, either version 3 of the License, or # (at your option) any later version. - +# # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. - +# # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -# 02110-1301 USA - -m4_include(b4_pkgdatadir/[c++.m4]) +# along with this program. If not, see . # We do want M4 expansion after # for CPP macros. m4_changecom() -m4_divert(0)dnl -@output b4_dir_prefix[]position.hh -b4_copyright([Position class for Bison C++ parsers], [2002, 2003, 2004, 2005])[ +m4_divert_push(0)dnl +@output(b4_dir_prefix[]position.hh@)@ +b4_copyright([Positions for Bison parsers in C++], + [2002-2007, 2009-2011])[ /** ** \file position.hh - ** Define the yy::position class. + ** Define the ]b4_namespace_ref[::position class. */ #ifndef BISON_POSITION_HH @@ -37,9 +32,9 @@ b4_copyright([Position class for Bison C++ parsers], [2002, 2003, 2004, 2005])[ # include # include +# include -namespace yy -{ +]b4_namespace_open[ /// Abstract a position. class position { @@ -47,17 +42,17 @@ namespace yy ]m4_ifdef([b4_location_constructors], [ /// Construct a position. position () - : filename (0), line (1), column (0) + : filename (0), line (]b4_location_initial_line[), column (]b4_location_initial_column[) { } ])[ /// Initialization. - inline void initialize (]b4_filename_type[* fn) + inline void initialize (]b4_percent_define_get([[filename_type]])[* fn) { filename = fn; - line = 1; - column = 0; + line = ]b4_location_initial_line[; + column = ]b4_location_initial_column[; } /** \name Line and Column related manipulators @@ -66,25 +61,20 @@ namespace yy /// (line related) Advance to the COUNT next lines. inline void lines (int count = 1) { - column = 0; + column = ]b4_location_initial_column[; line += count; } /// (column related) Advance to the COUNT next columns. inline void columns (int count = 1) { - int leftmost = 0; - int current = column; - if (leftmost <= current + count) - column += count; - else - column = 0; + column = std::max (]b4_location_initial_column[u, column + count); } /** \} */ public: /// File name to which this position refers. - ]b4_filename_type[* filename; + ]b4_percent_define_get([[filename_type]])[* filename; /// Current line number. unsigned int line; /// Current column number. @@ -120,7 +110,25 @@ namespace yy { return begin + -width; } +]b4_percent_define_flag_if([[define_location_comparison]], [[ + /// Compare two position objects. + inline bool + operator== (const position& pos1, const position& pos2) + { + return (pos1.line == pos2.line + && pos1.column == pos2.column + && (pos1.filename == pos2.filename + || (pos1.filename && pos2.filename + && *pos1.filename == *pos2.filename))); + } + /// Compare two position objects. + inline bool + operator!= (const position& pos1, const position& pos2) + { + return !(pos1 == pos2); + } +]])[ /** \brief Intercept output stream redirection. ** \param ostr the destination output stream ** \param pos a reference to the position to redirect @@ -133,14 +141,15 @@ namespace yy return ostr << pos.line << '.' << pos.column; } -} +]b4_namespace_close[ #endif // not BISON_POSITION_HH] -@output b4_dir_prefix[]location.hh -b4_copyright([Location class for Bison C++ parsers], [2002, 2003, 2004, 2005])[ +@output(b4_dir_prefix[]location.hh@)@ +b4_copyright([Locations for Bison parsers in C++], + [2002-2007, 2009-2011])[ /** ** \file location.hh - ** Define the yy::location class. + ** Define the ]b4_namespace_ref[::location class. */ #ifndef BISON_LOCATION_HH @@ -150,8 +159,7 @@ b4_copyright([Location class for Bison C++ parsers], [2002, 2003, 2004, 2005])[ # include # include "position.hh" -namespace yy -{ +]b4_namespace_open[ /// Abstract a location. class location @@ -166,7 +174,7 @@ namespace yy ])[ /// Initialization. - inline void initialize (]b4_filename_type[* fn) + inline void initialize (]b4_percent_define_get([[filename_type]])[* fn) { begin.initialize (fn); end = begin; @@ -224,7 +232,21 @@ namespace yy res.columns (width); return res; } +]b4_percent_define_flag_if([[define_location_comparison]], [[ + /// Compare two location objects. + inline bool + operator== (const location& loc1, const location& loc2) + { + return loc1.begin == loc2.begin && loc1.end == loc2.end; + } + /// Compare two location objects. + inline bool + operator!= (const location& loc1, const location& loc2) + { + return !(loc1 == loc2); + } +]])[ /** \brief Intercept output stream redirection. ** \param ostr the destination output stream ** \param loc a reference to the location to redirect @@ -246,8 +268,8 @@ namespace yy return ostr; } -} +]b4_namespace_close[ #endif // not BISON_LOCATION_HH] -m4_divert(-1) +m4_divert_pop(0) m4_changecom([#])