# C++ skeleton for Bison
-# Copyright (C) 2002-2013 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
# along with this program. If not, see <http://www.gnu.org/licenses/>.
m4_pushdef([b4_copyright_years],
- [2002-2013])
+ [2002-2015])
# 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,
- unsigned int l = ]b4_location_initial_line[u,
- unsigned int c = ]b4_location_initial_column[u)
+ explicit position (]b4_percent_define_get([[filename_type]])[* f = YY_NULLPTR,
+ unsigned l = ]b4_location_initial_line[u,
+ unsigned c = ]b4_location_initial_column[u)
: filename (f)
, line (l)
, column (c)
- {
- }
+ {}
]])[
/// Initialization.
- 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)
+ void initialize (]b4_percent_define_get([[filename_type]])[* fn = YY_NULLPTR,
+ unsigned l = ]b4_location_initial_line[u,
+ unsigned c = ]b4_location_initial_column[u)
{
filename = fn;
line = l;
/// (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[);
}
/** \} */
/// File name to which this position refers.
]b4_percent_define_get([[filename_type]])[* filename;
/// Current line number.
- unsigned int line;
+ unsigned line;
/// Current column number.
- unsigned int column;
+ unsigned column;
+
+ private:
+ /// Compute max(min, lhs+rhs) (provided min <= lhs).
+ static unsigned add_ (unsigned lhs, int rhs, unsigned min)
+ {
+ return (0 < rhs || -static_cast<unsigned>(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.
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)
+ unsigned l = ]b4_location_initial_line[u,
+ unsigned c = ]b4_location_initial_column[u)
: begin (f, l, c)
, end (f, l, c)
- {
- }
+ {}
])[
/// Initialization.
- 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)
+ void initialize (]b4_percent_define_get([[filename_type]])[* f = YY_NULLPTR,
+ unsigned l = ]b4_location_initial_line[u,
+ unsigned c = ]b4_location_initial_column[u)
{
begin.initialize (f, l, c);
end = begin;
}
/// 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);
}
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
inline std::basic_ostream<YYChar>&
operator<< (std::basic_ostream<YYChar>& ostr, const location& loc)
{
- position last = loc.end - 1;
+ unsigned 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;
}
]])
projects / bison.git / blobdiff