build: simplify and improve the compiler warnings for tests.

[bison.git] / build-aux / update-b4-copyright

diff --git a/build-aux/update-b4-copyright b/build-aux/update-b4-copyright
index 63a333593301d19384099c54cd15745abe15892d..c0f5a133d598afeb72a7bfc925a168cffbd1682d 100755 (executable)
--- a/build-aux/update-b4-copyright
+++ b/build-aux/update-b4-copyright
@@ -3,7 +3,7 @@
 # Update b4_copyright invocations or b4_copyright_years definitions to
 # include the current year.
 
-# Copyright (C) 2009, 2010 Free Software Foundation, Inc.
+# Copyright (C) 2009-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
@@ -73,10 +73,19 @@ while (/($old_re)/gx)
         # Put spaces after commas.
         $year_lines =~ s/, ?/, /g;
 
-        # Do not compress to intervals; for example, do not replace
-        # "2008, 2009, 2010" with "2008-2010".  See the Copyright
-        # Notices section in Information for Maintainers of GNU Software, at:
-        # http://www.gnu.org/prep/maintain/maintain.html#Copyright-Notices
+        # Compress to intervals.
+        $year_lines =~
+          s/
+            (\d{4})
+            (?:
+              (,\ |-)
+              ((??{
+                if    ($2 eq '-') { '\d{4}'; }
+                elsif (!$3)       { $1 + 1;  }
+                else              { $3 + 1;  }
+              }))
+            )+
+          /$1-$3/gx;
 
         # Format within margin.
         my $year_lines_new;