tests: add -pedantic for --enable-gcc-warnings.

[bison.git] / data / location.cc

diff --git a/data/location.cc b/data/location.cc
index c34326787e2743fce8a81511b75012a8e8294062..601e07cbc9a5017d89d5b61a8f064cdf096c457c 100644 (file)
--- a/data/location.cc
+++ b/data/location.cc
@@ -1,32 +1,30 @@
 # C++ skeleton for Bison
 
 # C++ skeleton for Bison
 

-# Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# Copyright (C) 2002-2007, 2009-2011 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
 # 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.
 # (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.
 # 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
 # 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/>.

 
 # We do want M4 expansion after # for CPP macros.
 m4_changecom()
 m4_divert_push(0)dnl
 
 # We do want M4 expansion after # for CPP macros.
 m4_changecom()
 m4_divert_push(0)dnl

-@output(b4_dir_prefix[]position.hh@)
+@output(b4_dir_prefix[]position.hh@)@

 b4_copyright([Positions for Bison parsers in C++],
 b4_copyright([Positions for Bison parsers in C++],

-  [2002, 2003, 2004, 2005, 2006])[
+             [2002-2007, 2009-2011])[

 
 /**
  ** \file position.hh
 
 /**
  ** \file position.hh

- ** Define the ]b4_get_percent_define([[namespace]])[::position class.
+ ** Define the ]b4_namespace_ref[::position class.

  */
 
 #ifndef BISON_POSITION_HH
  */
 
 #ifndef BISON_POSITION_HH


@@ -36,8 +34,7 @@ b4_copyright([Positions for Bison parsers in C++],
 # include <string>
 # include <algorithm>
 
 # include <string>
 # include <algorithm>
 

-namespace ]b4_get_percent_define([[namespace]])[
-{
+]b4_namespace_open[

   /// Abstract a position.
   class position
   {
   /// Abstract a position.
   class position
   {


@@ -51,7 +48,7 @@ namespace ]b4_get_percent_define([[namespace]])[
 
 ])[
     /// Initialization.
 
 ])[
     /// 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[;
     {
       filename = fn;
       line = ]b4_location_initial_line[;


@@ -77,7 +74,7 @@ namespace ]b4_get_percent_define([[namespace]])[
 
   public:
     /// File name to which this position refers.
 
   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.
     /// Current line number.
     unsigned int line;
     /// Current column number.


@@ -113,15 +110,16 @@ namespace ]b4_get_percent_define([[namespace]])[
   {
     return begin + -width;
   }
   {
     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)
   {
   /// 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.
   }
 
   /// Compare two position objects.


@@ -143,15 +141,15 @@ namespace ]b4_get_percent_define([[namespace]])[
     return ostr << pos.line << '.' << pos.column;
   }
 
     return ostr << pos.line << '.' << pos.column;
   }
 

-}
+]b4_namespace_close[

 #endif // not BISON_POSITION_HH]
 #endif // not BISON_POSITION_HH]

-@output(b4_dir_prefix[]location.hh@)
+@output(b4_dir_prefix[]location.hh@)@

 b4_copyright([Locations for Bison parsers in C++],
 b4_copyright([Locations for Bison parsers in C++],

-  [2002, 2003, 2004, 2005, 2006])[
+             [2002-2007, 2009-2011])[

 
 /**
  ** \file location.hh
 
 /**
  ** \file location.hh

- ** Define the ]b4_get_percent_define([[namespace]])[::location class.
+ ** Define the ]b4_namespace_ref[::location class.

  */
 
 #ifndef BISON_LOCATION_HH
  */
 
 #ifndef BISON_LOCATION_HH


@@ -161,8 +159,7 @@ b4_copyright([Locations for Bison parsers in C++],
 # include <string>
 # include "position.hh"
 
 # include <string>
 # include "position.hh"
 

-namespace ]b4_get_percent_define([[namespace]])[
-{
+]b4_namespace_open[

 
   /// Abstract a location.
   class location
 
   /// Abstract a location.
   class location


@@ -177,7 +174,7 @@ namespace ]b4_get_percent_define([[namespace]])[
 
 ])[
     /// Initialization.
 
 ])[
     /// 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;
     {
       begin.initialize (fn);
       end = begin;


@@ -235,7 +232,7 @@ namespace ]b4_get_percent_define([[namespace]])[
     res.columns (width);
     return res;
   }
     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)
   /// Compare two location objects.
   inline bool
   operator== (const location& loc1, const location& loc2)


@@ -271,7 +268,7 @@ namespace ]b4_get_percent_define([[namespace]])[
     return ostr;
   }
 
     return ostr;
   }
 

-}
+]b4_namespace_close[

 
 #endif // not BISON_LOCATION_HH]
 m4_divert_pop(0)
 
 #endif // not BISON_LOCATION_HH]
 m4_divert_pop(0)