Merge remote-tracking branch 'origin/maint'

[bison.git] / data / location.cc

diff --git a/data/location.cc b/data/location.cc
index b7383d65a3aa223c75c48299cdb6119ca769b783..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,12 +15,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-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 ]b4_dir_prefix[position.hh
 
 /**
  ** \file ]b4_dir_prefix[position.hh


@@ -149,8 +151,7 @@ b4_copyright([Positions for Bison parsers in C++],
 ]b4_namespace_close[
 ]b4_cpp_guard_close([b4_dir_prefix[]position.hh])
 @output(b4_dir_prefix[]location.hh@)@
 ]b4_namespace_close[
 ]b4_cpp_guard_close([b4_dir_prefix[]position.hh])
 @output(b4_dir_prefix[]location.hh@)@

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

 
 /**
  ** \file ]b4_dir_prefix[location.hh
 
 /**
  ** \file ]b4_dir_prefix[location.hh


@@ -281,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;


@@ -295,4 +296,5 @@ b4_copyright([Locations for Bison parsers in C++],
 
 ]b4_cpp_guard_close([b4_dir_prefix[]location.hh])
 m4_divert_pop(0)
 
 ]b4_cpp_guard_close([b4_dir_prefix[]location.hh])
 m4_divert_pop(0)

+m4_popdef([b4_copyright_years])dnl

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