Rename %before-definitions to %start-header and %after-definitions to

[bison.git] / data / location.cc

diff --git a/data/location.cc b/data/location.cc
index a3dacac07409da9f1124133acc246b55832e7582..156115ca29bf2c55cc4fa53671a95ceaa54ec6ec 100644 (file)
--- a/data/location.cc
+++ b/data/location.cc
@@ -23,7 +23,7 @@ m4_divert(-1)
 m4_changecom()
 m4_divert(0)dnl
 @output b4_dir_prefix[]position.hh
-b4_copyright([Position class for Bison C++ parsers],
+b4_copyright([Positions for Bison parsers in C++],
   [2002, 2003, 2004, 2005, 2006])[
 
 /**
@@ -119,7 +119,24 @@ namespace ]b4_namespace[
   {
     return begin + -width;
   }
+]m4_if(b4_define_location_comparison, [1], [[
+  /// 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;
+  }
 
+  /// Compare two position objects.
+  inline bool
+  operator!= (const position& pos1, const position& pos2)
+  {
+    return !(pos1 == pos2);
+  }
+]])[
   /** \brief Intercept output stream redirection.
    ** \param ostr the destination output stream
    ** \param pos a reference to the position to redirect
@@ -135,7 +152,7 @@ namespace ]b4_namespace[
 }
 #endif // not BISON_POSITION_HH]
 @output b4_dir_prefix[]location.hh
-b4_copyright([Location class for Bison C++ parsers],
+b4_copyright([Locations for Bison parsers in C++],
   [2002, 2003, 2004, 2005, 2006])[
 
 /**
@@ -224,7 +241,21 @@ namespace ]b4_namespace[
     res.columns (width);
     return res;
   }
+]m4_if(b4_define_location_comparison, [1], [[
+  /// Compare two location objects.
+  inline bool
+  operator== (const location& loc1, const location& loc2)
+  {
+    return loc1.begin == loc2.begin && loc1.end == loc2.end;
+  }
 
+  /// Compare two location objects.
+  inline bool
+  operator!= (const location& loc1, const location& loc2)
+  {
+    return !(loc1 == loc2);
+  }
+]])[
   /** \brief Intercept output stream redirection.
    ** \param ostr the destination output stream
    ** \param loc a reference to the location to redirect