# C++ skeleton for Bison
-# Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
+# 2010 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 <http://www.gnu.org/licenses/>.
+
+m4_pushdef([b4_copyright_years],
+ [2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010])
# 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_get_percent_define([[namespace]])[::position class.
+ ** Define the ]b4_namespace_ref[::position class.
*/
#ifndef BISON_POSITION_HH
# include <string>
# include <algorithm>
-namespace ]b4_get_percent_define([[namespace]])[
-{
+]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 = 0,
+ 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_get_percent_define([[filename_type]])[* fn)
+ inline void initialize (]b4_percent_define_get([[filename_type]])[* fn)
{
filename = fn;
- line = ]b4_location_initial_line[;
- column = ]b4_location_initial_column[;
+ line = ]b4_location_initial_line[u;
+ column = ]b4_location_initial_column[u;
}
/** \name Line and Column related manipulators
** \{ */
- public:
/// (line related) Advance to the COUNT next lines.
+ /// Set current column to initial value.
inline void lines (int count = 1)
{
- column = ]b4_location_initial_column[;
+ column = ]b4_location_initial_column[u;
line += count;
}
}
/** \} */
- public:
/// File name to which this position refers.
- ]b4_get_percent_define([[filename_type]])[* filename;
+ ]b4_percent_define_get([[filename_type]])[* filename;
/// Current line number.
unsigned int line;
/// Current column number.
{
return begin + -width;
}
-]m4_if(b4_get_percent_define([[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.
return ostr << pos.line << '.' << pos.column;
}
-}
+]b4_namespace_close[
#endif // not BISON_POSITION_HH]
-@output(b4_dir_prefix[]location.hh@)
-b4_copyright([Locations for Bison parsers in C++],
- [2002, 2003, 2004, 2005, 2006])[
+@output(b4_dir_prefix[]location.hh@)@
+b4_copyright([Locations for Bison parsers in C++])[
/**
** \file location.hh
- ** Define the ]b4_get_percent_define([[namespace]])[::location class.
+ ** Define the ]b4_namespace_ref[::location class.
*/
#ifndef BISON_LOCATION_HH
# include <string>
# include "position.hh"
-namespace ]b4_get_percent_define([[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_get_percent_define([[filename_type]])[* fn)
+ inline void initialize (]b4_percent_define_get([[filename_type]])[* fn)
{
begin.initialize (fn);
end = begin;
res.columns (width);
return res;
}
-]m4_if(b4_get_percent_define([[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)
return ostr;
}
-}
+]b4_namespace_close[
#endif // not BISON_LOCATION_HH]
m4_divert_pop(0)
+m4_popdef([b4_copyright_years])dnl
m4_changecom([#])
projects / bison.git / blobdiff