X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/03f1b545b94c6699ee637b517c4941afb76eb0d9..4323e0dac386d777d070c68564f1c0041b06935d:/data/location.cc

diff --git a/data/location.cc b/data/location.cc
index 0ee02c28..cfbfd76b 100644
--- a/data/location.cc
+++ b/data/location.cc
@@ -1,6 +1,6 @@
 # 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
@@ -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/>.
 
+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@)@
-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
  ** 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 <algorithm>
 
 ]b4_null_define[
 
@@ -148,18 +149,16 @@ b4_copyright([Positions for Bison parsers in C++],
   }
 
 ]b4_namespace_close[
-#endif // not BISON_POSITION_HH]
+]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
  ** 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>
@@ -283,8 +282,8 @@ b4_copyright([Locations for Bison parsers in C++],
     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;
@@ -295,6 +294,7 @@ b4_copyright([Locations for Bison parsers in C++],
 
 ]b4_namespace_close[
 
-#endif // not BISON_LOCATION_HH]
+]b4_cpp_guard_close([b4_dir_prefix[]location.hh])
 m4_divert_pop(0)
+m4_popdef([b4_copyright_years])dnl
 m4_changecom([#])