Merge remote-tracking branch 'origin/maint'

[bison.git] / data / location.cc

diff --git a/data/location.cc b/data/location.cc
index 30f0a02fb033cce7989d28f8af8cb4b28dcd73db..cfbfd76b196977d094be3eb3df0ae3f1bf60dd2d 100644 (file)
--- a/data/location.cc
+++ b/data/location.cc
@@ -1,6 +1,6 @@
 # C++ skeleton for Bison
 
 # C++ skeleton for Bison
 

-# Copyright (C) 2002-2007, 2009-2012 Free Software Foundation, Inc.
+# Copyright (C) 2002-2012 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


@@ -15,24 +15,25 @@
 # 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-2012])
+

 # 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-2007, 2009-2012])[
+b4_copyright([Positions for Bison parsers in C++])[

 
 /**
 
 /**

- ** \file position.hh
+ ** \file ]b4_dir_prefix[position.hh

  ** Define the ]b4_namespace_ref[::position class.
  */
 
  ** Define the ]b4_namespace_ref[::position class.
  */
 

-#ifndef BISON_POSITION_HH
-# define BISON_POSITION_HH
+]b4_cpp_guard_open([b4_dir_prefix[]position.hh])[

 
 

-# include <iostream>
+# include <algorithm> // std::max
+# include <iosfwd>

 # include <string>
 # include <string>

-# include <algorithm>

 
 ]b4_null_define[
 
 
 ]b4_null_define[
 


@@ -41,29 +42,34 @@ 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 (YY_NULL), line (]b4_location_initial_line[), column (]b4_location_initial_column[)
+    explicit position (]b4_percent_define_get([[filename_type]])[* f = YY_NULL,
+                       unsigned int l = ]b4_location_initial_line[u,
+                       unsigned int c = ]b4_location_initial_column[u)
+      : filename (f)
+      , line (l)
+      , column (c)

     {
     }
 
     {
     }
 

-])[
+]])[

     /// Initialization.
     /// Initialization.

-    void initialize (]b4_percent_define_get([[filename_type]])[* fn = YY_NULL)
+    void initialize (]b4_percent_define_get([[filename_type]])[* fn = YY_NULL,
+                     unsigned int l = ]b4_location_initial_line[u,
+                     unsigned int c = ]b4_location_initial_column[u)

     {
       filename = fn;
     {
       filename = fn;

-      line = ]b4_location_initial_line[;
-      column = ]b4_location_initial_column[;
+      line = l;
+      column = c;

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

-  public:

     /// (line related) Advance to the COUNT next lines.
     void lines (int count = 1)
     {
     /// (line related) Advance to the COUNT next lines.
     void lines (int count = 1)
     {

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

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


@@ -74,7 +80,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.


@@ -144,18 +149,16 @@ b4_copyright([Positions for Bison parsers in C++],
   }
 
 ]b4_namespace_close[
   }
 
 ]b4_namespace_close[

-#endif // not BISON_POSITION_HH]
+]b4_cpp_guard_close([b4_dir_prefix[]position.hh])

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

-b4_copyright([Locations for Bison parsers in C++],
-             [2002-2007, 2009-2011])[
+b4_copyright([Locations for Bison parsers in C++])[

 
 /**
 
 /**

- ** \file location.hh
+ ** \file ]b4_dir_prefix[location.hh

  ** Define the ]b4_namespace_ref[::location class.
  */
 
  ** Define the ]b4_namespace_ref[::location class.
  */
 

-#ifndef BISON_LOCATION_HH
-# define BISON_LOCATION_HH
+]b4_cpp_guard_open([b4_dir_prefix[]location.hh])[

 
 # include <iostream>
 # include <string>
 
 # include <iostream>
 # include <string>


@@ -168,17 +171,36 @@ 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)

     {
     }
 
 ])[
     /// Initialization.
     {
     }
 
 ])[
     /// Initialization.

-    void initialize (]b4_percent_define_get([[filename_type]])[* fn = YY_NULL)
+    void initialize (]b4_percent_define_get([[filename_type]])[* f = YY_NULL,
+                     unsigned int l = ]b4_location_initial_line[u,
+                     unsigned int c = ]b4_location_initial_column[u)

     {
     {

-      begin.initialize (fn);
+      begin.initialize (f, l, c);

       end = begin;
     }
 
       end = begin;
     }
 


@@ -260,8 +282,8 @@ b4_copyright([Locations for Bison parsers in C++],
     position last = loc.end - 1;
     ostr << loc.begin;
     if (last.filename
     position last = loc.end - 1;
     ostr << loc.begin;
     if (last.filename

-       && (!loc.begin.filename
-           || *loc.begin.filename != *last.filename))
+        && (!loc.begin.filename
+            || *loc.begin.filename != *last.filename))

       ostr << '-' << last;
     else if (loc.begin.line != last.line)
       ostr << '-' << last.line  << '.' << last.column;
       ostr << '-' << last;
     else if (loc.begin.line != last.line)
       ostr << '-' << last.line  << '.' << last.column;


@@ -272,6 +294,7 @@ b4_copyright([Locations for Bison parsers in C++],
 
 ]b4_namespace_close[
 
 
 ]b4_namespace_close[
 

-#endif // not BISON_LOCATION_HH]
+]b4_cpp_guard_close([b4_dir_prefix[]location.hh])

 m4_divert_pop(0)
 m4_divert_pop(0)

+m4_popdef([b4_copyright_years])dnl

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