Regen.

[bison.git] / data / location.cc

diff --git a/data/location.cc b/data/location.cc
index e69e7071de910dd4549756dc24e98ef15be19c29..0f82340c0c3e9ca5dbcbdb62b4ce0204c7ccbaa1 100644 (file)
--- a/data/location.cc
+++ b/data/location.cc
@@ -1,7 +1,7 @@
 # C++ skeleton for Bison
 
 # C++ skeleton for Bison
 

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


@@ -16,12 +16,14 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # You should have received a copy of the GNU General Public License
 # 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])
+

 # We do want M4 expansion after # for CPP macros.
 m4_changecom()
 m4_divert_push(0)dnl
 @output(b4_dir_prefix[]position.hh@)@
 # 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, 2008])[
+b4_copyright([Positions for Bison parsers in C++])[

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


@@ -40,29 +42,33 @@ b4_copyright([Positions for Bison parsers in C++],
   class position
   {
   public:
   class position
   {
   public:

-]m4_ifdef([b4_location_constructors], [
+]m4_ifdef([b4_location_constructors], [[

     /// Construct a position.
     /// 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_percent_define_get([[filename_type]])[* fn)
     {
       filename = fn;
     /// Initialization.
     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
      ** \{ */
     }
 
     /** \name Line and Column related manipulators
      ** \{ */

-  public:

     /// (line related) Advance to the COUNT next lines.
     /// (line related) Advance to the COUNT next lines.

+    /// Set current column to initial value.

     inline void lines (int count = 1)
     {
     inline void lines (int count = 1)
     {

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

       line += count;
     }
 
       line += count;
     }
 


@@ -73,7 +79,6 @@ b4_copyright([Positions for Bison parsers in C++],
     }
     /** \} */
 
     }
     /** \} */
 

-  public:

     /// File name to which this position refers.
     ]b4_percent_define_get([[filename_type]])[* filename;
     /// Current line number.
     /// File name to which this position refers.
     ]b4_percent_define_get([[filename_type]])[* filename;
     /// Current line number.


@@ -116,10 +121,11 @@ b4_copyright([Positions for Bison parsers in C++],
   inline bool
   operator== (const position& pos1, const position& pos2)
   {
   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.


@@ -144,8 +150,7 @@ b4_copyright([Positions for Bison parsers in C++],
 ]b4_namespace_close[
 #endif // not BISON_POSITION_HH]
 @output(b4_dir_prefix[]location.hh@)@
 ]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, 2008])[
+b4_copyright([Locations for Bison parsers in C++])[

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


@@ -166,9 +171,26 @@ b4_copyright([Locations for Bison parsers in C++],
   {
   public:
 ]m4_ifdef([b4_location_constructors], [
   {
   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)

     {
     }
 
     {
     }
 


@@ -272,4 +294,5 @@ b4_copyright([Locations for Bison parsers in C++],
 
 #endif // not BISON_LOCATION_HH]
 m4_divert_pop(0)
 
 #endif // not BISON_LOCATION_HH]
 m4_divert_pop(0)

+m4_popdef([b4_copyright_years])dnl

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