build: generalize etc/prefix-gnulib-mk

[bison.git] / data / location.cc

diff --git a/data/location.cc b/data/location.cc
index 3ad89b39d74311481bed884f60cbb227dc9b0b58..174ce6ef47470cba742f5720328abfed0cfe6755 100644 (file)
--- a/data/location.cc
+++ b/data/location.cc
@@ -1,7 +1,6 @@
 # C++ skeleton for Bison
 
-# Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008 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
@@ -17,7 +16,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 m4_pushdef([b4_copyright_years],
-           [2002, 2003, 2004, 2005, 2006, 2007, 2008])
+           [2002-2012])
 
 # We do want M4 expansion after # for CPP macros.
 m4_changecom()
@@ -121,10 +120,11 @@ b4_copyright([Positions for Bison parsers in C++])[
   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.
@@ -279,8 +279,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;