Back out previous patch.

[bison.git] / data / location.cc

diff --git a/data/location.cc b/data/location.cc
index 2226adca7aa28c5b75dd5f247e57763700e26d91..773a3a5da49fc8adf0cdd0d398ed3c89db0b0167 100644 (file)
--- a/data/location.cc
+++ b/data/location.cc
@@ -1,8 +1,7 @@
-m4_divert(-1)
-

 # C++ skeleton for Bison
 
 # C++ skeleton for Bison
 

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


@@ -19,17 +18,16 @@ m4_divert(-1)
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 # 02110-1301  USA
 
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 # 02110-1301  USA
 

-m4_include(b4_pkgdatadir/[c++.m4])
-

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

-m4_divert(0)dnl
-@output b4_dir_prefix[]position.hh
-b4_copyright([Position class for Bison C++ parsers], [2002, 2003, 2004, 2005])[
+m4_divert_push(0)dnl
+@output(b4_dir_prefix[]position.hh@)
+b4_copyright([Positions for Bison parsers in C++],
+  [2002, 2003, 2004, 2005, 2006])[

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

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

  */
 
 #ifndef BISON_POSITION_HH
  */
 
 #ifndef BISON_POSITION_HH


@@ -37,30 +35,29 @@ b4_copyright([Position class for Bison C++ parsers], [2002, 2003, 2004, 2005])[
 
 # include <iostream>
 # include <string>
 
 # include <iostream>
 # include <string>

+# include <algorithm>

 
 

-namespace yy
+namespace ]b4_percent_define_get([[namespace]])[

 {
   /// Abstract a position.
   class position
   {
   public:
 {
   /// Abstract a position.
   class position
   {
   public:

-    /// Initial column number.
-    static const unsigned int initial_column = 0;
-    /// Initial line number.
-    static const unsigned int initial_line = 1;
-
-    /** \name Ctor & dtor.
-     ** \{ */
-  public:
+]m4_ifdef([b4_location_constructors], [

     /// Construct a position.
     /// Construct a position.

-    position () :
-      filename (0),
-      line (initial_line),
-      column (initial_column)
+    position ()
+      : filename (0), line (]b4_location_initial_line[), column (]b4_location_initial_column[)

     {
     }
     {
     }

-    /** \} */

 
 

+])[
+    /// Initialization.
+    inline void initialize (]b4_percent_define_get([[filename_type]])[* fn)
+    {
+      filename = fn;
+      line = ]b4_location_initial_line[;
+      column = ]b4_location_initial_column[;
+    }

 
     /** \name Line and Column related manipulators
      ** \{ */
 
     /** \name Line and Column related manipulators
      ** \{ */


@@ -68,25 +65,20 @@ namespace yy
     /// (line related) Advance to the COUNT next lines.
     inline void lines (int count = 1)
     {
     /// (line related) Advance to the COUNT next lines.
     inline void lines (int count = 1)
     {

-      column = initial_column;
+      column = ]b4_location_initial_column[;

       line += count;
     }
 
     /// (column related) Advance to the COUNT next columns.
     inline void columns (int count = 1)
     {
       line += count;
     }
 
     /// (column related) Advance to the COUNT next columns.
     inline void columns (int count = 1)
     {

-      int leftmost = initial_column;
-      int current  = column;
-      if (leftmost <= current + count)
-       column += count;
-      else
-       column = initial_column;
+      column = std::max (]b4_location_initial_column[u, column + count);

     }
     /** \} */
 
   public:
     /// File name to which this position refers.
     }
     /** \} */
 
   public:
     /// File name to which this position refers.

-    ]b4_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.


@@ -122,7 +114,24 @@ namespace yy
   {
     return begin + -width;
   }
   {
     return begin + -width;
   }

+]m4_if(b4_percent_define_get([[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
   /** \brief Intercept output stream redirection.
    ** \param ostr the destination output stream
    ** \param pos a reference to the position to redirect


@@ -137,12 +146,13 @@ namespace yy
 
 }
 #endif // not BISON_POSITION_HH]
 
 }
 #endif // not BISON_POSITION_HH]

-@output b4_dir_prefix[]location.hh
-b4_copyright([Location class for Bison C++ parsers], [2002, 2003, 2004, 2005])[
+@output(b4_dir_prefix[]location.hh@)
+b4_copyright([Locations for Bison parsers in C++],
+  [2002, 2003, 2004, 2005, 2006])[

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

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

  */
 
 #ifndef BISON_LOCATION_HH
  */
 
 #ifndef BISON_LOCATION_HH


@@ -152,23 +162,27 @@ b4_copyright([Location class for Bison C++ parsers], [2002, 2003, 2004, 2005])[
 # include <string>
 # include "position.hh"
 
 # include <string>
 # include "position.hh"
 

-namespace yy
+namespace ]b4_percent_define_get([[namespace]])[

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

-    /** \name Ctor & dtor.
-     ** \{ */

   public:
   public:

+]m4_ifdef([b4_location_constructors], [

     /// Construct a location.
     /// Construct a location.

-    location () :
-      begin (),
-      end ()
+    location ()
+      : begin (), end ()

     {
     }
     {
     }

-    /** \} */

 
 

+])[
+    /// Initialization.
+    inline void initialize (]b4_percent_define_get([[filename_type]])[* fn)
+    {
+      begin.initialize (fn);
+      end = begin;
+    }

 
     /** \name Line and Column related manipulators
      ** \{ */
 
     /** \name Line and Column related manipulators
      ** \{ */


@@ -222,7 +236,21 @@ namespace yy
     res.columns (width);
     return res;
   }
     res.columns (width);
     return res;
   }

+]m4_if(b4_percent_define_get([[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
   /** \brief Intercept output stream redirection.
    ** \param ostr the destination output stream
    ** \param loc a reference to the location to redirect


@@ -247,5 +275,5 @@ namespace yy
 }
 
 #endif // not BISON_LOCATION_HH]
 }
 
 #endif // not BISON_LOCATION_HH]

-m4_divert(-1)
+m4_divert_pop(0)

 m4_changecom([#])
 m4_changecom([#])