X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/b9278c7d174c1be5d7482343c5e433f428657ed0..671850a1c3e1aaac93a89fabc6d810be6a4a77fe:/data/location.cc?ds=sidebyside diff --git a/data/location.cc b/data/location.cc index 631247a7..53fddd48 100644 --- a/data/location.cc +++ b/data/location.cc @@ -1,6 +1,6 @@ # C++ skeleton for Bison -# Copyright (C) 2002-2012 Free Software Foundation, Inc. +# Copyright (C) 2002-2015 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 @@ -16,7 +16,7 @@ # along with this program. If not, see . m4_pushdef([b4_copyright_years], - [2002-2012]) + [2002-2015]) # b4_position_define # ------------------ @@ -25,10 +25,9 @@ m4_define([b4_position_define], [[ /// Abstract a position. class position { - public: -]m4_ifdef([b4_location_constructors], [[ + public:]m4_ifdef([b4_location_constructors], [[ /// Construct a position. - explicit position (]b4_percent_define_get([[filename_type]])[* f = YY_NULL, + explicit position (]b4_percent_define_get([[filename_type]])[* f = YY_NULLPTR, unsigned int l = ]b4_location_initial_line[u, unsigned int c = ]b4_location_initial_column[u) : filename (f) @@ -39,7 +38,7 @@ m4_define([b4_position_define], ]])[ /// Initialization. - void initialize (]b4_percent_define_get([[filename_type]])[* fn = YY_NULL, + void initialize (]b4_percent_define_get([[filename_type]])[* fn = YY_NULLPTR, unsigned int l = ]b4_location_initial_line[u, unsigned int c = ]b4_location_initial_column[u) { @@ -53,14 +52,17 @@ m4_define([b4_position_define], /// (line related) Advance to the COUNT next lines. void lines (int count = 1) { - column = ]b4_location_initial_column[u; - line += count; + if (count) + { + column = ]b4_location_initial_column[u; + line = add_ (line, count, ]b4_location_initial_line[); + } } /// (column related) Advance to the COUNT next columns. void columns (int count = 1) { - column = std::max (]b4_location_initial_column[u, column + count); + column = add_ (column, count, ]b4_location_initial_column[); } /** \} */ @@ -70,36 +72,44 @@ m4_define([b4_position_define], unsigned int line; /// Current column number. unsigned int column; + + private: + /// Compute max(min, lhs+rhs) (provided min <= lhs). + static unsigned int add_ (unsigned int lhs, int rhs, unsigned int min) + { + return (0 < rhs || -static_cast(rhs) < lhs + ? rhs + lhs + : min); + } }; - /// Add and assign a position. + /// Add \a width columns, in place. inline position& - operator+= (position& res, const int width) + operator+= (position& res, int width) { res.columns (width); return res; } - /// Add two position objects. - inline const position - operator+ (const position& begin, const int width) + /// Add \a width columns. + inline position + operator+ (position res, int width) { - position res = begin; return res += width; } - /// Add and assign a position. + /// Subtract \a width columns, in place. inline position& - operator-= (position& res, const int width) + operator-= (position& res, int width) { return res += -width; } - /// Add two position objects. - inline const position - operator- (const position& begin, const int width) + /// Subtract \a width columns. + inline position + operator- (position res, int width) { - return begin + -width; + return res -= width; } ]b4_percent_define_flag_if([[define_location_comparison]], [[ /// Compare two position objects. @@ -168,7 +178,7 @@ m4_define([b4_location_define], ])[ /// Initialization. - void initialize (]b4_percent_define_get([[filename_type]])[* f = YY_NULL, + void initialize (]b4_percent_define_get([[filename_type]])[* f = YY_NULLPTR, unsigned int l = ]b4_location_initial_line[u, unsigned int c = ]b4_location_initial_column[u) { @@ -186,13 +196,13 @@ m4_define([b4_location_define], } /// Extend the current location to the COUNT next columns. - void columns (unsigned int count = 1) + void columns (int count = 1) { end += count; } /// Extend the current location to the COUNT next lines. - void lines (unsigned int count = 1) + void lines (int count = 1) { end.lines (count); } @@ -206,28 +216,43 @@ m4_define([b4_location_define], position end; }; - /// Join two location objects to create a location. - inline const location operator+ (const location& begin, const location& end) + /// Join two locations, in place. + inline location& operator+= (location& res, const location& end) { - location res = begin; res.end = end.end; return res; } - /// Add two location objects. - inline const location operator+ (const location& begin, unsigned int width) + /// Join two locations. + inline location operator+ (location res, const location& end) { - location res = begin; - res.columns (width); - return res; + return res += end; } - /// Add and assign a location. - inline location& operator+= (location& res, unsigned int width) + /// Add \a width columns to the end position, in place. + inline location& operator+= (location& res, int width) { res.columns (width); return res; } + + /// Add \a width columns to the end position. + inline location operator+ (location res, int width) + { + return res += width; + } + + /// Subtract \a width columns to the end position, in place. + inline location& operator-= (location& res, int width) + { + return res += -width; + } + + /// Subtract \a width columns to the end position. + inline location operator- (location res, int width) + { + return res -= width; + } ]b4_percent_define_flag_if([[define_location_comparison]], [[ /// Compare two location objects. inline bool @@ -253,23 +278,21 @@ m4_define([b4_location_define], inline std::basic_ostream& operator<< (std::basic_ostream& ostr, const location& loc) { - position last = loc.end - 1; + unsigned int end_col = 0 < loc.end.column ? loc.end.column - 1 : 0; ostr << loc.begin; - if (last.filename + if (loc.end.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; + || *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; } ]]) -# We do want M4 expansion after # for CPP macros. -m4_changecom() b4_defines_if([ b4_output_begin([b4_dir_prefix[]position.hh]) b4_copyright([Positions for Bison parsers in C++])[