X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/a9ce3f541315392c385c3790e4e371bfb728fe39..3eb4f1a3e62807125a815dc572da9204b5b51865:/data/location.cc
diff --git a/data/location.cc b/data/location.cc
index 39c7ca96..cfbfd76b 100644
--- a/data/location.cc
+++ b/data/location.cc
@@ -1,7 +1,6 @@
# C++ skeleton for Bison
-# Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation,
-# Inc.
+# Copyright (C) 2002-2012 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
@@ -17,7 +16,7 @@
# along with this program. If not, see .
m4_pushdef([b4_copyright_years],
- [2002, 2003, 2004, 2005, 2006, 2007, 2008])
+ [2002-2012])
# We do want M4 expansion after # for CPP macros.
m4_changecom()
@@ -26,56 +25,61 @@ m4_divert_push(0)dnl
b4_copyright([Positions for Bison parsers in C++])[
/**
- ** \file position.hh
+ ** \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
+
+]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.
@@ -118,10 +122,11 @@ b4_copyright([Positions for Bison parsers in C++])[
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,17 +149,16 @@ b4_copyright([Positions for Bison parsers in C++])[
}
]b4_namespace_close[
-#endif // not BISON_POSITION_HH]
+]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
+ ** \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
@@ -167,17 +171,36 @@ b4_copyright([Locations for Bison parsers in C++])[
{
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;
}
@@ -185,19 +208,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);
}
@@ -259,8 +282,8 @@ b4_copyright([Locations for Bison parsers in C++])[
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;
@@ -271,7 +294,7 @@ b4_copyright([Locations for Bison parsers in C++])[
]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([#])