X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/193d7c7054ba7197b0789e14965b739162319b5e..8def5cd0c3a14a2ba6b2c807a6be0e2f67094f89:/data/location.cc

diff --git a/data/location.cc b/data/location.cc
index 6581b384..2d32bf77 100644
--- a/data/location.cc
+++ b/data/location.cc
@@ -24,20 +24,7 @@ m4_changecom()
 m4_divert(0)dnl
 @output b4_dir_prefix[]position.hh
 b4_copyright([Positions for Bison parsers in C++],
-  [2002, 2003, 2004, 2005, 2006])
-[
-/* As a special exception, you may create a larger work that contains
-   part or all of the Bison parser skeleton and distribute that work
-   under terms of your choice, so long as that work isn't itself a
-   parser generator using the skeleton or a modified version thereof
-   as a parser skeleton.  Alternatively, if you modify or redistribute
-   the parser skeleton itself, you may (at your option) remove this
-   special exception, which will cause the skeleton and the resulting
-   Bison output files to be licensed under the GNU General Public
-   License without this special exception.
-
-   This special exception was added by the Free Software Foundation in
-   version 2.2 of Bison.  */
+  [2002, 2003, 2004, 2005, 2006])[
 
 /**
  ** \file position.hh
@@ -49,6 +36,7 @@ b4_copyright([Positions for Bison parsers in C++],
 
 # include <iostream>
 # include <string>
+# include <algorithm>
 
 namespace ]b4_namespace[
 {
@@ -59,7 +47,7 @@ namespace ]b4_namespace[
 ]m4_ifdef([b4_location_constructors], [
     /// Construct a position.
     position ()
-      : filename (0), line (1), column (0)
+      : filename (0), line (]b4_location_initial_line[), column (]b4_location_initial_column[)
     {
     }
 
@@ -68,8 +56,8 @@ namespace ]b4_namespace[
     inline void initialize (]b4_filename_type[* fn)
     {
       filename = fn;
-      line = 1;
-      column = 0;
+      line = ]b4_location_initial_line[;
+      column = ]b4_location_initial_column[;
     }
 
     /** \name Line and Column related manipulators
@@ -78,19 +66,14 @@ namespace ]b4_namespace[
     /// (line related) Advance to the COUNT next lines.
     inline void lines (int count = 1)
     {
-      column = 0;
+      column = ]b4_location_initial_column[;
       line += count;
     }
 
     /// (column related) Advance to the COUNT next columns.
     inline void columns (int count = 1)
     {
-      int leftmost = 0;
-      int current  = column;
-      if (leftmost <= current + count)
-	column += count;
-      else
-	column = 0;
+      column = std::max (]b4_location_initial_column[u, column + count);
     }
     /** \} */
 
@@ -132,7 +115,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
@@ -149,20 +149,7 @@ namespace ]b4_namespace[
 #endif // not BISON_POSITION_HH]
 @output b4_dir_prefix[]location.hh
 b4_copyright([Locations for Bison parsers in C++],
-  [2002, 2003, 2004, 2005, 2006])
-[
-/* As a special exception, you may create a larger work that contains
-   part or all of the Bison parser skeleton and distribute that work
-   under terms of your choice, so long as that work isn't itself a
-   parser generator using the skeleton or a modified version thereof
-   as a parser skeleton.  Alternatively, if you modify or redistribute
-   the parser skeleton itself, you may (at your option) remove this
-   special exception, which will cause the skeleton and the resulting
-   Bison output files to be licensed under the GNU General Public
-   License without this special exception.
-
-   This special exception was added by the Free Software Foundation in
-   version 2.2 of Bison.  */
+  [2002, 2003, 2004, 2005, 2006])[
 
 /**
  ** \file location.hh
@@ -250,7 +237,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