X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/279cabb657e5116d9fd4badace040f36f579199a..4323e0dac386d777d070c68564f1c0041b06935d:/data/location.cc?ds=sidebyside diff --git a/data/location.cc b/data/location.cc index 773a3a5d..cfbfd76b 100644 --- a/data/location.cc +++ b/data/location.cc @@ -1,82 +1,85 @@ # C++ skeleton for Bison -# Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, -# Inc. +# Copyright (C) 2002-2012 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 +# along with this program. If not, see . + +m4_pushdef([b4_copyright_years], + [2002-2012]) # 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, 2003, 2004, 2005, 2006])[ +@output(b4_dir_prefix[]position.hh@)@ +b4_copyright([Positions for Bison parsers in C++])[ /** - ** \file position.hh - ** Define the ]b4_percent_define_get([[namespace]])[::position class. + ** \file ]b4_dir_prefix[position.hh + ** Define the ]b4_namespace_ref[::position class. */ -#ifndef BISON_POSITION_HH -# define BISON_POSITION_HH +]b4_cpp_guard_open([b4_dir_prefix[]position.hh])[ -# include +# include // std::max +# include # include -# include -namespace ]b4_percent_define_get([[namespace]])[ -{ +]b4_null_define[ + +]b4_namespace_open[ /// Abstract a position. class position { public: -]m4_ifdef([b4_location_constructors], [ +]m4_ifdef([b4_location_constructors], [[ /// Construct a position. - position () - : filename (0), 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) + 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. @@ -114,15 +117,16 @@ namespace ]b4_percent_define_get([[namespace]])[ { return begin + -width; } -]m4_if(b4_percent_define_get([[define_location_comparison]]), [1], [[ +]b4_percent_define_flag_if([[define_location_comparison]], [[ /// Compare two position objects. inline bool operator== (const position& pos1, const position& pos2) { - return - (pos1.filename == pos2.filename - || pos1.filename && pos2.filename && *pos1.filename == *pos2.filename) - && pos1.line == pos2.line && pos1.column == pos2.column; + 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. @@ -144,43 +148,59 @@ namespace ]b4_percent_define_get([[namespace]])[ return ostr << pos.line << '.' << pos.column; } -} -#endif // not BISON_POSITION_HH] -@output(b4_dir_prefix[]location.hh@) -b4_copyright([Locations for Bison parsers in C++], - [2002, 2003, 2004, 2005, 2006])[ +]b4_namespace_close[ +]b4_cpp_guard_close([b4_dir_prefix[]position.hh]) +@output(b4_dir_prefix[]location.hh@)@ +b4_copyright([Locations for Bison parsers in C++])[ /** - ** \file location.hh - ** Define the ]b4_percent_define_get([[namespace]])[::location class. + ** \file ]b4_dir_prefix[location.hh + ** Define the ]b4_namespace_ref[::location class. */ -#ifndef BISON_LOCATION_HH -# define BISON_LOCATION_HH +]b4_cpp_guard_open([b4_dir_prefix[]location.hh])[ # include # include # include "position.hh" -namespace ]b4_percent_define_get([[namespace]])[ -{ +]b4_namespace_open[ /// 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) + 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; } @@ -188,19 +208,19 @@ namespace ]b4_percent_define_get([[namespace]])[ ** \{ */ 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); } @@ -236,7 +256,7 @@ namespace ]b4_percent_define_get([[namespace]])[ res.columns (width); return res; } -]m4_if(b4_percent_define_get([[define_location_comparison]]), [1], [[ +]b4_percent_define_flag_if([[define_location_comparison]], [[ /// Compare two location objects. inline bool operator== (const location& loc1, const location& loc2) @@ -262,8 +282,8 @@ namespace ]b4_percent_define_get([[namespace]])[ position last = loc.end - 1; ostr << loc.begin; if (last.filename - && (!loc.begin.filename - || *loc.begin.filename != *last.filename)) + && (!loc.begin.filename + || *loc.begin.filename != *last.filename)) ostr << '-' << last; else if (loc.begin.line != last.line) ostr << '-' << last.line << '.' << last.column; @@ -272,8 +292,9 @@ namespace ]b4_percent_define_get([[namespace]])[ return ostr; } -} +]b4_namespace_close[ -#endif // not BISON_LOCATION_HH] +]b4_cpp_guard_close([b4_dir_prefix[]location.hh]) m4_divert_pop(0) +m4_popdef([b4_copyright_years])dnl m4_changecom([#])