From 575619af5e1f61a5f78fb3910bee424ead5fe5a6 Mon Sep 17 00:00:00 2001
From: "Joel E. Denny" <joeldenny@joeldenny.org>
Date: Sun, 2 Jan 2011 09:12:01 -0500
Subject: [PATCH] maint: run "make update-copyright".

---
 ChangeLog                               |   9 +-
 Makefile.am                             |   3 +-
 NEWS                                    |   4 +-
 PACKAGING                               |   2 +-
 README                                  |   4 +-
 README-alpha                            |   2 +-
 README-hacking                          |   3 +-
 TODO                                    |   3 +-
 bootstrap                               |   2 +-
 bootstrap.conf                          |   2 +-
 build-aux/update-b4-copyright           |   2 +-
 build-aux/update-package-copyright-year |   2 +-
 cfg.mk                                  |   2 +-
 configure.ac                            |   7 +-
 data/README                             |   2 +-
 data/bison.m4                           |   3 +-
 data/c++-skel.m4                        |   2 +-
 data/c++.m4                             |   3 +-
 data/c-skel.m4                          |   2 +-
 data/c.m4                               |   3 +-
 data/glr.c                              |   7 +-
 data/glr.cc                             |   5 +-
 data/java-skel.m4                       |   2 +-
 data/java.m4                            |   2 +-
 data/lalr1.cc                           |   5 +-
 data/lalr1.java                         |   4 +-
 data/local.mk                           |   3 +-
 data/location.cc                        |   5 +-
 data/stack.hh                           |   5 +-
 data/variant.hh                         |   3 +-
 data/xslt/bison.xsl                     |   2 +-
 data/xslt/xml2dot.xsl                   |   2 +-
 data/xslt/xml2text.xsl                  |   2 +-
 data/xslt/xml2xhtml.xsl                 |   2 +-
 data/yacc.c                             |   6 +-
 djgpp/Makefile.maint                    |   3 +-
 djgpp/README.in                         |   3 +-
 djgpp/config.bat                        |   3 +-
 djgpp/config.sed                        |   3 +-
 djgpp/config.site                       |   3 +-
 djgpp/config_h.sed                      |   3 +-
 djgpp/djunpack.bat                      |   3 +-
 djgpp/local.mk                          |   2 +-
 djgpp/subpipe.c                         |   3 +-
 djgpp/subpipe.h                         |   3 +-
 djgpp/testsuite.sed                     |   2 +-
 doc/bison.texinfo                       |   5 +-
 doc/local.mk                            |   3 +-
 doc/refcard.tex                         |   2 +-
 etc/README                              |   2 +-
 etc/bench.pl.in                         |   2 +-
 etc/local.mk                            |   2 +-
 examples/calc++/Makefile.am             |   3 +-
 examples/extexi                         |   2 +-
 examples/local.mk                       |   2 +-
 lib/abitset.c                           |   4 +-
 lib/abitset.h                           |   2 +-
 lib/bbitset.h                           |   4 +-
 lib/bitset.c                            |   3 +-
 lib/bitset.h                            |   3 +-
 lib/bitset_stats.c                      |   3 +-
 lib/bitset_stats.h                      |   3 +-
 lib/bitsetv-print.c                     |   2 +-
 lib/bitsetv-print.h                     |   2 +-
 lib/bitsetv.c                           |   2 +-
 lib/bitsetv.h                           |   2 +-
 lib/ebitset.c                           |   3 +-
 lib/ebitset.h                           |   2 +-
 lib/get-errno.c                         |   2 +-
 lib/get-errno.h                         |   2 +-
 lib/lbitset.c                           |   4 +-
 lib/lbitset.h                           |   2 +-
 lib/libiberty.h                         |   2 +-
 lib/local.mk                            |   4 +-
 lib/main.c                              |   2 +-
 lib/timevar.c                           |   2 +-
 lib/timevar.def                         |   2 +-
 lib/timevar.h                           |   4 +-
 lib/vbitset.c                           |   3 +-
 lib/vbitset.h                           |   2 +-
 lib/yyerror.c                           |   2 +-
 m4/bison-i18n.m4                        |   2 +-
 m4/c-working.m4                         |   2 +-
 m4/cxx.m4                               |   2 +-
 m4/subpipe.m4                           |   2 +-
 m4/timevar.m4                           |   2 +-
 src/AnnotationList.c                    |   2 +-
 src/AnnotationList.h                    |   2 +-
 src/InadequacyList.c                    |   2 +-
 src/InadequacyList.h                    |   2 +-
 src/LR0.c                               |   4 +-
 src/LR0.h                               |   4 +-
 src/Sbitset.c                           |   2 +-
 src/Sbitset.h                           |   2 +-
 src/assoc.c                             |   4 +-
 src/assoc.h                             |   3 +-
 src/closure.c                           |   4 +-
 src/closure.h                           |   4 +-
 src/complain.c                          |   4 +-
 src/complain.h                          |   4 +-
 src/conflicts.c                         |   4 +-
 src/conflicts.h                         |   4 +-
 src/derives.c                           |   4 +-
 src/derives.h                           |   4 +-
 src/files.c                             |   4 +-
 src/files.h                             |   4 +-
 src/flex-scanner.h                      |   2 +-
 src/getargs.c                           |   4 +-
 src/getargs.h                           |   4 +-
 src/gram.c                              |   4 +-
 src/gram.h                              |   4 +-
 src/graphviz.c                          |   2 +-
 src/graphviz.h                          |   2 +-
 src/ielr.c                              |   2 +-
 src/ielr.h                              |   2 +-
 src/lalr.c                              |   4 +-
 src/lalr.h                              |   4 +-
 src/local.mk                            |   3 +-
 src/location.c                          |   3 +-
 src/location.h                          |   3 +-
 src/main.c                              |   4 +-
 src/muscle-tab.c                        |   3 +-
 src/muscle-tab.h                        |   3 +-
 src/named-ref.c                         |   2 +-
 src/named-ref.h                         |   2 +-
 src/nullable.c                          |   4 +-
 src/nullable.h                          |   2 +-
 src/output.c                            |   4 +-
 src/output.h                            |   4 +-
 src/parse-gram.c                        | 862 ++++++++++++------------
 src/parse-gram.h                        |  25 +-
 src/parse-gram.y                        |   3 +-
 src/print-xml.c                         |   2 +-
 src/print-xml.h                         |   2 +-
 src/print.c                             |   4 +-
 src/print.h                             |   2 +-
 src/print_graph.c                       |   3 +-
 src/print_graph.h                       |   2 +-
 src/reader.c                            |   4 +-
 src/reader.h                            |   4 +-
 src/reduce.c                            |   4 +-
 src/reduce.h                            |   4 +-
 src/relation.c                          |   4 +-
 src/relation.h                          |   2 +-
 src/scan-code.h                         |   2 +-
 src/scan-code.l                         |   3 +-
 src/scan-gram.h                         |   2 +-
 src/scan-gram.l                         |   3 +-
 src/scan-skel.h                         |   3 +-
 src/scan-skel.l                         |   3 +-
 src/state.c                             |   3 +-
 src/state.h                             |   4 +-
 src/symlist.c                           |   4 +-
 src/symlist.h                           |   4 +-
 src/symtab.c                            |   4 +-
 src/symtab.h                            |   4 +-
 src/system.h                            |   3 +-
 src/tables.c                            |   4 +-
 src/tables.h                            |   2 +-
 src/uniqstr.c                           |   3 +-
 src/uniqstr.h                           |   3 +-
 tests/actions.at                        |   3 +-
 tests/atlocal.in                        |   3 +-
 tests/c++.at                            |   3 +-
 tests/calc.at                           |   3 +-
 tests/conflicts.at                      |   3 +-
 tests/cxx-type.at                       |   3 +-
 tests/existing.at                       |   4 +-
 tests/glr-regression.at                 |   2 +-
 tests/headers.at                        |   2 +-
 tests/input.at                          |   3 +-
 tests/java.at                           |   2 +-
 tests/local.at                          |   3 +-
 tests/local.mk                          |   3 +-
 tests/named-refs.at                     |   2 +-
 tests/output.at                         |   3 +-
 tests/push.at                           |   2 +-
 tests/reduce.at                         |   3 +-
 tests/regression.at                     |   3 +-
 tests/sets.at                           |   2 +-
 tests/skeletons.at                      |   2 +-
 tests/synclines.at                      |   2 +-
 tests/testsuite.at                      |   4 +-
 tests/torture.at                        |   4 +-
 184 files changed, 685 insertions(+), 747 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 3d185cbf..7de49c85 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2011-01-02  Joel E. Denny  <joeldenny@joeldenny.org>
+
+	maint: run "make update-copyright".
+
 2011-01-02  Joel E. Denny  <joeldenny@joeldenny.org>
 
 	maint: prepare to use date ranges in copyright notices.
@@ -26024,9 +26028,8 @@
 
 	-----
 
-	Copyright (C) 1987, 1988, 1991, 1992, 1993, 1994, 1995, 1996,
-	1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
-	2008, 2009, 2010 Free Software Foundation, Inc.
+	Copyright (C) 1987-1988, 1991-2011 Free Software Foundation,
+	Inc.
 
 	Copying and distribution of this file, with or without
 	modification, are permitted provided the copyright notice and this
diff --git a/Makefile.am b/Makefile.am
index b5d88556..191f37b5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,6 @@
 ## Process this file with automake to produce Makefile.in -*-Makefile-*-
 
-## Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
-## 2010 Free Software Foundation, Inc.
+## Copyright (C) 2001-2011 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
diff --git a/NEWS b/NEWS
index 576d8cd5..593807c7 100644
--- a/NEWS
+++ b/NEWS
@@ -1511,9 +1511,7 @@ End:
 
 -----
 
-Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
-Inc.
+Copyright (C) 1995-2011 Free Software Foundation, Inc.
 
 This file is part of Bison, the GNU Parser Generator.
 
diff --git a/PACKAGING b/PACKAGING
index 546e9112..a6568ecf 100644
--- a/PACKAGING
+++ b/PACKAGING
@@ -36,7 +36,7 @@ to the bison package.
 
 -----
 
-Copyright (C) 2002, 2005, 2009, 2010 Free Software Foundation, Inc.
+Copyright (C) 2002, 2005, 2009-2011 Free Software Foundation, Inc.
 
 This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/README b/README
index 3f10f995..d7a6f081 100644
--- a/README
+++ b/README
@@ -44,8 +44,8 @@ End:
 
 -----
 
-Copyright (C) 1992, 1998, 1999, 2003, 2004, 2005, 2008, 2009, 2010
-Free Software Foundation, Inc.
+Copyright (C) 1992, 1998-1999, 2003-2005, 2008-2011 Free Software
+Foundation, Inc.
 
 This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/README-alpha b/README-alpha
index abc44baf..5dcd2858 100644
--- a/README-alpha
+++ b/README-alpha
@@ -12,7 +12,7 @@ the problems you encounter.
 
 -----
 
-Copyright (C) 2002, 2004, 2009, 2010 Free Software Foundation, Inc.
+Copyright (C) 2002, 2004, 2009-2011 Free Software Foundation, Inc.
 
 This file is part of GNU Bison.
 
diff --git a/README-hacking b/README-hacking
index ec3d36d3..0ea345a3 100644
--- a/README-hacking
+++ b/README-hacking
@@ -370,8 +370,7 @@ Push these changes.
 
 -----
 
-Copyright (C) 2002, 2003, 2004, 2005, 2007, 2008, 2009, 2010 Free
-Software Foundation, Inc.
+Copyright (C) 2002-2005, 2007-2011 Free Software Foundation, Inc.
 
 This file is part of GNU Bison.
 
diff --git a/TODO b/TODO
index e2f9213b..f3bcf19d 100644
--- a/TODO
+++ b/TODO
@@ -474,8 +474,7 @@ Here's a proposal for how a new implementation might look:
 
 -----
 
-Copyright (C) 2001, 2002, 2003, 2004, 2006, 2008, 2009, 2010 Free
-Software Foundation, Inc.
+Copyright (C) 2001-2004, 2006, 2008-2011 Free Software Foundation, Inc.
 
 This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/bootstrap b/bootstrap
index dcd47739..ecf25178 100755
--- a/bootstrap
+++ b/bootstrap
@@ -4,7 +4,7 @@ scriptversion=2010-11-20.03; # UTC
 
 # Bootstrap this package from checked-out sources.
 
-# Copyright (C) 2003-2010 Free Software Foundation, Inc.
+# Copyright (C) 2003-2011 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
diff --git a/bootstrap.conf b/bootstrap.conf
index 870d5c8e..b7558e36 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -1,6 +1,6 @@
 # Bootstrap configuration.
 
-# Copyright (C) 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+# Copyright (C) 2006-2011 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
diff --git a/build-aux/update-b4-copyright b/build-aux/update-b4-copyright
index ea82de4f..4a614241 100755
--- 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-2011 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
diff --git a/build-aux/update-package-copyright-year b/build-aux/update-package-copyright-year
index b5b62e98..39e6126d 100755
--- a/build-aux/update-package-copyright-year
+++ b/build-aux/update-package-copyright-year
@@ -2,7 +2,7 @@
 
 # In configure.ac, update PACKAGE_COPYRIGHT_YEAR to the current year.
 
-# Copyright (C) 2010 Free Software Foundation, Inc.
+# Copyright (C) 2010-2011 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
diff --git a/cfg.mk b/cfg.mk
index 6cd9cdd0..383d2d03 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -1,6 +1,6 @@
 # Customize maint.mk                           -*- makefile -*-
 
-# Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc.
+# Copyright (C) 2008-2011 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
diff --git a/configure.ac b/configure.ac
index c955198b..39d42578 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,6 @@
 # Configure template for GNU Bison.                   -*-Autoconf-*-
 #
-# Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
-# 2010 Free Software Foundation, Inc.
+# Copyright (C) 2001-2011 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
@@ -24,9 +23,9 @@ AC_PREREQ(2.64)
 AC_INIT([GNU Bison],
         m4_esyscmd([build-aux/git-version-gen .tarball-version]),
         [bug-bison@gnu.org])
-AC_DEFINE([PACKAGE_COPYRIGHT_YEAR], [2010],
+AC_DEFINE([PACKAGE_COPYRIGHT_YEAR], [2011],
           [The copyright year for this package])
-AC_SUBST([PACKAGE_COPYRIGHT_YEAR], [2010])
+AC_SUBST([PACKAGE_COPYRIGHT_YEAR], [2011])
 
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_MACRO_DIR([m4])
diff --git a/data/README b/data/README
index f0c77327..4967cf4f 100644
--- a/data/README
+++ b/data/README
@@ -52,7 +52,7 @@ into various formats.
 
 -----
 
-Copyright (C) 2002, 2008, 2009, 2010 Free Software Foundation, Inc.
+Copyright (C) 2002, 2008-2011 Free Software Foundation, Inc.
 
 This file is part of GNU Bison.
 
diff --git a/data/bison.m4 b/data/bison.m4
index 74b59875..bbf90aae 100644
--- a/data/bison.m4
+++ b/data/bison.m4
@@ -2,8 +2,7 @@
 
 # Language-independent M4 Macros for Bison.
 
-# Copyright (C) 2002, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
-# Software Foundation, Inc.
+# Copyright (C) 2002, 2004-2011 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
diff --git a/data/c++-skel.m4 b/data/c++-skel.m4
index 2bfe14cc..df61a741 100644
--- a/data/c++-skel.m4
+++ b/data/c++-skel.m4
@@ -2,7 +2,7 @@
 
 # C++ skeleton dispatching for Bison.
 
-# Copyright (C) 2006, 2007, 2009, 2010 Free Software Foundation, Inc.
+# Copyright (C) 2006-2007, 2009-2011 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
diff --git a/data/c++.m4 b/data/c++.m4
index 610eaaab..45b4322c 100644
--- a/data/c++.m4
+++ b/data/c++.m4
@@ -2,8 +2,7 @@
 
 # C++ skeleton for Bison
 
-# Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
-# Free Software Foundation, Inc.
+# Copyright (C) 2002-2011 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
diff --git a/data/c-skel.m4 b/data/c-skel.m4
index bb9c5cbb..93dea927 100644
--- a/data/c-skel.m4
+++ b/data/c-skel.m4
@@ -2,7 +2,7 @@
 
 # C skeleton dispatching for Bison.
 
-# Copyright (C) 2006, 2007, 2009, 2010 Free Software Foundation, Inc.
+# Copyright (C) 2006-2007, 2009-2011 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
diff --git a/data/c.m4 b/data/c.m4
index db685c9a..7a718a1d 100644
--- a/data/c.m4
+++ b/data/c.m4
@@ -2,8 +2,7 @@
 
 # C M4 Macros for Bison.
 
-# Copyright (C) 2002, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
-# Software Foundation, Inc.
+# Copyright (C) 2002, 2004-2011 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
diff --git a/data/glr.c b/data/glr.c
index d8b96047..0a4ed469 100644
--- a/data/glr.c
+++ b/data/glr.c
@@ -2,8 +2,7 @@
 
 # GLR skeleton for Bison
 
-# Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
-# 2010 Free Software Foundation, Inc.
+# Copyright (C) 2002-2011 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
@@ -159,7 +158,7 @@ m4_changecom()
 m4_divert_push(0)dnl
 @output(b4_parser_file_name@)@
 b4_copyright([Skeleton implementation for Bison GLR parsers in C],
-             [2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010])
+             [2002-2011])
 [
 /* C GLR parser skeleton written by Paul Hilfinger.  */
 
@@ -2649,7 +2648,7 @@ m4_if(b4_skeleton, ["glr.c"],
 [b4_defines_if(
 [@output(b4_spec_defines_file@)@
 b4_copyright([Skeleton interface for Bison GLR parsers in C],
-             [2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010])
+             [2002-2011])
 
 b4_shared_declarations
 
diff --git a/data/glr.cc b/data/glr.cc
index 547a3dd9..e8f495bb 100644
--- a/data/glr.cc
+++ b/data/glr.cc
@@ -1,7 +1,6 @@
 # C++ GLR skeleton for Bison
 
-# Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
-# 2010 Free Software Foundation, Inc.
+# Copyright (C) 2002-2011 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
@@ -217,7 +216,7 @@ m4_popdef([b4_parse_param])
 m4_divert_push(0)
 @output(b4_spec_defines_file@)@
 b4_copyright([Skeleton interface for Bison GLR parsers in C++],
-             [2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010])[
+             [2002-2011])[
 
 /* C++ GLR parser skeleton written by Akim Demaille.  */
 
diff --git a/data/java-skel.m4 b/data/java-skel.m4
index bb7d6ed9..62e8d90e 100644
--- a/data/java-skel.m4
+++ b/data/java-skel.m4
@@ -2,7 +2,7 @@
 
 # Java skeleton dispatching for Bison.
 
-# Copyright (C) 2007, 2009, 2010 Free Software Foundation, Inc.
+# Copyright (C) 2007, 2009-2011 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
diff --git a/data/java.m4 b/data/java.m4
index 32ff2156..e32380ca 100644
--- a/data/java.m4
+++ b/data/java.m4
@@ -2,7 +2,7 @@
 
 # Java language support for Bison
 
-# Copyright (C) 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+# Copyright (C) 2007-2011 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
diff --git a/data/lalr1.cc b/data/lalr1.cc
index a18721e2..dab5ab9b 100644
--- a/data/lalr1.cc
+++ b/data/lalr1.cc
@@ -1,7 +1,6 @@
 # C++ skeleton for Bison
 
-# Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
-# 2010 Free Software Foundation, Inc.
+# Copyright (C) 2002-2011 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
@@ -116,7 +115,7 @@ m4_popdef([b4_dollar_dollar])dnl
 
 
 m4_pushdef([b4_copyright_years],
-           [2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010])
+           [2002-2011])
 
 m4_define([b4_parser_class_name],
           [b4_percent_define_get([[parser_class_name]])])
diff --git a/data/lalr1.java b/data/lalr1.java
index a2772ff7..a6829d3f 100644
--- a/data/lalr1.java
+++ b/data/lalr1.java
@@ -1,6 +1,6 @@
 # Java skeleton for Bison -*- autoconf -*-
 
-# Copyright (C) 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+# Copyright (C) 2007-2011 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
@@ -33,7 +33,7 @@ b4_symbol_foreach([b4_symbol_no_destructor_assert])
 m4_divert_push(0)dnl
 @output(b4_parser_file_name@)@
 b4_copyright([Skeleton implementation for Bison LALR(1) parsers in Java],
-             [2007, 2008, 2009, 2010])
+             [2007-2011])
 
 b4_percent_define_ifdef([package], [package b4_percent_define_get([package]);
 ])[/* First part of user declarations.  */
diff --git a/data/local.mk b/data/local.mk
index 44354a7d..578323ae 100644
--- a/data/local.mk
+++ b/data/local.mk
@@ -1,5 +1,4 @@
-## Copyright (C) 2002, 2005, 2006, 2007, 2008, 2009, 2010 Free
-## Software Foundation, Inc.
+## Copyright (C) 2002, 2005-2011 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
diff --git a/data/location.cc b/data/location.cc
index eeef6fb5..731c8ae8 100644
--- 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, 2009,
-# 2010 Free Software Foundation, Inc.
+# Copyright (C) 2002-2011 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, 2009, 2010])
+           [2002-2011])
 
 # We do want M4 expansion after # for CPP macros.
 m4_changecom()
diff --git a/data/stack.hh b/data/stack.hh
index 49f8c5dd..1801a739 100644
--- a/data/stack.hh
+++ b/data/stack.hh
@@ -1,7 +1,6 @@
 # C++ skeleton for Bison
 
-# Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
-# 2010 Free Software Foundation, Inc.
+# Copyright (C) 2002-2011 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, 2009, 2010])
+           [2002-2011])
 
 # We do want M4 expansion after # for CPP macros.
 m4_changecom()
diff --git a/data/variant.hh b/data/variant.hh
index 832b9672..2e808775 100644
--- a/data/variant.hh
+++ b/data/variant.hh
@@ -1,7 +1,6 @@
 # C++ skeleton for Bison
 
-# Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
-# 2010 Free Software Foundation, Inc.
+# Copyright (C) 2002-2011 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
diff --git a/data/xslt/bison.xsl b/data/xslt/bison.xsl
index 8d96e65b..9165d786 100644
--- a/data/xslt/bison.xsl
+++ b/data/xslt/bison.xsl
@@ -3,7 +3,7 @@
 <!--
     bison.xsl - common templates for Bison XSLT.
 
-    Copyright (C) 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+    Copyright (C) 2007-2011 Free Software Foundation, Inc.
 
     This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/data/xslt/xml2dot.xsl b/data/xslt/xml2dot.xsl
index 98958237..100553b7 100644
--- a/data/xslt/xml2dot.xsl
+++ b/data/xslt/xml2dot.xsl
@@ -3,7 +3,7 @@
 <!--
     xml2dot.xsl - transform Bison XML Report into DOT.
 
-    Copyright (C) 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+    Copyright (C) 2007-2011 Free Software Foundation, Inc.
 
     This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/data/xslt/xml2text.xsl b/data/xslt/xml2text.xsl
index 86e94e81..a91b4a71 100644
--- a/data/xslt/xml2text.xsl
+++ b/data/xslt/xml2text.xsl
@@ -3,7 +3,7 @@
 <!--
     xml2text.xsl - transform Bison XML Report into plain text.
 
-    Copyright (C) 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+    Copyright (C) 2007-2011 Free Software Foundation, Inc.
 
     This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/data/xslt/xml2xhtml.xsl b/data/xslt/xml2xhtml.xsl
index 7fc62fd8..2ffc964a 100644
--- a/data/xslt/xml2xhtml.xsl
+++ b/data/xslt/xml2xhtml.xsl
@@ -3,7 +3,7 @@
 <!--
     xml2html.xsl - transform Bison XML Report into XHTML.
 
-    Copyright (C) 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+    Copyright (C) 2007-2011 Free Software Foundation, Inc.
 
     This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/data/yacc.c b/data/yacc.c
index d8db3559..3357e60f 100644
--- a/data/yacc.c
+++ b/data/yacc.c
@@ -1,11 +1,11 @@
                                                              -*- C -*-
 # Yacc compatible skeleton for Bison
 
-# Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005,
-# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+# Copyright (C) 1984, 1989-1990, 2000-2011 Free Software Foundation,
+# Inc.
 
 m4_pushdef([b4_copyright_years],
-           [1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010])
+           [1984, 1989-1990, 2000-2011])
 
 # 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
diff --git a/djgpp/Makefile.maint b/djgpp/Makefile.maint
index af54328c..db9789cd 100644
--- a/djgpp/Makefile.maint
+++ b/djgpp/Makefile.maint
@@ -1,8 +1,7 @@
 # DJGPP Maintainer's Makefile                                    -*-Makefile-*-
 # Requires GNU sed
 
-## Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Free Software
-## Foundation, Inc.
+## Copyright (C) 2005-2011 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
diff --git a/djgpp/README.in b/djgpp/README.in
index 6e5bd3b1..c1b5ae63 100644
--- a/djgpp/README.in
+++ b/djgpp/README.in
@@ -1,7 +1,6 @@
 This is a port of GNU Bison @VERSION@ to MSDOS/DJGPP.
 
-Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Free Software
-Foundation, Inc.
+Copyright (C) 2005-2011 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
diff --git a/djgpp/config.bat b/djgpp/config.bat
index ae5be9be..6e0350ef 100644
--- a/djgpp/config.bat
+++ b/djgpp/config.bat
@@ -4,8 +4,7 @@ Rem Configure Bison for DJGPP.
 Rem WARNING WARNING WARNING: This file needs to have DOS CRLF end-of-line
 Rem format, or else stock DOS/Windows shells will refuse to run it.
 
-Rem Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Free Software
-Rem Foundation, Inc.
+Rem Copyright (C) 2005-2011 Free Software Foundation, Inc.
 
 Rem This program is free software: you can redistribute it and/or modify
 Rem it under the terms of the GNU General Public License as published by
diff --git a/djgpp/config.sed b/djgpp/config.sed
index 6e950267..5a95e636 100644
--- a/djgpp/config.sed
+++ b/djgpp/config.sed
@@ -2,8 +2,7 @@
 # Sed script for additional DJGPP specific editing
 # of the configure script generated by autoconf 2.62.
 
-# Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Free Software
-# Foundation, Inc.
+# Copyright (C) 2005-2011 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
diff --git a/djgpp/config.site b/djgpp/config.site
index b0b21fc8..69ad07dc 100644
--- a/djgpp/config.site
+++ b/djgpp/config.site
@@ -3,8 +3,7 @@
 # This is the config.site file for configuring GNU packages
 # which are to be built with DJGPP tools.
 
-# Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Free Software
-# Foundation, Inc.
+# Copyright (C) 2005-2011 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
diff --git a/djgpp/config_h.sed b/djgpp/config_h.sed
index bb489eb8..ef490ce7 100644
--- a/djgpp/config_h.sed
+++ b/djgpp/config_h.sed
@@ -1,7 +1,6 @@
 # sed script for DJGPP specific editing of config.hin
 
-# Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Free Software
-# Foundation, Inc.
+# Copyright (C) 2005-2011 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
diff --git a/djgpp/djunpack.bat b/djgpp/djunpack.bat
index 64aeb68c..5ba8154d 100644
--- a/djgpp/djunpack.bat
+++ b/djgpp/djunpack.bat
@@ -7,8 +7,7 @@ Rem This batch file unpacks the Bison distribution while simultaneously
 Rem renaming some of the files whose names are invalid on DOS or conflict
 Rem with other file names after truncation to DOS 8+3 namespace.
 Rem
-Rem Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Free Software
-Rem Foundation, Inc.
+Rem Copyright (C) 2005-2011 Free Software Foundation, Inc.
 Rem
 Rem This program is free software: you can redistribute it and/or modify
 Rem it under the terms of the GNU General Public License as published by
diff --git a/djgpp/local.mk b/djgpp/local.mk
index 7c200370..4843378a 100644
--- a/djgpp/local.mk
+++ b/djgpp/local.mk
@@ -1,4 +1,4 @@
-## Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc.
+## Copyright (C) 2008-2011 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
diff --git a/djgpp/subpipe.c b/djgpp/subpipe.c
index 63942588..24dd04ac 100644
--- a/djgpp/subpipe.c
+++ b/djgpp/subpipe.c
@@ -1,7 +1,6 @@
 /* Subprocesses with pipes.
 
-   Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Free Software
-   Foundation, Inc.
+   Copyright (C) 2005-2011 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
diff --git a/djgpp/subpipe.h b/djgpp/subpipe.h
index 241d8c3b..681a92a0 100644
--- a/djgpp/subpipe.h
+++ b/djgpp/subpipe.h
@@ -1,7 +1,6 @@
 /* Subprocesses with pipes.
 
-   Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Free Software
-   Foundation, Inc.
+   Copyright (C) 2005-2011 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
diff --git a/djgpp/testsuite.sed b/djgpp/testsuite.sed
index 3030eaac..65a43202 100644
--- a/djgpp/testsuite.sed
+++ b/djgpp/testsuite.sed
@@ -2,7 +2,7 @@
 # Sed script for additional DJGPP specific editing
 # of the testsuite script generated by autoconf 2.61.
 
-# Copyright (C) 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+# Copyright (C) 2007-2011 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
diff --git a/doc/bison.texinfo b/doc/bison.texinfo
index 43ab12bd..8ba75781 100644
--- a/doc/bison.texinfo
+++ b/doc/bison.texinfo
@@ -33,9 +33,8 @@
 This manual (@value{UPDATED}) is for @acronym{GNU} Bison (version
 @value{VERSION}), the @acronym{GNU} parser generator.
 
-Copyright @copyright{} 1988, 1989, 1990, 1991, 1992, 1993, 1995, 1998, 1999,
-2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
-Software Foundation, Inc.
+Copyright @copyright{} 1988-1993, 1995, 1998-2011 Free Software
+Foundation, Inc.
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
diff --git a/doc/local.mk b/doc/local.mk
index 52a64e34..3e7a8360 100644
--- a/doc/local.mk
+++ b/doc/local.mk
@@ -1,5 +1,4 @@
-## Copyright (C) 2001, 2002, 2003, 2005, 2006, 2007, 2008, 2009, 2010
-## Free Software Foundation, Inc.
+## Copyright (C) 2001-2003, 2005-2011 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
diff --git a/doc/refcard.tex b/doc/refcard.tex
index b277308b..ba7618db 100644
--- a/doc/refcard.tex
+++ b/doc/refcard.tex
@@ -19,7 +19,7 @@
 \def\finalout{\overfullrule=0pt}
 %\finalout
 
-% Copyright (c) 1998, 2001, 2009, 2010 Free Software Foundation, Inc.
+% Copyright (c) 1998, 2001, 2009-2011 Free Software Foundation, Inc.
 %
 % This file is part of Bison.
 %
diff --git a/etc/README b/etc/README
index 667e03b8..ab88e257 100644
--- a/etc/README
+++ b/etc/README
@@ -19,7 +19,7 @@ straightforward use of _build/src/bison would.)
 
 --
 
-Copyright (C) 2006, 2009, 2010 Free Software Foundation, Inc.
+Copyright (C) 2006, 2009-2011 Free Software Foundation, Inc.
 
 This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/etc/bench.pl.in b/etc/bench.pl.in
index b6fd1ced..f18b9183 100755
--- a/etc/bench.pl.in
+++ b/etc/bench.pl.in
@@ -1,6 +1,6 @@
 #! /usr/bin/perl -w
 
-# Copyright (C) 2006, 2008, 2009, 2010 Free Software Foundation, Inc.
+# Copyright (C) 2006, 2008-2011 Free Software Foundation, Inc.
 #
 # This file is part of Bison, the GNU Compiler Compiler.
 #
diff --git a/etc/local.mk b/etc/local.mk
index 8b3ec402..fa06e6b3 100644
--- a/etc/local.mk
+++ b/etc/local.mk
@@ -1,4 +1,4 @@
-## Copyright (C) 2006, 2008, 2009, 2010 Free Software Foundation, Inc.
+## Copyright (C) 2006, 2008-2011 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
diff --git a/examples/calc++/Makefile.am b/examples/calc++/Makefile.am
index 1383d1fe..13c2ba33 100644
--- a/examples/calc++/Makefile.am
+++ b/examples/calc++/Makefile.am
@@ -1,7 +1,6 @@
 ## Process this file with automake to produce Makefile.in -*-Makefile-*-
 
-## Copyright (C) 2005, 2006, 2008, 2009, 2010 Free Software
-## Foundation, Inc.
+## Copyright (C) 2005-2006, 2008-2011 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
diff --git a/examples/extexi b/examples/extexi
index 31083927..3f17da68 100644
--- a/examples/extexi
+++ b/examples/extexi
@@ -2,7 +2,7 @@
 
 # This file is part of GNU Bison
 
-# Copyright (C) 1992, 2000, 2001, 2005, 2006, 2009, 2010 Free Software
+# Copyright (C) 1992, 2000-2001, 2005-2006, 2009-2011 Free Software
 # Foundation, Inc.
 #
 # This program is free software: you can redistribute it and/or modify
diff --git a/examples/local.mk b/examples/local.mk
index 215f218f..6c82bec4 100644
--- a/examples/local.mk
+++ b/examples/local.mk
@@ -1,4 +1,4 @@
-## Copyright (C) 2005, 2008, 2009, 2010 Free Software Foundation, Inc.
+## Copyright (C) 2005, 2008-2011 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
diff --git a/lib/abitset.c b/lib/abitset.c
index 4c5f7908..a4a2fa8e 100644
--- a/lib/abitset.c
+++ b/lib/abitset.c
@@ -1,7 +1,7 @@
 /* Array bitsets.
 
-   Copyright (C) 2002, 2003, 2006, 2009, 2010 Free Software
-   Foundation, Inc.
+   Copyright (C) 2002-2003, 2006, 2009-2011 Free Software Foundation,
+   Inc.
 
    Contributed by Michael Hayes (m.hayes@elec.canterbury.ac.nz).
 
diff --git a/lib/abitset.h b/lib/abitset.h
index 670d449e..e3742f1f 100644
--- a/lib/abitset.h
+++ b/lib/abitset.h
@@ -1,6 +1,6 @@
 /* Functions to support abitsets.
 
-   Copyright (C) 2002, 2004, 2009, 2010 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004, 2009-2011 Free Software Foundation, Inc.
 
    Contributed by Michael Hayes (m.hayes@elec.canterbury.ac.nz).
 
diff --git a/lib/bbitset.h b/lib/bbitset.h
index 50b3f3ef..3389c911 100644
--- a/lib/bbitset.h
+++ b/lib/bbitset.h
@@ -1,7 +1,7 @@
 /* Base bitset stuff.
 
-   Copyright (C) 2002, 2003, 2004, 2006, 2009, 2010 Free Software
-   Foundation, Inc.
+   Copyright (C) 2002-2004, 2006, 2009-2011 Free Software Foundation,
+   Inc.
 
    Contributed by Michael Hayes (m.hayes@elec.canterbury.ac.nz).
 
diff --git a/lib/bitset.c b/lib/bitset.c
index f4692dde..222e3ee7 100644
--- a/lib/bitset.c
+++ b/lib/bitset.c
@@ -1,7 +1,6 @@
 /* General bitsets.
 
-   Copyright (C) 2002, 2003, 2004, 2005, 2006, 2009, 2010 Free
-   Software Foundation, Inc.
+   Copyright (C) 2002-2006, 2009-2011 Free Software Foundation, Inc.
 
    Contributed by Michael Hayes (m.hayes@elec.canterbury.ac.nz).
 
diff --git a/lib/bitset.h b/lib/bitset.h
index 0bb7e8bf..98979bb3 100644
--- a/lib/bitset.h
+++ b/lib/bitset.h
@@ -1,7 +1,6 @@
 /* Generic bitsets.
 
-   Copyright (C) 2002, 2003, 2004, 2009, 2010 Free Software
-   Foundation, Inc.
+   Copyright (C) 2002-2004, 2009-2011 Free Software Foundation, Inc.
 
    Contributed by Michael Hayes (m.hayes@elec.canterbury.ac.nz).
 
diff --git a/lib/bitset_stats.c b/lib/bitset_stats.c
index f67b0692..2eb77ff8 100644
--- a/lib/bitset_stats.c
+++ b/lib/bitset_stats.c
@@ -1,7 +1,6 @@
 /* Bitset statistics.
 
-   Copyright (C) 2002, 2003, 2004, 2005, 2006, 2009, 2010 Free
-   Software Foundation, Inc.
+   Copyright (C) 2002-2006, 2009-2011 Free Software Foundation, Inc.
 
    Contributed by Michael Hayes (m.hayes@elec.canterbury.ac.nz).
 
diff --git a/lib/bitset_stats.h b/lib/bitset_stats.h
index 38675e77..c439a804 100644
--- a/lib/bitset_stats.h
+++ b/lib/bitset_stats.h
@@ -1,7 +1,6 @@
 /* Functions to support bitset statistics.
 
-   Copyright (C) 2002, 2003, 2004, 2009, 2010 Free Software
-   Foundation, Inc.
+   Copyright (C) 2002-2004, 2009-2011 Free Software Foundation, Inc.
 
    Contributed by Michael Hayes (m.hayes@elec.canterbury.ac.nz).
 
diff --git a/lib/bitsetv-print.c b/lib/bitsetv-print.c
index 17a45e09..e797556b 100644
--- a/lib/bitsetv-print.c
+++ b/lib/bitsetv-print.c
@@ -1,6 +1,6 @@
 /* Bitset vectors.
 
-   Copyright (C) 2001, 2002, 2004, 2006, 2009, 2010 Free Software
+   Copyright (C) 2001-2002, 2004, 2006, 2009-2011 Free Software
    Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/lib/bitsetv-print.h b/lib/bitsetv-print.h
index 23474867..49fecb2c 100644
--- a/lib/bitsetv-print.h
+++ b/lib/bitsetv-print.h
@@ -1,6 +1,6 @@
 /* Bitset vectors.
 
-   Copyright (C) 2002, 2004, 2009, 2010 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004, 2009-2011 Free Software Foundation, Inc.
 
    Contributed by Akim Demaille (akim@freefriends.org).
 
diff --git a/lib/bitsetv.c b/lib/bitsetv.c
index e4748366..3495ab2d 100644
--- a/lib/bitsetv.c
+++ b/lib/bitsetv.c
@@ -1,6 +1,6 @@
 /* Bitset vectors.
 
-   Copyright (C) 2001, 2002, 2004, 2005, 2006, 2009, 2010 Free Software
+   Copyright (C) 2001-2002, 2004-2006, 2009-2011 Free Software
    Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/lib/bitsetv.h b/lib/bitsetv.h
index 53450cc4..e5418be2 100644
--- a/lib/bitsetv.h
+++ b/lib/bitsetv.h
@@ -1,6 +1,6 @@
 /* Bitset vectors.
 
-   Copyright (C) 2002, 2004, 2009, 2010 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004, 2009-2011 Free Software Foundation, Inc.
 
    Contributed by Michael Hayes (m.hayes@elec.canterbury.ac.nz).
 
diff --git a/lib/ebitset.c b/lib/ebitset.c
index 2645b30c..2f6960d9 100644
--- a/lib/ebitset.c
+++ b/lib/ebitset.c
@@ -1,7 +1,6 @@
 /* Functions to support expandable bitsets.
 
-   Copyright (C) 2002, 2003, 2004, 2005, 2006, 2009, 2010 Free
-   Software Foundation, Inc.
+   Copyright (C) 2002-2006, 2009-2011 Free Software Foundation, Inc.
 
    Contributed by Michael Hayes (m.hayes@elec.canterbury.ac.nz).
 
diff --git a/lib/ebitset.h b/lib/ebitset.h
index 5b0b28f3..a98e38dd 100644
--- a/lib/ebitset.h
+++ b/lib/ebitset.h
@@ -1,6 +1,6 @@
 /* Functions to support ebitsets.
 
-   Copyright (C) 2002, 2004, 2009, 2010 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004, 2009-2011 Free Software Foundation, Inc.
 
    Contributed by Michael Hayes (m.hayes@elec.canterbury.ac.nz).
 
diff --git a/lib/get-errno.c b/lib/get-errno.c
index c3354ec0..c46375e0 100644
--- a/lib/get-errno.c
+++ b/lib/get-errno.c
@@ -1,6 +1,6 @@
 /* get-errno.c - get and set errno.
 
-   Copyright (C) 2002, 2006, 2009, 2010 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2006, 2009-2011 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
diff --git a/lib/get-errno.h b/lib/get-errno.h
index f376b837..5a8ab4c2 100644
--- a/lib/get-errno.h
+++ b/lib/get-errno.h
@@ -1,6 +1,6 @@
 /* get-errno.h - get and set errno.
 
-   Copyright (C) 2002, 2009, 2010 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2009-2011 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
diff --git a/lib/lbitset.c b/lib/lbitset.c
index d8cd9ed6..fb493add 100644
--- a/lib/lbitset.c
+++ b/lib/lbitset.c
@@ -1,7 +1,7 @@
 /* Functions to support link list bitsets.
 
-   Copyright (C) 2002, 2003, 2004, 2006, 2009, 2010 Free Software
-   Foundation, Inc.
+   Copyright (C) 2002-2004, 2006, 2009-2011 Free Software Foundation,
+   Inc.
 
    Contributed by Michael Hayes (m.hayes@elec.canterbury.ac.nz).
 
diff --git a/lib/lbitset.h b/lib/lbitset.h
index 52c8f8bf..eb9a2a54 100644
--- a/lib/lbitset.h
+++ b/lib/lbitset.h
@@ -1,6 +1,6 @@
 /* Functions to support lbitsets.
 
-   Copyright (C) 2002, 2004, 2009, 2010 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004, 2009-2011 Free Software Foundation, Inc.
 
    Contributed by Michael Hayes (m.hayes@elec.canterbury.ac.nz).
 
diff --git a/lib/libiberty.h b/lib/libiberty.h
index e69fc2e8..a45bc8bf 100644
--- a/lib/libiberty.h
+++ b/lib/libiberty.h
@@ -1,6 +1,6 @@
 /* Fake libiberty.h for Bison.
 
-   Copyright (C) 2002, 2003, 2004, 2009, 2010 Free Software Foundation, Inc.
+   Copyright (C) 2002-2004, 2009-2011 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
diff --git a/lib/local.mk b/lib/local.mk
index 17f71bb8..77b03665 100644
--- a/lib/local.mk
+++ b/lib/local.mk
@@ -1,7 +1,7 @@
 # Make bison/lib.
 
-# Copyright (C) 2001, 2002, 2003, 2004, 2006, 2008, 2009, 2010 Free
-# Software Foundation, Inc.
+# Copyright (C) 2001-2004, 2006, 2008-2011 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
diff --git a/lib/main.c b/lib/main.c
index 9566c5d5..b252f58d 100644
--- a/lib/main.c
+++ b/lib/main.c
@@ -1,6 +1,6 @@
 /* Yacc library main function.
 
-   Copyright (C) 2002, 2009, 2010 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2009-2011 Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/lib/timevar.c b/lib/timevar.c
index 8896af61..03ec0b65 100644
--- a/lib/timevar.c
+++ b/lib/timevar.c
@@ -1,6 +1,6 @@
 /* Timing variables for measuring compiler performance.
 
-   Copyright (C) 2000, 2002, 2004, 2006, 2009, 2010 Free Software
+   Copyright (C) 2000, 2002, 2004, 2006, 2009-2011 Free Software
    Foundation, Inc.
 
    Contributed by Alex Samuel <samuel@codesourcery.com>
diff --git a/lib/timevar.def b/lib/timevar.def
index 0ec927ef..ad5e3568 100644
--- a/lib/timevar.def
+++ b/lib/timevar.def
@@ -1,7 +1,7 @@
 /* This file contains the definitions for timing variables used to -*- C -*-
    measure run-time performance of the compiler.
 
-   Copyright (C) 2002, 2007, 2009, 2010 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2007, 2009-2011 Free Software Foundation, Inc.
 
    Contributed by Akim Demaille <akim@freefriends.org>.
 
diff --git a/lib/timevar.h b/lib/timevar.h
index 162206fa..5a74b83f 100644
--- a/lib/timevar.h
+++ b/lib/timevar.h
@@ -1,7 +1,7 @@
 /* Timing variables for measuring compiler performance.
 
-   Copyright (C) 2000, 2002, 2004, 2009, 2010 Free Software
-   Foundation, Inc.
+   Copyright (C) 2000, 2002, 2004, 2009-2011 Free Software Foundation,
+   Inc.
 
    Contributed by Alex Samuel <samuel@codesourcery.com>
 
diff --git a/lib/vbitset.c b/lib/vbitset.c
index 8b5756ff..7d75eacf 100644
--- a/lib/vbitset.c
+++ b/lib/vbitset.c
@@ -1,7 +1,6 @@
 /* Variable array bitsets.
 
-   Copyright (C) 2002, 2003, 2004, 2005, 2006, 2009, 2010 Free
-   Software Foundation, Inc.
+   Copyright (C) 2002-2006, 2009-2011 Free Software Foundation, Inc.
 
    Contributed by Michael Hayes (m.hayes@elec.canterbury.ac.nz).
 
diff --git a/lib/vbitset.h b/lib/vbitset.h
index f1f7a111..1ed59cc7 100644
--- a/lib/vbitset.h
+++ b/lib/vbitset.h
@@ -1,6 +1,6 @@
 /* Functions to support vbitsets.
 
-   Copyright (C) 2002, 2004, 2009, 2010 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004, 2009-2011 Free Software Foundation, Inc.
 
    Contributed by Michael Hayes (m.hayes@elec.canterbury.ac.nz).
 
diff --git a/lib/yyerror.c b/lib/yyerror.c
index 6db0e158..3fbd65a3 100644
--- a/lib/yyerror.c
+++ b/lib/yyerror.c
@@ -1,6 +1,6 @@
 /* Yacc library error-printing function.
 
-   Copyright (C) 2002, 2009, 2010 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2009-2011 Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/m4/bison-i18n.m4 b/m4/bison-i18n.m4
index 06f41fff..b3876157 100644
--- a/m4/bison-i18n.m4
+++ b/m4/bison-i18n.m4
@@ -1,6 +1,6 @@
 # bison-i18n.m4 serial 2
 
-dnl Copyright (C) 2005, 2006, 2009, 2010 Free Software Foundation, Inc.
+dnl Copyright (C) 2005-2006, 2009-2011 Free Software Foundation, Inc.
 
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
diff --git a/m4/c-working.m4 b/m4/c-working.m4
index ae0d300b..c11d94a1 100644
--- a/m4/c-working.m4
+++ b/m4/c-working.m4
@@ -1,6 +1,6 @@
 # Sanity test a C compiler.
 
-# Copyright (C) 2006, 2009, 2010 Free Software Foundation, Inc.
+# Copyright (C) 2006, 2009-2011 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
diff --git a/m4/cxx.m4 b/m4/cxx.m4
index 2d7318c9..39bea439 100644
--- a/m4/cxx.m4
+++ b/m4/cxx.m4
@@ -1,7 +1,7 @@
 # -*- Autoconf -*-
 # Sanity-test a C++ compiler.
 #
-# Copyright (C) 2004, 2006, 2009, 2010 Free Software Foundation, Inc.
+# Copyright (C) 2004, 2006, 2009-2011 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
diff --git a/m4/subpipe.m4 b/m4/subpipe.m4
index ca26aafa..e41d1741 100644
--- a/m4/subpipe.m4
+++ b/m4/subpipe.m4
@@ -1,7 +1,7 @@
 # -*- Autoconf -*-
 # Checks required to run `subpipe'.
 #
-# Copyright (C) 2002, 2003, 2005, 2009, 2010 Free Software Foundation,
+# Copyright (C) 2002-2003, 2005, 2009-2011 Free Software Foundation,
 # Inc.
 #
 # This program is free software: you can redistribute it and/or modify
diff --git a/m4/timevar.m4 b/m4/timevar.m4
index 5a0de5dc..2db0dfd8 100644
--- a/m4/timevar.m4
+++ b/m4/timevar.m4
@@ -1,7 +1,7 @@
 # -*- Autoconf -*-
 # Checks required to run `timevar', a time tracker.
 #
-# Copyright (C) 2002, 2003, 2009, 2010 Free Software Foundation, Inc.
+# Copyright (C) 2002-2003, 2009-2011 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
diff --git a/src/AnnotationList.c b/src/AnnotationList.c
index c1db1e95..3ae31754 100644
--- a/src/AnnotationList.c
+++ b/src/AnnotationList.c
@@ -1,6 +1,6 @@
 /* IELR's inadequacy annotation list.
 
-   Copyright (C) 2009, 2010 Free Software Foundation, Inc.
+   Copyright (C) 2009-2011 Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/src/AnnotationList.h b/src/AnnotationList.h
index 16749bc9..da551aaa 100644
--- a/src/AnnotationList.h
+++ b/src/AnnotationList.h
@@ -1,6 +1,6 @@
 /* IELR's inadequacy annotation list.
 
-   Copyright (C) 2009, 2010 Free Software Foundation, Inc.
+   Copyright (C) 2009-2011 Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/src/InadequacyList.c b/src/InadequacyList.c
index 341d29c6..ca37e600 100644
--- a/src/InadequacyList.c
+++ b/src/InadequacyList.c
@@ -1,6 +1,6 @@
 /* IELR's inadequacy list.
 
-   Copyright (C) 2009, 2010 Free Software Foundation, Inc.
+   Copyright (C) 2009-2011 Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/src/InadequacyList.h b/src/InadequacyList.h
index 73a094dd..d5810123 100644
--- a/src/InadequacyList.h
+++ b/src/InadequacyList.h
@@ -1,6 +1,6 @@
 /* IELR's inadequacy list.
 
-   Copyright (C) 2009, 2010 Free Software Foundation, Inc.
+   Copyright (C) 2009-2011 Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/src/LR0.c b/src/LR0.c
index a2efd5e1..29689658 100644
--- a/src/LR0.c
+++ b/src/LR0.c
@@ -1,7 +1,7 @@
 /* Generate the LR(0) parser states for Bison.
 
-   Copyright (C) 1984, 1986, 1989, 2000, 2001, 2002, 2004, 2005, 2006,
-   2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+   Copyright (C) 1984, 1986, 1989, 2000-2002, 2004-2011 Free Software
+   Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/src/LR0.h b/src/LR0.h
index f880fe83..2c86bcf7 100644
--- a/src/LR0.h
+++ b/src/LR0.h
@@ -1,7 +1,7 @@
 /* Generate the LR(0) parser states for Bison.
 
-   Copyright (C) 1984, 1986, 1989, 2000, 2001, 2002, 2009, 2010 Free
-   Software Foundation, Inc.
+   Copyright (C) 1984, 1986, 1989, 2000-2002, 2009-2011 Free Software
+   Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/src/Sbitset.c b/src/Sbitset.c
index 918e1b83..b0f7cc22 100644
--- a/src/Sbitset.c
+++ b/src/Sbitset.c
@@ -1,6 +1,6 @@
 /* A simple, memory-efficient bitset implementation.
 
-   Copyright (C) 2009, 2010 Free Software Foundation, Inc.
+   Copyright (C) 2009-2011 Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/src/Sbitset.h b/src/Sbitset.h
index 085cb2c4..663cd129 100644
--- a/src/Sbitset.h
+++ b/src/Sbitset.h
@@ -1,6 +1,6 @@
 /* A simple, memory-efficient bitset implementation.
 
-   Copyright (C) 2009, 2010 Free Software Foundation, Inc.
+   Copyright (C) 2009-2011 Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/src/assoc.c b/src/assoc.c
index 220c3eaa..495d384f 100644
--- a/src/assoc.c
+++ b/src/assoc.c
@@ -1,7 +1,7 @@
 /* Associativity information.
 
-   Copyright (C) 2002, 2005, 2006, 2008, 2009, 2010 Free Software
-   Foundation, Inc.
+   Copyright (C) 2002, 2005-2006, 2008-2011 Free Software Foundation,
+   Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/src/assoc.h b/src/assoc.h
index fcd441e8..4d56dfec 100644
--- a/src/assoc.h
+++ b/src/assoc.h
@@ -1,7 +1,6 @@
 /* Associativity information.
 
-   Copyright (C) 2002, 2006, 2008, 2009, 2010 Free Software
-   Foundation, Inc.
+   Copyright (C) 2002, 2006, 2008-2011 Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/src/closure.c b/src/closure.c
index 631a6e38..0904f3a6 100644
--- a/src/closure.c
+++ b/src/closure.c
@@ -1,7 +1,7 @@
 /* Closures for Bison
 
-   Copyright (C) 1984, 1989, 2000, 2001, 2002, 2004, 2005, 2007, 2009,
-   2010 Free Software Foundation, Inc.
+   Copyright (C) 1984, 1989, 2000-2002, 2004-2005, 2007, 2009-2011 Free
+   Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/src/closure.h b/src/closure.h
index 2aaba5ce..53935657 100644
--- a/src/closure.h
+++ b/src/closure.h
@@ -1,7 +1,7 @@
 /* Subroutines for bison
 
-   Copyright (C) 1984, 1989, 2000, 2001, 2002, 2007, 2009, 2010 Free
-   Software Foundation, Inc.
+   Copyright (C) 1984, 1989, 2000-2002, 2007, 2009-2011 Free Software
+   Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/src/complain.c b/src/complain.c
index 22ad4248..3b0041e8 100644
--- a/src/complain.c
+++ b/src/complain.c
@@ -1,7 +1,7 @@
 /* Declaration for error-reporting function for Bison.
 
-   Copyright (C) 2000, 2001, 2002, 2004, 2005, 2006, 2009, 2010 Free
-   Software Foundation, Inc.
+   Copyright (C) 2000-2002, 2004-2006, 2009-2011 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
diff --git a/src/complain.h b/src/complain.h
index db151257..f6281756 100644
--- a/src/complain.h
+++ b/src/complain.h
@@ -1,7 +1,7 @@
 /* Declaration for error-reporting function for Bison.
 
-   Copyright (C) 2000, 2001, 2002, 2006, 2009, 2010 Free Software
-   Foundation, Inc.
+   Copyright (C) 2000-2002, 2006, 2009-2011 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
diff --git a/src/conflicts.c b/src/conflicts.c
index f17f0fea..96034989 100644
--- a/src/conflicts.c
+++ b/src/conflicts.c
@@ -1,7 +1,7 @@
 /* Find and resolve or report lookahead conflicts for bison,
 
-   Copyright (C) 1984, 1989, 1992, 2000, 2001, 2002, 2003, 2004, 2005,
-   2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+   Copyright (C) 1984, 1989, 1992, 2000-2011 Free Software Foundation,
+   Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/src/conflicts.h b/src/conflicts.h
index f05f6024..55f379ac 100644
--- a/src/conflicts.h
+++ b/src/conflicts.h
@@ -1,7 +1,7 @@
 /* Find and resolve or report lookahead conflicts for bison,
 
-   Copyright (C) 2000, 2001, 2002, 2004, 2007, 2009, 2010 Free
-   Software Foundation, Inc.
+   Copyright (C) 2000-2002, 2004, 2007, 2009-2011 Free Software
+   Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/src/derives.c b/src/derives.c
index 87c98836..41cec8e1 100644
--- a/src/derives.c
+++ b/src/derives.c
@@ -1,7 +1,7 @@
 /* Match rules with nonterminals for bison,
 
-   Copyright (C) 1984, 1989, 2000, 2001, 2002, 2003, 2005, 2009, 2010
-   Free Software Foundation, Inc.
+   Copyright (C) 1984, 1989, 2000-2003, 2005, 2009-2011 Free Software
+   Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/src/derives.h b/src/derives.h
index 7935229f..b4466bca 100644
--- a/src/derives.h
+++ b/src/derives.h
@@ -1,7 +1,7 @@
 /* Match rules with nonterminals for bison,
 
-   Copyright (C) 1984, 1989, 2000, 2001, 2002, 2009, 2010 Free
-   Software Foundation, Inc.
+   Copyright (C) 1984, 1989, 2000-2002, 2009-2011 Free Software
+   Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/src/files.c b/src/files.c
index 49e8379e..ba770530 100644
--- a/src/files.c
+++ b/src/files.c
@@ -1,7 +1,7 @@
 /* Open and close files for Bison.
 
-   Copyright (C) 1984, 1986, 1989, 1992, 2000, 2001, 2002, 2003, 2004,
-   2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+   Copyright (C) 1984, 1986, 1989, 1992, 2000-2011 Free Software
+   Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/src/files.h b/src/files.h
index 7742189f..48fff6c1 100644
--- a/src/files.h
+++ b/src/files.h
@@ -1,7 +1,7 @@
 /* File names and variables for bison,
 
-   Copyright (C) 1984, 1989, 2000, 2001, 2002, 2006, 2007, 2009, 2010
-   Free Software Foundation, Inc.
+   Copyright (C) 1984, 1989, 2000-2002, 2006-2007, 2009-2011 Free
+   Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/src/flex-scanner.h b/src/flex-scanner.h
index df61eb77..221091e3 100644
--- a/src/flex-scanner.h
+++ b/src/flex-scanner.h
@@ -1,6 +1,6 @@
 /* Common parts between scan-code.l, scan-gram.l, and scan-skel.l.
 
-   Copyright (C) 2006, 2009, 2010 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2009-2011 Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/src/getargs.c b/src/getargs.c
index 7365ab7e..ab9a2b5f 100644
--- a/src/getargs.c
+++ b/src/getargs.c
@@ -1,7 +1,7 @@
 /* Parse command line arguments for Bison.
 
-   Copyright (C) 1984, 1986, 1989, 1992, 2000, 2001, 2002, 2003, 2004,
-   2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+   Copyright (C) 1984, 1986, 1989, 1992, 2000-2011 Free Software
+   Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/src/getargs.h b/src/getargs.h
index 84028b52..f1146220 100644
--- a/src/getargs.h
+++ b/src/getargs.h
@@ -1,7 +1,7 @@
 /* Parse command line arguments for bison.
 
-   Copyright (C) 1984, 1986, 1989, 1992, 2000, 2001, 2002, 2003, 2004,
-   2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+   Copyright (C) 1984, 1986, 1989, 1992, 2000-2011 Free Software
+   Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/src/gram.c b/src/gram.c
index a0e528ab..49f2eb7e 100644
--- a/src/gram.c
+++ b/src/gram.c
@@ -1,7 +1,7 @@
 /* Allocate input grammar variables for Bison.
 
-   Copyright (C) 1984, 1986, 1989, 2001, 2002, 2003, 2005, 2006, 2007,
-   2008, 2009, 2010 Free Software Foundation, Inc.
+   Copyright (C) 1984, 1986, 1989, 2001-2003, 2005-2011 Free Software
+   Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/src/gram.h b/src/gram.h
index 85792d6f..50d9c348 100644
--- a/src/gram.h
+++ b/src/gram.h
@@ -1,7 +1,7 @@
 /* Data definitions for internal representation of Bison's input.
 
-   Copyright (C) 1984, 1986, 1989, 1992, 2001, 2002, 2003, 2004, 2005,
-   2006, 2007, 2009, 2010 Free Software Foundation, Inc.
+   Copyright (C) 1984, 1986, 1989, 1992, 2001-2007, 2009-2011 Free
+   Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/src/graphviz.c b/src/graphviz.c
index b06161c4..1de93283 100644
--- a/src/graphviz.c
+++ b/src/graphviz.c
@@ -1,6 +1,6 @@
 /* Output Graphviz specification of a state machine generated by Bison.
 
-   Copyright (C) 2006, 2007, 2009, 2010 Free Software Foundation, Inc.
+   Copyright (C) 2006-2007, 2009-2011 Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/src/graphviz.h b/src/graphviz.h
index e549feae..4ec8f725 100644
--- a/src/graphviz.h
+++ b/src/graphviz.h
@@ -1,6 +1,6 @@
 /* Output Graphviz specification of a state machine generated by Bison.
 
-   Copyright (C) 2006, 2010 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2010-2011 Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/src/ielr.c b/src/ielr.c
index a2c654cf..2bf9412b 100644
--- a/src/ielr.c
+++ b/src/ielr.c
@@ -1,6 +1,6 @@
 /* IELR main implementation.
 
-   Copyright (C) 2009, 2010 Free Software Foundation, Inc.
+   Copyright (C) 2009-2011 Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/src/ielr.h b/src/ielr.h
index db1fb44f..a488a150 100644
--- a/src/ielr.h
+++ b/src/ielr.h
@@ -1,6 +1,6 @@
 /* IELR main implementation.
 
-   Copyright (C) 2009, 2010 Free Software Foundation, Inc.
+   Copyright (C) 2009-2011 Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/src/lalr.c b/src/lalr.c
index 843d37a7..40a4a68e 100644
--- a/src/lalr.c
+++ b/src/lalr.c
@@ -1,7 +1,7 @@
 /* Compute lookahead criteria for Bison.
 
-   Copyright (C) 1984, 1986, 1989, 2000, 2001, 2002, 2003, 2004, 2005,
-   2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+   Copyright (C) 1984, 1986, 1989, 2000-2011 Free Software Foundation,
+   Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/src/lalr.h b/src/lalr.h
index b943aed9..0fec83b1 100644
--- a/src/lalr.h
+++ b/src/lalr.h
@@ -1,7 +1,7 @@
 /* Compute lookahead criteria for bison,
 
-   Copyright (C) 1984, 1986, 1989, 2000, 2002, 2004, 2006, 2007, 2009,
-   2010 Free Software Foundation, Inc.
+   Copyright (C) 1984, 1986, 1989, 2000, 2002, 2004, 2006-2007,
+   2009-2011 Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/src/local.mk b/src/local.mk
index d939a5b3..1e54ce79 100644
--- a/src/local.mk
+++ b/src/local.mk
@@ -1,5 +1,4 @@
-## Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
-## 2010 Free Software Foundation, Inc.
+## Copyright (C) 2001-2011 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
diff --git a/src/location.c b/src/location.c
index b81d921c..361418ae 100644
--- a/src/location.c
+++ b/src/location.c
@@ -1,7 +1,6 @@
 /* Locations for Bison
 
-   Copyright (C) 2002, 2005, 2006, 2007, 2008, 2009, 2010 Free
-   Software Foundation, Inc.
+   Copyright (C) 2002, 2005-2011 Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/src/location.h b/src/location.h
index 23dd4843..30683dfc 100644
--- a/src/location.h
+++ b/src/location.h
@@ -1,7 +1,6 @@
 /* Locations for Bison
 
-   Copyright (C) 2002, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
-   Software Foundation, Inc.
+   Copyright (C) 2002, 2004-2011 Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/src/main.c b/src/main.c
index d395eb17..eca261a2 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1,7 +1,7 @@
 /* Top level entry point of Bison.
 
-   Copyright (C) 1984, 1986, 1989, 1992, 1995, 2000, 2001, 2002, 2004,
-   2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+   Copyright (C) 1984, 1986, 1989, 1992, 1995, 2000-2002, 2004-2011 Free
+   Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/src/muscle-tab.c b/src/muscle-tab.c
index c443f5a8..370a3538 100644
--- a/src/muscle-tab.c
+++ b/src/muscle-tab.c
@@ -1,7 +1,6 @@
 /* Muscle table manager for Bison.
 
-   Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
-   2010 Free Software Foundation, Inc.
+   Copyright (C) 2001-2011 Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/src/muscle-tab.h b/src/muscle-tab.h
index badd36c7..b8d0478b 100644
--- a/src/muscle-tab.h
+++ b/src/muscle-tab.h
@@ -1,7 +1,6 @@
 /* Muscle table manager for Bison,
 
-   Copyright (C) 2001, 2002, 2003, 2006, 2007, 2008, 2009, 2010 Free
-   Software Foundation, Inc.
+   Copyright (C) 2001-2003, 2006-2011 Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/src/named-ref.c b/src/named-ref.c
index 61b916ee..4bf3da12 100644
--- a/src/named-ref.c
+++ b/src/named-ref.c
@@ -1,6 +1,6 @@
 /* Named symbol references for Bison
 
-   Copyright (C) 2009, 2010 Free Software Foundation, Inc.
+   Copyright (C) 2009-2011 Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/src/named-ref.h b/src/named-ref.h
index e821a662..0f96e463 100644
--- a/src/named-ref.h
+++ b/src/named-ref.h
@@ -1,6 +1,6 @@
 /* Named symbol references for Bison
 
-   Copyright (C) 2009, 2010 Free Software Foundation, Inc.
+   Copyright (C) 2009-2011 Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/src/nullable.c b/src/nullable.c
index 057cfb64..c11aa534 100644
--- a/src/nullable.c
+++ b/src/nullable.c
@@ -1,7 +1,7 @@
 /* Calculate which nonterminals can expand into the null string for Bison.
 
-   Copyright (C) 1984, 1989, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-   2009, 2010 Free Software Foundation, Inc.
+   Copyright (C) 1984, 1989, 2000-2006, 2009-2011 Free Software
+   Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/src/nullable.h b/src/nullable.h
index 04ac0876..e69df872 100644
--- a/src/nullable.h
+++ b/src/nullable.h
@@ -1,6 +1,6 @@
 /* Part of the bison parser generator,
 
-   Copyright (C) 2000, 2002, 2009, 2010 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2002, 2009-2011 Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/src/output.c b/src/output.c
index 1d4c15ad..d62b8f0b 100644
--- a/src/output.c
+++ b/src/output.c
@@ -1,7 +1,7 @@
 /* Output the generated parsing program for Bison.
 
-   Copyright (C) 1984, 1986, 1989, 1992, 2000, 2001, 2002, 2003, 2004,
-   2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+   Copyright (C) 1984, 1986, 1989, 1992, 2000-2011 Free Software
+   Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/src/output.h b/src/output.h
index e96755d7..c8fad02c 100644
--- a/src/output.h
+++ b/src/output.h
@@ -1,7 +1,7 @@
 /* Output the generated parsing program for bison,
 
-   Copyright (C) 2000, 2001, 2002, 2003, 2006, 2007, 2009, 2010 Free
-   Software Foundation, Inc.
+   Copyright (C) 2000-2003, 2006-2007, 2009-2011 Free Software
+   Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/src/parse-gram.c b/src/parse-gram.c
index 55faee24..64e26cf4 100644
--- a/src/parse-gram.c
+++ b/src/parse-gram.c
@@ -1,9 +1,8 @@
-/* A Bison parser, made by GNU Bison 2.4.542-10bae.  */
+/* A Bison parser, made by GNU Bison 2.4.547-d397.  */
 
 /* Implementation for Bison's Yacc-like parsers in C
 
-   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-   2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+   Copyright (C) 1984, 1989-1990, 2000-2011 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
@@ -45,7 +44,7 @@
 #define YYBISON 1
 
 /* Bison version.  */
-#define YYBISON_VERSION "2.4.542-10bae"
+#define YYBISON_VERSION "2.4.547-d397"
 
 /* Skeleton name.  */
 #define YYSKELETON_NAME "yacc.c"
@@ -77,8 +76,7 @@
 #line 1 "src/parse-gram.y"
 /* Bison Grammar Parser                             -*- C -*-
 
-   Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
-   Free Software Foundation, Inc.
+   Copyright (C) 2002-2011 Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
@@ -129,7 +127,7 @@ static void gram_error (location const *, char const *);
 static char const *char_name (char);
 
 /* Line 269 of yacc.c  */
-#line 133 "src/parse-gram.c"
+#line 131 "src/parse-gram.c"
 
 /* Enabling traces.  */
 #ifndef YYDEBUG
@@ -151,7 +149,7 @@ static char const *char_name (char);
 
 /* "%code requires" blocks.  */
 /* Line 289 of yacc.c  */
-#line 203 "src/parse-gram.y"
+#line 202 "src/parse-gram.y"
 
 # ifndef PARAM_TYPE
 #  define PARAM_TYPE
@@ -166,7 +164,7 @@ static char const *char_name (char);
 
 
 /* Line 289 of yacc.c  */
-#line 170 "src/parse-gram.c"
+#line 168 "src/parse-gram.c"
 
 /* Tokens.  */
 #ifndef YYTOKENTYPE
@@ -295,7 +293,7 @@ static char const *char_name (char);
 typedef union YYSTYPE
 {
 /* Line 294 of yacc.c  */
-#line 89 "src/parse-gram.y"
+#line 88 "src/parse-gram.y"
 
   assoc assoc;
   char *code;
@@ -308,13 +306,13 @@ typedef union YYSTYPE
   unsigned char character;
 
 /* Line 294 of yacc.c  */
-#line 227 "src/parse-gram.y"
+#line 226 "src/parse-gram.y"
 
   param_type param;
 
 
 /* Line 294 of yacc.c  */
-#line 318 "src/parse-gram.c"
+#line 316 "src/parse-gram.c"
 } YYSTYPE;
 # define YYSTYPE_IS_TRIVIAL 1
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
@@ -338,10 +336,10 @@ typedef struct YYLTYPE
 /* Copy the second part of user declarations.  */
 
 /* Line 344 of yacc.c  */
-#line 342 "src/parse-gram.c"
+#line 340 "src/parse-gram.c"
 /* Unqualified %code blocks.  */
 /* Line 345 of yacc.c  */
-#line 56 "src/parse-gram.y"
+#line 55 "src/parse-gram.y"
 
   static int current_prec = 0;
   static location current_lhs_location;
@@ -356,7 +354,7 @@ typedef struct YYLTYPE
   #define YYTYPE_UINT8 uint_fast8_t
 
 /* Line 345 of yacc.c  */
-#line 216 "src/parse-gram.y"
+#line 215 "src/parse-gram.y"
 
   /** Add a lex-param and/or a parse-param.
    *
@@ -369,7 +367,7 @@ typedef struct YYLTYPE
 
 
 /* Line 345 of yacc.c  */
-#line 373 "src/parse-gram.c"
+#line 371 "src/parse-gram.c"
 
 #ifdef short
 # undef short
@@ -628,18 +626,18 @@ static const yytype_uint8 yytranslate[] =
   /* YYRLINEYYN -- Source line where rule number YYN was defined.    */
 static const yytype_uint16 yyrline[] =
 {
-       0,   252,   252,   260,   262,   266,   267,   277,   281,   286,
-     287,   292,   297,   298,   299,   300,   301,   306,   315,   316,
-     317,   318,   319,   320,   321,   322,   322,   323,   324,   348,
-     349,   350,   351,   355,   356,   365,   366,   367,   371,   378,
-     385,   389,   393,   400,   415,   416,   420,   432,   432,   437,
-     437,   442,   453,   468,   469,   470,   471,   475,   476,   481,
-     483,   488,   489,   494,   496,   501,   502,   506,   507,   508,
-     509,   514,   519,   524,   530,   536,   547,   548,   557,   558,
-     564,   565,   566,   573,   573,   578,   579,   580,   585,   587,
-     589,   591,   593,   595,   597,   602,   604,   614,   615,   620,
-     621,   622,   631,   651,   653,   662,   667,   668,   673,   680,
-     682
+       0,   251,   251,   259,   261,   265,   266,   276,   280,   285,
+     286,   291,   296,   297,   298,   299,   300,   305,   314,   315,
+     316,   317,   318,   319,   320,   321,   321,   322,   323,   347,
+     348,   349,   350,   354,   355,   364,   365,   366,   370,   377,
+     384,   388,   392,   399,   414,   415,   419,   431,   431,   436,
+     436,   441,   452,   467,   468,   469,   470,   474,   475,   480,
+     482,   487,   488,   493,   495,   500,   501,   505,   506,   507,
+     508,   513,   518,   523,   529,   535,   546,   547,   556,   557,
+     563,   564,   565,   572,   572,   577,   578,   579,   584,   586,
+     588,   590,   592,   594,   596,   601,   603,   613,   614,   619,
+     620,   621,   630,   650,   652,   661,   666,   667,   672,   679,
+     681
 };
 #endif
 
@@ -1016,106 +1014,106 @@ yy_symbol_value_print (yyoutput, yytype, yyvaluep, yylocationp)
             case 3: // "string"
 
 /* Line 751 of yacc.c  */
-#line 176 "src/parse-gram.y"
+#line 175 "src/parse-gram.y"
         { fputs (quotearg_style (c_quoting_style, ((*yyvaluep).chars)), stderr); }
 /* Line 751 of yacc.c  */
-#line 1023 "src/parse-gram.c"
+#line 1021 "src/parse-gram.c"
         break;
 
             case 4: // "integer"
 
 /* Line 751 of yacc.c  */
-#line 189 "src/parse-gram.y"
+#line 188 "src/parse-gram.y"
         { fprintf (stderr, "%d", ((*yyvaluep).integer)); }
 /* Line 751 of yacc.c  */
-#line 1032 "src/parse-gram.c"
+#line 1030 "src/parse-gram.c"
         break;
 
             case 24: // "%<flag>"
 
 /* Line 751 of yacc.c  */
-#line 185 "src/parse-gram.y"
+#line 184 "src/parse-gram.y"
         { fprintf (stderr, "%%%s", ((*yyvaluep).uniqstr)); }
 /* Line 751 of yacc.c  */
-#line 1041 "src/parse-gram.c"
+#line 1039 "src/parse-gram.c"
         break;
 
             case 40: // "{...}"
 
 /* Line 751 of yacc.c  */
-#line 178 "src/parse-gram.y"
+#line 177 "src/parse-gram.y"
         { fprintf (stderr, "{\n%s\n}", ((*yyvaluep).code)); }
 /* Line 751 of yacc.c  */
-#line 1050 "src/parse-gram.c"
+#line 1048 "src/parse-gram.c"
         break;
 
             case 42: // "[identifier]"
 
 /* Line 751 of yacc.c  */
-#line 183 "src/parse-gram.y"
+#line 182 "src/parse-gram.y"
         { fprintf (stderr, "[%s]", ((*yyvaluep).uniqstr)); }
 /* Line 751 of yacc.c  */
-#line 1059 "src/parse-gram.c"
+#line 1057 "src/parse-gram.c"
         break;
 
             case 43: // "char"
 
 /* Line 751 of yacc.c  */
-#line 170 "src/parse-gram.y"
+#line 169 "src/parse-gram.y"
         { fputs (char_name (((*yyvaluep).character)), stderr); }
 /* Line 751 of yacc.c  */
-#line 1068 "src/parse-gram.c"
+#line 1066 "src/parse-gram.c"
         break;
 
             case 44: // "epilogue"
 
 /* Line 751 of yacc.c  */
-#line 178 "src/parse-gram.y"
+#line 177 "src/parse-gram.y"
         { fprintf (stderr, "{\n%s\n}", ((*yyvaluep).chars)); }
 /* Line 751 of yacc.c  */
-#line 1077 "src/parse-gram.c"
+#line 1075 "src/parse-gram.c"
         break;
 
             case 46: // "identifier"
 
 /* Line 751 of yacc.c  */
-#line 182 "src/parse-gram.y"
+#line 181 "src/parse-gram.y"
         { fputs (((*yyvaluep).uniqstr), stderr); }
 /* Line 751 of yacc.c  */
-#line 1086 "src/parse-gram.c"
+#line 1084 "src/parse-gram.c"
         break;
 
             case 47: // "identifier:"
 
 /* Line 751 of yacc.c  */
-#line 184 "src/parse-gram.y"
+#line 183 "src/parse-gram.y"
         { fprintf (stderr, "%s:", ((*yyvaluep).uniqstr)); }
 /* Line 751 of yacc.c  */
-#line 1095 "src/parse-gram.c"
+#line 1093 "src/parse-gram.c"
         break;
 
             case 50: // "%{...%}"
 
 /* Line 751 of yacc.c  */
-#line 178 "src/parse-gram.y"
+#line 177 "src/parse-gram.y"
         { fprintf (stderr, "{\n%s\n}", ((*yyvaluep).chars)); }
 /* Line 751 of yacc.c  */
-#line 1104 "src/parse-gram.c"
+#line 1102 "src/parse-gram.c"
         break;
 
             case 52: // "<tag>"
 
 /* Line 751 of yacc.c  */
-#line 186 "src/parse-gram.y"
+#line 185 "src/parse-gram.y"
         { fprintf (stderr, "<%s>", ((*yyvaluep).uniqstr)); }
 /* Line 751 of yacc.c  */
-#line 1113 "src/parse-gram.c"
+#line 1111 "src/parse-gram.c"
         break;
 
             case 55: // "%param"
 
 /* Line 751 of yacc.c  */
-#line 232 "src/parse-gram.y"
+#line 231 "src/parse-gram.y"
         {
   switch (((*yyvaluep).param))
     {
@@ -1129,79 +1127,79 @@ yy_symbol_value_print (yyoutput, yytype, yyvaluep, yylocationp)
     }
 }
 /* Line 751 of yacc.c  */
-#line 1133 "src/parse-gram.c"
+#line 1131 "src/parse-gram.c"
         break;
 
             case 72: // symbol.prec
 
 /* Line 751 of yacc.c  */
-#line 192 "src/parse-gram.y"
+#line 191 "src/parse-gram.y"
         { fprintf (stderr, "%s", ((*yyvaluep).symbol)->tag); }
 /* Line 751 of yacc.c  */
-#line 1142 "src/parse-gram.c"
+#line 1140 "src/parse-gram.c"
         break;
 
             case 85: // variable
 
 /* Line 751 of yacc.c  */
-#line 182 "src/parse-gram.y"
+#line 181 "src/parse-gram.y"
         { fputs (((*yyvaluep).uniqstr), stderr); }
 /* Line 751 of yacc.c  */
-#line 1151 "src/parse-gram.c"
+#line 1149 "src/parse-gram.c"
         break;
 
             case 86: // content.opt
 
 /* Line 751 of yacc.c  */
-#line 178 "src/parse-gram.y"
+#line 177 "src/parse-gram.y"
         { fprintf (stderr, "{\n%s\n}", ((*yyvaluep).chars)); }
 /* Line 751 of yacc.c  */
-#line 1160 "src/parse-gram.c"
+#line 1158 "src/parse-gram.c"
         break;
 
             case 87: // braceless
 
 /* Line 751 of yacc.c  */
-#line 178 "src/parse-gram.y"
+#line 177 "src/parse-gram.y"
         { fprintf (stderr, "{\n%s\n}", ((*yyvaluep).chars)); }
 /* Line 751 of yacc.c  */
-#line 1169 "src/parse-gram.c"
+#line 1167 "src/parse-gram.c"
         break;
 
             case 88: // id
 
 /* Line 751 of yacc.c  */
-#line 192 "src/parse-gram.y"
+#line 191 "src/parse-gram.y"
         { fprintf (stderr, "%s", ((*yyvaluep).symbol)->tag); }
 /* Line 751 of yacc.c  */
-#line 1178 "src/parse-gram.c"
+#line 1176 "src/parse-gram.c"
         break;
 
             case 89: // id_colon
 
 /* Line 751 of yacc.c  */
-#line 193 "src/parse-gram.y"
+#line 192 "src/parse-gram.y"
         { fprintf (stderr, "%s:", ((*yyvaluep).symbol)->tag); }
 /* Line 751 of yacc.c  */
-#line 1187 "src/parse-gram.c"
+#line 1185 "src/parse-gram.c"
         break;
 
             case 90: // symbol
 
 /* Line 751 of yacc.c  */
-#line 192 "src/parse-gram.y"
+#line 191 "src/parse-gram.y"
         { fprintf (stderr, "%s", ((*yyvaluep).symbol)->tag); }
 /* Line 751 of yacc.c  */
-#line 1196 "src/parse-gram.c"
+#line 1194 "src/parse-gram.c"
         break;
 
             case 91: // string_as_id
 
 /* Line 751 of yacc.c  */
-#line 192 "src/parse-gram.y"
+#line 191 "src/parse-gram.y"
         { fprintf (stderr, "%s", ((*yyvaluep).symbol)->tag); }
 /* Line 751 of yacc.c  */
-#line 1205 "src/parse-gram.c"
+#line 1203 "src/parse-gram.c"
         break;
 
       default:
@@ -1995,16 +1993,16 @@ YYLTYPE yylloc;
 #endif
 
 /* User initialization code.  */
-/* Line 1525 of yacc.c  */
-#line 81 "src/parse-gram.y"
+/* Line 1524 of yacc.c  */
+#line 80 "src/parse-gram.y"
 {
   /* Bison's grammar can initial empty locations, hence a default
      location is needed. */
   boundary_set (&yylloc.start, current_file, 1, 1);
   boundary_set (&yylloc.end, current_file, 1, 1);
 }
-/* Line 1525 of yacc.c  */
-#line 2008 "src/parse-gram.c"
+/* Line 1524 of yacc.c  */
+#line 2006 "src/parse-gram.c"
   yylsp[0] = yylloc;
 
   goto yysetstate;
@@ -2197,8 +2195,8 @@ yyreduce:
     switch (yyn)
       {
           case 6:
-/* Line 1741 of yacc.c  */
-#line 268 "src/parse-gram.y"
+/* Line 1740 of yacc.c  */
+#line 267 "src/parse-gram.y"
     {
       code_props plain_code;
       code_props_plain_init (&plain_code, (yyvsp[0].chars), (yylsp[0]));
@@ -2208,107 +2206,107 @@ yyreduce:
                         plain_code.code, (yylsp[0]));
       code_scanner_last_string_free ();
     }
-/* Line 1741 of yacc.c  */
-#line 2213 "src/parse-gram.c"
+/* Line 1740 of yacc.c  */
+#line 2211 "src/parse-gram.c"
     break;
 
   case 7:
-/* Line 1741 of yacc.c  */
-#line 278 "src/parse-gram.y"
+/* Line 1740 of yacc.c  */
+#line 277 "src/parse-gram.y"
     {
       muscle_percent_define_ensure ((yyvsp[0].uniqstr), (yylsp[0]), true);
     }
-/* Line 1741 of yacc.c  */
-#line 2223 "src/parse-gram.c"
+/* Line 1740 of yacc.c  */
+#line 2221 "src/parse-gram.c"
     break;
 
   case 8:
-/* Line 1741 of yacc.c  */
-#line 282 "src/parse-gram.y"
+/* Line 1740 of yacc.c  */
+#line 281 "src/parse-gram.y"
     {
       muscle_percent_define_insert ((yyvsp[-1].uniqstr), (yylsp[-1]), (yyvsp[0].chars),
                                     MUSCLE_PERCENT_DEFINE_GRAMMAR_FILE);
     }
-/* Line 1741 of yacc.c  */
-#line 2234 "src/parse-gram.c"
+/* Line 1740 of yacc.c  */
+#line 2232 "src/parse-gram.c"
     break;
 
   case 9:
-/* Line 1741 of yacc.c  */
-#line 286 "src/parse-gram.y"
+/* Line 1740 of yacc.c  */
+#line 285 "src/parse-gram.y"
     { defines_flag = true; }
-/* Line 1741 of yacc.c  */
-#line 2242 "src/parse-gram.c"
+/* Line 1740 of yacc.c  */
+#line 2240 "src/parse-gram.c"
     break;
 
   case 10:
-/* Line 1741 of yacc.c  */
-#line 288 "src/parse-gram.y"
+/* Line 1740 of yacc.c  */
+#line 287 "src/parse-gram.y"
     {
       defines_flag = true;
       spec_defines_file = xstrdup ((yyvsp[0].chars));
     }
-/* Line 1741 of yacc.c  */
-#line 2253 "src/parse-gram.c"
+/* Line 1740 of yacc.c  */
+#line 2251 "src/parse-gram.c"
     break;
 
   case 11:
-/* Line 1741 of yacc.c  */
-#line 293 "src/parse-gram.y"
+/* Line 1740 of yacc.c  */
+#line 292 "src/parse-gram.y"
     {
       muscle_percent_define_insert ("parse.error", (yylsp[0]), "verbose",
                                     MUSCLE_PERCENT_DEFINE_GRAMMAR_FILE);
     }
-/* Line 1741 of yacc.c  */
-#line 2264 "src/parse-gram.c"
+/* Line 1740 of yacc.c  */
+#line 2262 "src/parse-gram.c"
     break;
 
   case 12:
-/* Line 1741 of yacc.c  */
-#line 297 "src/parse-gram.y"
+/* Line 1740 of yacc.c  */
+#line 296 "src/parse-gram.y"
     { expected_sr_conflicts = (yyvsp[0].integer); }
-/* Line 1741 of yacc.c  */
-#line 2272 "src/parse-gram.c"
+/* Line 1740 of yacc.c  */
+#line 2270 "src/parse-gram.c"
     break;
 
   case 13:
-/* Line 1741 of yacc.c  */
-#line 298 "src/parse-gram.y"
+/* Line 1740 of yacc.c  */
+#line 297 "src/parse-gram.y"
     { expected_rr_conflicts = (yyvsp[0].integer); }
-/* Line 1741 of yacc.c  */
-#line 2280 "src/parse-gram.c"
+/* Line 1740 of yacc.c  */
+#line 2278 "src/parse-gram.c"
     break;
 
   case 14:
-/* Line 1741 of yacc.c  */
-#line 299 "src/parse-gram.y"
+/* Line 1740 of yacc.c  */
+#line 298 "src/parse-gram.y"
     { spec_file_prefix = (yyvsp[0].chars); }
-/* Line 1741 of yacc.c  */
-#line 2288 "src/parse-gram.c"
+/* Line 1740 of yacc.c  */
+#line 2286 "src/parse-gram.c"
     break;
 
   case 15:
-/* Line 1741 of yacc.c  */
-#line 300 "src/parse-gram.y"
+/* Line 1740 of yacc.c  */
+#line 299 "src/parse-gram.y"
     { spec_file_prefix = (yyvsp[0].chars); }
-/* Line 1741 of yacc.c  */
-#line 2296 "src/parse-gram.c"
+/* Line 1740 of yacc.c  */
+#line 2294 "src/parse-gram.c"
     break;
 
   case 16:
-/* Line 1741 of yacc.c  */
-#line 302 "src/parse-gram.y"
+/* Line 1740 of yacc.c  */
+#line 301 "src/parse-gram.y"
     {
       nondeterministic_parser = true;
       glr_parser = true;
     }
-/* Line 1741 of yacc.c  */
-#line 2307 "src/parse-gram.c"
+/* Line 1740 of yacc.c  */
+#line 2305 "src/parse-gram.c"
     break;
 
   case 17:
-/* Line 1741 of yacc.c  */
-#line 307 "src/parse-gram.y"
+/* Line 1740 of yacc.c  */
+#line 306 "src/parse-gram.y"
     {
       code_props action;
       code_props_symbol_action_init (&action, (yyvsp[0].code), (yylsp[0]));
@@ -2317,93 +2315,93 @@ yyreduce:
       muscle_code_grow ("initial_action", action.code, (yylsp[0]));
       code_scanner_last_string_free ();
     }
-/* Line 1741 of yacc.c  */
-#line 2322 "src/parse-gram.c"
+/* Line 1740 of yacc.c  */
+#line 2320 "src/parse-gram.c"
     break;
 
   case 18:
-/* Line 1741 of yacc.c  */
-#line 315 "src/parse-gram.y"
+/* Line 1740 of yacc.c  */
+#line 314 "src/parse-gram.y"
     { language_argmatch ((yyvsp[0].chars), grammar_prio, (yylsp[-1])); }
-/* Line 1741 of yacc.c  */
-#line 2330 "src/parse-gram.c"
+/* Line 1740 of yacc.c  */
+#line 2328 "src/parse-gram.c"
     break;
 
   case 19:
-/* Line 1741 of yacc.c  */
-#line 316 "src/parse-gram.y"
+/* Line 1740 of yacc.c  */
+#line 315 "src/parse-gram.y"
     { spec_name_prefix = (yyvsp[0].chars); }
-/* Line 1741 of yacc.c  */
-#line 2338 "src/parse-gram.c"
+/* Line 1740 of yacc.c  */
+#line 2336 "src/parse-gram.c"
     break;
 
   case 20:
-/* Line 1741 of yacc.c  */
-#line 317 "src/parse-gram.y"
+/* Line 1740 of yacc.c  */
+#line 316 "src/parse-gram.y"
     { spec_name_prefix = (yyvsp[0].chars); }
-/* Line 1741 of yacc.c  */
-#line 2346 "src/parse-gram.c"
+/* Line 1740 of yacc.c  */
+#line 2344 "src/parse-gram.c"
     break;
 
   case 21:
-/* Line 1741 of yacc.c  */
-#line 318 "src/parse-gram.y"
+/* Line 1740 of yacc.c  */
+#line 317 "src/parse-gram.y"
     { no_lines_flag = true; }
-/* Line 1741 of yacc.c  */
-#line 2354 "src/parse-gram.c"
+/* Line 1740 of yacc.c  */
+#line 2352 "src/parse-gram.c"
     break;
 
   case 22:
-/* Line 1741 of yacc.c  */
-#line 319 "src/parse-gram.y"
+/* Line 1740 of yacc.c  */
+#line 318 "src/parse-gram.y"
     { nondeterministic_parser = true; }
-/* Line 1741 of yacc.c  */
-#line 2362 "src/parse-gram.c"
+/* Line 1740 of yacc.c  */
+#line 2360 "src/parse-gram.c"
     break;
 
   case 23:
-/* Line 1741 of yacc.c  */
-#line 320 "src/parse-gram.y"
+/* Line 1740 of yacc.c  */
+#line 319 "src/parse-gram.y"
     { spec_outfile = (yyvsp[0].chars); }
-/* Line 1741 of yacc.c  */
-#line 2370 "src/parse-gram.c"
+/* Line 1740 of yacc.c  */
+#line 2368 "src/parse-gram.c"
     break;
 
   case 24:
-/* Line 1741 of yacc.c  */
-#line 321 "src/parse-gram.y"
+/* Line 1740 of yacc.c  */
+#line 320 "src/parse-gram.y"
     { spec_outfile = (yyvsp[0].chars); }
-/* Line 1741 of yacc.c  */
-#line 2378 "src/parse-gram.c"
+/* Line 1740 of yacc.c  */
+#line 2376 "src/parse-gram.c"
     break;
 
   case 25:
-/* Line 1741 of yacc.c  */
-#line 322 "src/parse-gram.y"
+/* Line 1740 of yacc.c  */
+#line 321 "src/parse-gram.y"
     { current_param = (yyvsp[0].param); }
-/* Line 1741 of yacc.c  */
-#line 2386 "src/parse-gram.c"
+/* Line 1740 of yacc.c  */
+#line 2384 "src/parse-gram.c"
     break;
 
   case 26:
-/* Line 1741 of yacc.c  */
-#line 322 "src/parse-gram.y"
+/* Line 1740 of yacc.c  */
+#line 321 "src/parse-gram.y"
     { current_param = param_none; }
-/* Line 1741 of yacc.c  */
-#line 2394 "src/parse-gram.c"
+/* Line 1740 of yacc.c  */
+#line 2392 "src/parse-gram.c"
     break;
 
   case 27:
-/* Line 1741 of yacc.c  */
-#line 323 "src/parse-gram.y"
+/* Line 1740 of yacc.c  */
+#line 322 "src/parse-gram.y"
     { version_check (&(yylsp[0]), (yyvsp[0].chars)); }
-/* Line 1741 of yacc.c  */
-#line 2402 "src/parse-gram.c"
+/* Line 1740 of yacc.c  */
+#line 2400 "src/parse-gram.c"
     break;
 
   case 28:
-/* Line 1741 of yacc.c  */
-#line 325 "src/parse-gram.y"
+/* Line 1740 of yacc.c  */
+#line 324 "src/parse-gram.y"
     {
       char const *skeleton_user = (yyvsp[0].chars);
       if (strchr (skeleton_user, '/'))
@@ -2427,199 +2425,199 @@ yyreduce:
         }
       skeleton_arg (skeleton_user, grammar_prio, (yylsp[-1]));
     }
-/* Line 1741 of yacc.c  */
-#line 2432 "src/parse-gram.c"
+/* Line 1740 of yacc.c  */
+#line 2430 "src/parse-gram.c"
     break;
 
   case 29:
-/* Line 1741 of yacc.c  */
-#line 348 "src/parse-gram.y"
+/* Line 1740 of yacc.c  */
+#line 347 "src/parse-gram.y"
     { token_table_flag = true; }
-/* Line 1741 of yacc.c  */
-#line 2440 "src/parse-gram.c"
+/* Line 1740 of yacc.c  */
+#line 2438 "src/parse-gram.c"
     break;
 
   case 30:
-/* Line 1741 of yacc.c  */
-#line 349 "src/parse-gram.y"
+/* Line 1740 of yacc.c  */
+#line 348 "src/parse-gram.y"
     { report_flag |= report_states; }
-/* Line 1741 of yacc.c  */
-#line 2448 "src/parse-gram.c"
+/* Line 1740 of yacc.c  */
+#line 2446 "src/parse-gram.c"
     break;
 
   case 31:
-/* Line 1741 of yacc.c  */
-#line 350 "src/parse-gram.y"
+/* Line 1740 of yacc.c  */
+#line 349 "src/parse-gram.y"
     { yacc_flag = true; }
-/* Line 1741 of yacc.c  */
-#line 2456 "src/parse-gram.c"
+/* Line 1740 of yacc.c  */
+#line 2454 "src/parse-gram.c"
     break;
 
   case 33:
-/* Line 1741 of yacc.c  */
-#line 355 "src/parse-gram.y"
+/* Line 1740 of yacc.c  */
+#line 354 "src/parse-gram.y"
     { add_param (current_param, (yyvsp[0].code), (yylsp[0])); }
-/* Line 1741 of yacc.c  */
-#line 2464 "src/parse-gram.c"
+/* Line 1740 of yacc.c  */
+#line 2462 "src/parse-gram.c"
     break;
 
   case 34:
-/* Line 1741 of yacc.c  */
-#line 356 "src/parse-gram.y"
+/* Line 1740 of yacc.c  */
+#line 355 "src/parse-gram.y"
     { add_param (current_param, (yyvsp[0].code), (yylsp[0])); }
-/* Line 1741 of yacc.c  */
-#line 2472 "src/parse-gram.c"
+/* Line 1740 of yacc.c  */
+#line 2470 "src/parse-gram.c"
     break;
 
   case 37:
-/* Line 1741 of yacc.c  */
-#line 368 "src/parse-gram.y"
+/* Line 1740 of yacc.c  */
+#line 367 "src/parse-gram.y"
     {
       grammar_start_symbol_set ((yyvsp[0].symbol), (yylsp[0]));
     }
-/* Line 1741 of yacc.c  */
-#line 2482 "src/parse-gram.c"
+/* Line 1740 of yacc.c  */
+#line 2480 "src/parse-gram.c"
     break;
 
   case 38:
-/* Line 1741 of yacc.c  */
-#line 372 "src/parse-gram.y"
+/* Line 1740 of yacc.c  */
+#line 371 "src/parse-gram.y"
     {
       symbol_list *list;
       for (list = (yyvsp[0].list); list; list = list->next)
 	symbol_list_destructor_set (list, (yyvsp[-1].code), (yylsp[-1]));
       symbol_list_free ((yyvsp[0].list));
     }
-/* Line 1741 of yacc.c  */
-#line 2495 "src/parse-gram.c"
+/* Line 1740 of yacc.c  */
+#line 2493 "src/parse-gram.c"
     break;
 
   case 39:
-/* Line 1741 of yacc.c  */
-#line 379 "src/parse-gram.y"
+/* Line 1740 of yacc.c  */
+#line 378 "src/parse-gram.y"
     {
       symbol_list *list;
       for (list = (yyvsp[0].list); list; list = list->next)
 	symbol_list_printer_set (list, (yyvsp[-1].code), (yylsp[-1]));
       symbol_list_free ((yyvsp[0].list));
     }
-/* Line 1741 of yacc.c  */
-#line 2508 "src/parse-gram.c"
+/* Line 1740 of yacc.c  */
+#line 2506 "src/parse-gram.c"
     break;
 
   case 40:
-/* Line 1741 of yacc.c  */
-#line 386 "src/parse-gram.y"
+/* Line 1740 of yacc.c  */
+#line 385 "src/parse-gram.y"
     {
       default_prec = true;
     }
-/* Line 1741 of yacc.c  */
-#line 2518 "src/parse-gram.c"
+/* Line 1740 of yacc.c  */
+#line 2516 "src/parse-gram.c"
     break;
 
   case 41:
-/* Line 1741 of yacc.c  */
-#line 390 "src/parse-gram.y"
+/* Line 1740 of yacc.c  */
+#line 389 "src/parse-gram.y"
     {
       default_prec = false;
     }
-/* Line 1741 of yacc.c  */
-#line 2528 "src/parse-gram.c"
+/* Line 1740 of yacc.c  */
+#line 2526 "src/parse-gram.c"
     break;
 
   case 42:
-/* Line 1741 of yacc.c  */
-#line 394 "src/parse-gram.y"
+/* Line 1740 of yacc.c  */
+#line 393 "src/parse-gram.y"
     {
       /* Do not invoke muscle_percent_code_grow here since it invokes
          muscle_user_name_list_grow.  */
       muscle_code_grow ("percent_code()", (yyvsp[0].chars), (yylsp[0]));
       code_scanner_last_string_free ();
     }
-/* Line 1741 of yacc.c  */
-#line 2541 "src/parse-gram.c"
+/* Line 1740 of yacc.c  */
+#line 2539 "src/parse-gram.c"
     break;
 
   case 43:
-/* Line 1741 of yacc.c  */
-#line 401 "src/parse-gram.y"
+/* Line 1740 of yacc.c  */
+#line 400 "src/parse-gram.y"
     {
       muscle_percent_code_grow ((yyvsp[-1].uniqstr), (yylsp[-1]), (yyvsp[0].chars), (yylsp[0]));
       code_scanner_last_string_free ();
     }
-/* Line 1741 of yacc.c  */
-#line 2552 "src/parse-gram.c"
+/* Line 1740 of yacc.c  */
+#line 2550 "src/parse-gram.c"
     break;
 
   case 44:
-/* Line 1741 of yacc.c  */
-#line 415 "src/parse-gram.y"
+/* Line 1740 of yacc.c  */
+#line 414 "src/parse-gram.y"
     {}
-/* Line 1741 of yacc.c  */
-#line 2560 "src/parse-gram.c"
+/* Line 1740 of yacc.c  */
+#line 2558 "src/parse-gram.c"
     break;
 
   case 45:
-/* Line 1741 of yacc.c  */
-#line 416 "src/parse-gram.y"
+/* Line 1740 of yacc.c  */
+#line 415 "src/parse-gram.y"
     { muscle_code_grow ("union_name", (yyvsp[0].uniqstr), (yylsp[0])); }
-/* Line 1741 of yacc.c  */
-#line 2568 "src/parse-gram.c"
+/* Line 1740 of yacc.c  */
+#line 2566 "src/parse-gram.c"
     break;
 
   case 46:
-/* Line 1741 of yacc.c  */
-#line 421 "src/parse-gram.y"
+/* Line 1740 of yacc.c  */
+#line 420 "src/parse-gram.y"
     {
       union_seen = true;
       muscle_code_grow ("stype", (yyvsp[0].chars), (yylsp[0]));
       code_scanner_last_string_free ();
     }
-/* Line 1741 of yacc.c  */
-#line 2580 "src/parse-gram.c"
+/* Line 1740 of yacc.c  */
+#line 2578 "src/parse-gram.c"
     break;
 
   case 47:
-/* Line 1741 of yacc.c  */
-#line 432 "src/parse-gram.y"
+/* Line 1740 of yacc.c  */
+#line 431 "src/parse-gram.y"
     { current_class = nterm_sym; }
-/* Line 1741 of yacc.c  */
-#line 2588 "src/parse-gram.c"
+/* Line 1740 of yacc.c  */
+#line 2586 "src/parse-gram.c"
     break;
 
   case 48:
-/* Line 1741 of yacc.c  */
-#line 433 "src/parse-gram.y"
+/* Line 1740 of yacc.c  */
+#line 432 "src/parse-gram.y"
     {
       current_class = unknown_sym;
       current_type = NULL;
     }
-/* Line 1741 of yacc.c  */
-#line 2599 "src/parse-gram.c"
+/* Line 1740 of yacc.c  */
+#line 2597 "src/parse-gram.c"
     break;
 
   case 49:
-/* Line 1741 of yacc.c  */
-#line 437 "src/parse-gram.y"
+/* Line 1740 of yacc.c  */
+#line 436 "src/parse-gram.y"
     { current_class = token_sym; }
-/* Line 1741 of yacc.c  */
-#line 2607 "src/parse-gram.c"
+/* Line 1740 of yacc.c  */
+#line 2605 "src/parse-gram.c"
     break;
 
   case 50:
-/* Line 1741 of yacc.c  */
-#line 438 "src/parse-gram.y"
+/* Line 1740 of yacc.c  */
+#line 437 "src/parse-gram.y"
     {
       current_class = unknown_sym;
       current_type = NULL;
     }
-/* Line 1741 of yacc.c  */
-#line 2618 "src/parse-gram.c"
+/* Line 1740 of yacc.c  */
+#line 2616 "src/parse-gram.c"
     break;
 
   case 51:
-/* Line 1741 of yacc.c  */
-#line 443 "src/parse-gram.y"
+/* Line 1740 of yacc.c  */
+#line 442 "src/parse-gram.y"
     {
       symbol_list *list;
       tag_seen = true;
@@ -2627,13 +2625,13 @@ yyreduce:
 	symbol_type_set (list->content.sym, (yyvsp[-1].uniqstr), (yylsp[-1]));
       symbol_list_free ((yyvsp[0].list));
     }
-/* Line 1741 of yacc.c  */
-#line 2632 "src/parse-gram.c"
+/* Line 1740 of yacc.c  */
+#line 2630 "src/parse-gram.c"
     break;
 
   case 52:
-/* Line 1741 of yacc.c  */
-#line 454 "src/parse-gram.y"
+/* Line 1740 of yacc.c  */
+#line 453 "src/parse-gram.y"
     {
       symbol_list *list;
       ++current_prec;
@@ -2645,348 +2643,348 @@ yyreduce:
       symbol_list_free ((yyvsp[0].list));
       current_type = NULL;
     }
-/* Line 1741 of yacc.c  */
-#line 2650 "src/parse-gram.c"
+/* Line 1740 of yacc.c  */
+#line 2648 "src/parse-gram.c"
     break;
 
   case 53:
-/* Line 1741 of yacc.c  */
-#line 468 "src/parse-gram.y"
+/* Line 1740 of yacc.c  */
+#line 467 "src/parse-gram.y"
     { (yyval.assoc) = left_assoc; }
-/* Line 1741 of yacc.c  */
-#line 2658 "src/parse-gram.c"
+/* Line 1740 of yacc.c  */
+#line 2656 "src/parse-gram.c"
     break;
 
   case 54:
-/* Line 1741 of yacc.c  */
-#line 469 "src/parse-gram.y"
+/* Line 1740 of yacc.c  */
+#line 468 "src/parse-gram.y"
     { (yyval.assoc) = right_assoc; }
-/* Line 1741 of yacc.c  */
-#line 2666 "src/parse-gram.c"
+/* Line 1740 of yacc.c  */
+#line 2664 "src/parse-gram.c"
     break;
 
   case 55:
-/* Line 1741 of yacc.c  */
-#line 470 "src/parse-gram.y"
+/* Line 1740 of yacc.c  */
+#line 469 "src/parse-gram.y"
     { (yyval.assoc) = non_assoc; }
-/* Line 1741 of yacc.c  */
-#line 2674 "src/parse-gram.c"
+/* Line 1740 of yacc.c  */
+#line 2672 "src/parse-gram.c"
     break;
 
   case 56:
-/* Line 1741 of yacc.c  */
-#line 471 "src/parse-gram.y"
+/* Line 1740 of yacc.c  */
+#line 470 "src/parse-gram.y"
     { (yyval.assoc) = precedence_assoc; }
-/* Line 1741 of yacc.c  */
-#line 2682 "src/parse-gram.c"
+/* Line 1740 of yacc.c  */
+#line 2680 "src/parse-gram.c"
     break;
 
   case 57:
-/* Line 1741 of yacc.c  */
-#line 475 "src/parse-gram.y"
+/* Line 1740 of yacc.c  */
+#line 474 "src/parse-gram.y"
     { current_type = NULL; }
-/* Line 1741 of yacc.c  */
-#line 2690 "src/parse-gram.c"
+/* Line 1740 of yacc.c  */
+#line 2688 "src/parse-gram.c"
     break;
 
   case 58:
-/* Line 1741 of yacc.c  */
-#line 476 "src/parse-gram.y"
+/* Line 1740 of yacc.c  */
+#line 475 "src/parse-gram.y"
     { current_type = (yyvsp[0].uniqstr); tag_seen = true; }
-/* Line 1741 of yacc.c  */
-#line 2698 "src/parse-gram.c"
+/* Line 1740 of yacc.c  */
+#line 2696 "src/parse-gram.c"
     break;
 
   case 59:
-/* Line 1741 of yacc.c  */
-#line 482 "src/parse-gram.y"
+/* Line 1740 of yacc.c  */
+#line 481 "src/parse-gram.y"
     { (yyval.list) = symbol_list_sym_new ((yyvsp[0].symbol), (yylsp[0])); }
-/* Line 1741 of yacc.c  */
-#line 2706 "src/parse-gram.c"
+/* Line 1740 of yacc.c  */
+#line 2704 "src/parse-gram.c"
     break;
 
   case 60:
-/* Line 1741 of yacc.c  */
-#line 484 "src/parse-gram.y"
+/* Line 1740 of yacc.c  */
+#line 483 "src/parse-gram.y"
     { (yyval.list) = symbol_list_prepend ((yyvsp[-1].list), symbol_list_sym_new ((yyvsp[0].symbol), (yylsp[0]))); }
-/* Line 1741 of yacc.c  */
-#line 2714 "src/parse-gram.c"
+/* Line 1740 of yacc.c  */
+#line 2712 "src/parse-gram.c"
     break;
 
   case 61:
-/* Line 1741 of yacc.c  */
-#line 488 "src/parse-gram.y"
+/* Line 1740 of yacc.c  */
+#line 487 "src/parse-gram.y"
     { (yyval.symbol) = (yyvsp[0].symbol); }
-/* Line 1741 of yacc.c  */
-#line 2722 "src/parse-gram.c"
+/* Line 1740 of yacc.c  */
+#line 2720 "src/parse-gram.c"
     break;
 
   case 62:
-/* Line 1741 of yacc.c  */
-#line 489 "src/parse-gram.y"
+/* Line 1740 of yacc.c  */
+#line 488 "src/parse-gram.y"
     { (yyval.symbol) = (yyvsp[-1].symbol); symbol_user_token_number_set ((yyvsp[-1].symbol), (yyvsp[0].integer), (yylsp[0])); }
-/* Line 1741 of yacc.c  */
-#line 2730 "src/parse-gram.c"
+/* Line 1740 of yacc.c  */
+#line 2728 "src/parse-gram.c"
     break;
 
   case 63:
-/* Line 1741 of yacc.c  */
-#line 495 "src/parse-gram.y"
+/* Line 1740 of yacc.c  */
+#line 494 "src/parse-gram.y"
     { (yyval.list) = symbol_list_sym_new ((yyvsp[0].symbol), (yylsp[0])); }
-/* Line 1741 of yacc.c  */
-#line 2738 "src/parse-gram.c"
+/* Line 1740 of yacc.c  */
+#line 2736 "src/parse-gram.c"
     break;
 
   case 64:
-/* Line 1741 of yacc.c  */
-#line 497 "src/parse-gram.y"
+/* Line 1740 of yacc.c  */
+#line 496 "src/parse-gram.y"
     { (yyval.list) = symbol_list_prepend ((yyvsp[-1].list), symbol_list_sym_new ((yyvsp[0].symbol), (yylsp[0]))); }
-/* Line 1741 of yacc.c  */
-#line 2746 "src/parse-gram.c"
+/* Line 1740 of yacc.c  */
+#line 2744 "src/parse-gram.c"
     break;
 
   case 65:
-/* Line 1741 of yacc.c  */
-#line 501 "src/parse-gram.y"
+/* Line 1740 of yacc.c  */
+#line 500 "src/parse-gram.y"
     { (yyval.list) = (yyvsp[0].list); }
-/* Line 1741 of yacc.c  */
-#line 2754 "src/parse-gram.c"
+/* Line 1740 of yacc.c  */
+#line 2752 "src/parse-gram.c"
     break;
 
   case 66:
-/* Line 1741 of yacc.c  */
-#line 502 "src/parse-gram.y"
+/* Line 1740 of yacc.c  */
+#line 501 "src/parse-gram.y"
     { (yyval.list) = symbol_list_prepend ((yyvsp[-1].list), (yyvsp[0].list)); }
-/* Line 1741 of yacc.c  */
-#line 2762 "src/parse-gram.c"
+/* Line 1740 of yacc.c  */
+#line 2760 "src/parse-gram.c"
     break;
 
   case 67:
-/* Line 1741 of yacc.c  */
-#line 506 "src/parse-gram.y"
+/* Line 1740 of yacc.c  */
+#line 505 "src/parse-gram.y"
     { (yyval.list) = symbol_list_sym_new ((yyvsp[0].symbol), (yylsp[0])); }
-/* Line 1741 of yacc.c  */
-#line 2770 "src/parse-gram.c"
+/* Line 1740 of yacc.c  */
+#line 2768 "src/parse-gram.c"
     break;
 
   case 68:
-/* Line 1741 of yacc.c  */
-#line 507 "src/parse-gram.y"
+/* Line 1740 of yacc.c  */
+#line 506 "src/parse-gram.y"
     { (yyval.list) = symbol_list_type_new ((yyvsp[0].uniqstr), (yylsp[0])); }
-/* Line 1741 of yacc.c  */
-#line 2778 "src/parse-gram.c"
+/* Line 1740 of yacc.c  */
+#line 2776 "src/parse-gram.c"
     break;
 
   case 69:
-/* Line 1741 of yacc.c  */
-#line 508 "src/parse-gram.y"
+/* Line 1740 of yacc.c  */
+#line 507 "src/parse-gram.y"
     { (yyval.list) = symbol_list_default_tagged_new ((yylsp[0])); }
-/* Line 1741 of yacc.c  */
-#line 2786 "src/parse-gram.c"
+/* Line 1740 of yacc.c  */
+#line 2784 "src/parse-gram.c"
     break;
 
   case 70:
-/* Line 1741 of yacc.c  */
-#line 509 "src/parse-gram.y"
+/* Line 1740 of yacc.c  */
+#line 508 "src/parse-gram.y"
     { (yyval.list) = symbol_list_default_tagless_new ((yylsp[0])); }
-/* Line 1741 of yacc.c  */
-#line 2794 "src/parse-gram.c"
+/* Line 1740 of yacc.c  */
+#line 2792 "src/parse-gram.c"
     break;
 
   case 71:
-/* Line 1741 of yacc.c  */
-#line 515 "src/parse-gram.y"
+/* Line 1740 of yacc.c  */
+#line 514 "src/parse-gram.y"
     {
        current_type = (yyvsp[0].uniqstr);
        tag_seen = true;
      }
-/* Line 1741 of yacc.c  */
-#line 2805 "src/parse-gram.c"
+/* Line 1740 of yacc.c  */
+#line 2803 "src/parse-gram.c"
     break;
 
   case 72:
-/* Line 1741 of yacc.c  */
-#line 520 "src/parse-gram.y"
+/* Line 1740 of yacc.c  */
+#line 519 "src/parse-gram.y"
     {
        symbol_class_set ((yyvsp[0].symbol), current_class, (yylsp[0]), true);
        symbol_type_set ((yyvsp[0].symbol), current_type, (yylsp[0]));
      }
-/* Line 1741 of yacc.c  */
-#line 2816 "src/parse-gram.c"
+/* Line 1740 of yacc.c  */
+#line 2814 "src/parse-gram.c"
     break;
 
   case 73:
-/* Line 1741 of yacc.c  */
-#line 525 "src/parse-gram.y"
+/* Line 1740 of yacc.c  */
+#line 524 "src/parse-gram.y"
     {
       symbol_class_set ((yyvsp[-1].symbol), current_class, (yylsp[-1]), true);
       symbol_type_set ((yyvsp[-1].symbol), current_type, (yylsp[-1]));
       symbol_user_token_number_set ((yyvsp[-1].symbol), (yyvsp[0].integer), (yylsp[0]));
     }
-/* Line 1741 of yacc.c  */
-#line 2828 "src/parse-gram.c"
+/* Line 1740 of yacc.c  */
+#line 2826 "src/parse-gram.c"
     break;
 
   case 74:
-/* Line 1741 of yacc.c  */
-#line 531 "src/parse-gram.y"
+/* Line 1740 of yacc.c  */
+#line 530 "src/parse-gram.y"
     {
       symbol_class_set ((yyvsp[-1].symbol), current_class, (yylsp[-1]), true);
       symbol_type_set ((yyvsp[-1].symbol), current_type, (yylsp[-1]));
       symbol_make_alias ((yyvsp[-1].symbol), (yyvsp[0].symbol), (yyloc));
     }
-/* Line 1741 of yacc.c  */
-#line 2840 "src/parse-gram.c"
+/* Line 1740 of yacc.c  */
+#line 2838 "src/parse-gram.c"
     break;
 
   case 75:
-/* Line 1741 of yacc.c  */
-#line 537 "src/parse-gram.y"
+/* Line 1740 of yacc.c  */
+#line 536 "src/parse-gram.y"
     {
       symbol_class_set ((yyvsp[-2].symbol), current_class, (yylsp[-2]), true);
       symbol_type_set ((yyvsp[-2].symbol), current_type, (yylsp[-2]));
       symbol_user_token_number_set ((yyvsp[-2].symbol), (yyvsp[-1].integer), (yylsp[-1]));
       symbol_make_alias ((yyvsp[-2].symbol), (yyvsp[0].symbol), (yyloc));
     }
-/* Line 1741 of yacc.c  */
-#line 2853 "src/parse-gram.c"
+/* Line 1740 of yacc.c  */
+#line 2851 "src/parse-gram.c"
     break;
 
   case 82:
-/* Line 1741 of yacc.c  */
-#line 567 "src/parse-gram.y"
+/* Line 1740 of yacc.c  */
+#line 566 "src/parse-gram.y"
     {
       yyerrok;
     }
-/* Line 1741 of yacc.c  */
-#line 2863 "src/parse-gram.c"
+/* Line 1740 of yacc.c  */
+#line 2861 "src/parse-gram.c"
     break;
 
   case 83:
-/* Line 1741 of yacc.c  */
-#line 573 "src/parse-gram.y"
+/* Line 1740 of yacc.c  */
+#line 572 "src/parse-gram.y"
     { current_lhs = (yyvsp[-1].symbol); current_lhs_location = (yylsp[-1]);
     current_lhs_named_ref = (yyvsp[0].named_ref); }
-/* Line 1741 of yacc.c  */
-#line 2872 "src/parse-gram.c"
+/* Line 1740 of yacc.c  */
+#line 2870 "src/parse-gram.c"
     break;
 
   case 85:
-/* Line 1741 of yacc.c  */
-#line 578 "src/parse-gram.y"
+/* Line 1740 of yacc.c  */
+#line 577 "src/parse-gram.y"
     { grammar_current_rule_end ((yylsp[0])); }
-/* Line 1741 of yacc.c  */
-#line 2880 "src/parse-gram.c"
+/* Line 1740 of yacc.c  */
+#line 2878 "src/parse-gram.c"
     break;
 
   case 86:
-/* Line 1741 of yacc.c  */
-#line 579 "src/parse-gram.y"
+/* Line 1740 of yacc.c  */
+#line 578 "src/parse-gram.y"
     { grammar_current_rule_end ((yylsp[0])); }
-/* Line 1741 of yacc.c  */
-#line 2888 "src/parse-gram.c"
+/* Line 1740 of yacc.c  */
+#line 2886 "src/parse-gram.c"
     break;
 
   case 88:
-/* Line 1741 of yacc.c  */
-#line 585 "src/parse-gram.y"
+/* Line 1740 of yacc.c  */
+#line 584 "src/parse-gram.y"
     { grammar_current_rule_begin (current_lhs, current_lhs_location,
 				  current_lhs_named_ref); }
-/* Line 1741 of yacc.c  */
-#line 2897 "src/parse-gram.c"
+/* Line 1740 of yacc.c  */
+#line 2895 "src/parse-gram.c"
     break;
 
   case 89:
-/* Line 1741 of yacc.c  */
-#line 588 "src/parse-gram.y"
+/* Line 1740 of yacc.c  */
+#line 587 "src/parse-gram.y"
     { grammar_current_rule_symbol_append ((yyvsp[-1].symbol), (yylsp[-1]), (yyvsp[0].named_ref)); }
-/* Line 1741 of yacc.c  */
-#line 2905 "src/parse-gram.c"
+/* Line 1740 of yacc.c  */
+#line 2903 "src/parse-gram.c"
     break;
 
   case 90:
-/* Line 1741 of yacc.c  */
-#line 590 "src/parse-gram.y"
+/* Line 1740 of yacc.c  */
+#line 589 "src/parse-gram.y"
     { grammar_current_rule_action_append ((yyvsp[-1].code), (yylsp[-1]), (yyvsp[0].named_ref), false); }
-/* Line 1741 of yacc.c  */
-#line 2913 "src/parse-gram.c"
+/* Line 1740 of yacc.c  */
+#line 2911 "src/parse-gram.c"
     break;
 
   case 91:
-/* Line 1741 of yacc.c  */
-#line 592 "src/parse-gram.y"
+/* Line 1740 of yacc.c  */
+#line 591 "src/parse-gram.y"
     { grammar_current_rule_action_append ((yyvsp[0].code), (yylsp[0]), NULL, true); }
-/* Line 1741 of yacc.c  */
-#line 2921 "src/parse-gram.c"
+/* Line 1740 of yacc.c  */
+#line 2919 "src/parse-gram.c"
     break;
 
   case 92:
-/* Line 1741 of yacc.c  */
-#line 594 "src/parse-gram.y"
+/* Line 1740 of yacc.c  */
+#line 593 "src/parse-gram.y"
     { grammar_current_rule_prec_set ((yyvsp[0].symbol), (yylsp[0])); }
-/* Line 1741 of yacc.c  */
-#line 2929 "src/parse-gram.c"
+/* Line 1740 of yacc.c  */
+#line 2927 "src/parse-gram.c"
     break;
 
   case 93:
-/* Line 1741 of yacc.c  */
-#line 596 "src/parse-gram.y"
+/* Line 1740 of yacc.c  */
+#line 595 "src/parse-gram.y"
     { grammar_current_rule_dprec_set ((yyvsp[0].integer), (yylsp[0])); }
-/* Line 1741 of yacc.c  */
-#line 2937 "src/parse-gram.c"
+/* Line 1740 of yacc.c  */
+#line 2935 "src/parse-gram.c"
     break;
 
   case 94:
-/* Line 1741 of yacc.c  */
-#line 598 "src/parse-gram.y"
+/* Line 1740 of yacc.c  */
+#line 597 "src/parse-gram.y"
     { grammar_current_rule_merge_set ((yyvsp[0].uniqstr), (yylsp[0])); }
-/* Line 1741 of yacc.c  */
-#line 2945 "src/parse-gram.c"
+/* Line 1740 of yacc.c  */
+#line 2943 "src/parse-gram.c"
     break;
 
   case 95:
-/* Line 1741 of yacc.c  */
-#line 602 "src/parse-gram.y"
+/* Line 1740 of yacc.c  */
+#line 601 "src/parse-gram.y"
     { (yyval.named_ref) = 0; }
-/* Line 1741 of yacc.c  */
-#line 2953 "src/parse-gram.c"
+/* Line 1740 of yacc.c  */
+#line 2951 "src/parse-gram.c"
     break;
 
   case 96:
-/* Line 1741 of yacc.c  */
-#line 604 "src/parse-gram.y"
+/* Line 1740 of yacc.c  */
+#line 603 "src/parse-gram.y"
     { (yyval.named_ref) = named_ref_new((yyvsp[0].uniqstr), (yylsp[0])); }
-/* Line 1741 of yacc.c  */
-#line 2961 "src/parse-gram.c"
+/* Line 1740 of yacc.c  */
+#line 2959 "src/parse-gram.c"
     break;
 
   case 98:
-/* Line 1741 of yacc.c  */
-#line 615 "src/parse-gram.y"
+/* Line 1740 of yacc.c  */
+#line 614 "src/parse-gram.y"
     { (yyval.uniqstr) = uniqstr_new ((yyvsp[0].chars)); }
-/* Line 1741 of yacc.c  */
-#line 2969 "src/parse-gram.c"
+/* Line 1740 of yacc.c  */
+#line 2967 "src/parse-gram.c"
     break;
 
   case 99:
-/* Line 1741 of yacc.c  */
-#line 620 "src/parse-gram.y"
+/* Line 1740 of yacc.c  */
+#line 619 "src/parse-gram.y"
     { (yyval.chars) = ""; }
-/* Line 1741 of yacc.c  */
-#line 2977 "src/parse-gram.c"
+/* Line 1740 of yacc.c  */
+#line 2975 "src/parse-gram.c"
     break;
 
   case 100:
-/* Line 1741 of yacc.c  */
-#line 621 "src/parse-gram.y"
+/* Line 1740 of yacc.c  */
+#line 620 "src/parse-gram.y"
     { (yyval.chars) = (yyvsp[0].uniqstr); }
-/* Line 1741 of yacc.c  */
-#line 2985 "src/parse-gram.c"
+/* Line 1740 of yacc.c  */
+#line 2983 "src/parse-gram.c"
     break;
 
   case 102:
-/* Line 1741 of yacc.c  */
-#line 632 "src/parse-gram.y"
+/* Line 1740 of yacc.c  */
+#line 631 "src/parse-gram.y"
     {
       code_props plain_code;
       (yyvsp[0].code)[strlen ((yyvsp[0].code)) - 1] = '\n';
@@ -2995,52 +2993,52 @@ yyreduce:
       gram_scanner_last_string_free ();
       (yyval.chars) = plain_code.code;
     }
-/* Line 1741 of yacc.c  */
-#line 3000 "src/parse-gram.c"
+/* Line 1740 of yacc.c  */
+#line 2998 "src/parse-gram.c"
     break;
 
   case 103:
-/* Line 1741 of yacc.c  */
-#line 652 "src/parse-gram.y"
+/* Line 1740 of yacc.c  */
+#line 651 "src/parse-gram.y"
     { (yyval.symbol) = symbol_from_uniqstr ((yyvsp[0].uniqstr), (yylsp[0])); }
-/* Line 1741 of yacc.c  */
-#line 3008 "src/parse-gram.c"
+/* Line 1740 of yacc.c  */
+#line 3006 "src/parse-gram.c"
     break;
 
   case 104:
-/* Line 1741 of yacc.c  */
-#line 654 "src/parse-gram.y"
+/* Line 1740 of yacc.c  */
+#line 653 "src/parse-gram.y"
     {
       (yyval.symbol) = symbol_get (char_name ((yyvsp[0].character)), (yylsp[0]));
       symbol_class_set ((yyval.symbol), token_sym, (yylsp[0]), false);
       symbol_user_token_number_set ((yyval.symbol), (yyvsp[0].character), (yylsp[0]));
     }
-/* Line 1741 of yacc.c  */
-#line 3020 "src/parse-gram.c"
+/* Line 1740 of yacc.c  */
+#line 3018 "src/parse-gram.c"
     break;
 
   case 105:
-/* Line 1741 of yacc.c  */
-#line 662 "src/parse-gram.y"
+/* Line 1740 of yacc.c  */
+#line 661 "src/parse-gram.y"
     { (yyval.symbol) = symbol_from_uniqstr ((yyvsp[0].uniqstr), (yylsp[0])); }
-/* Line 1741 of yacc.c  */
-#line 3028 "src/parse-gram.c"
+/* Line 1740 of yacc.c  */
+#line 3026 "src/parse-gram.c"
     break;
 
   case 108:
-/* Line 1741 of yacc.c  */
-#line 674 "src/parse-gram.y"
+/* Line 1740 of yacc.c  */
+#line 673 "src/parse-gram.y"
     {
       (yyval.symbol) = symbol_get (quotearg_style (c_quoting_style, (yyvsp[0].chars)), (yylsp[0]));
       symbol_class_set ((yyval.symbol), token_sym, (yylsp[0]), false);
     }
-/* Line 1741 of yacc.c  */
-#line 3039 "src/parse-gram.c"
+/* Line 1740 of yacc.c  */
+#line 3037 "src/parse-gram.c"
     break;
 
   case 110:
-/* Line 1741 of yacc.c  */
-#line 683 "src/parse-gram.y"
+/* Line 1740 of yacc.c  */
+#line 682 "src/parse-gram.y"
     {
       code_props plain_code;
       code_props_plain_init (&plain_code, (yyvsp[0].chars), (yylsp[0]));
@@ -3049,13 +3047,13 @@ yyreduce:
       muscle_code_grow ("epilogue", plain_code.code, (yylsp[0]));
       code_scanner_last_string_free ();
     }
-/* Line 1741 of yacc.c  */
-#line 3054 "src/parse-gram.c"
+/* Line 1740 of yacc.c  */
+#line 3052 "src/parse-gram.c"
     break;
 
 
-/* Line 1741 of yacc.c  */
-#line 3059 "src/parse-gram.c"
+/* Line 1740 of yacc.c  */
+#line 3057 "src/parse-gram.c"
         default: break;
       }
     if (yychar_backup != yychar)
@@ -3302,8 +3300,8 @@ yyreturn:
   return YYID (yyresult);
 }
 
-/* Line 2001 of yacc.c  */
-#line 693 "src/parse-gram.y"
+/* Line 2000 of yacc.c  */
+#line 692 "src/parse-gram.y"
 
 
 
diff --git a/src/parse-gram.h b/src/parse-gram.h
index f321cfbf..e3246691 100644
--- a/src/parse-gram.h
+++ b/src/parse-gram.h
@@ -1,9 +1,8 @@
-/* A Bison parser, made by GNU Bison 2.4.542-10bae.  */
+/* A Bison parser, made by GNU Bison 2.4.547-d397.  */
 
 /* Interface for Bison's Yacc-like parsers in C
 
-   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-   2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+   Copyright (C) 1984, 1989-1990, 2000-2011 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
@@ -31,8 +30,8 @@
    This special exception was added by the Free Software Foundation in
    version 2.2 of Bison.  */
 /* "%code requires" blocks.  */
-/* Line 2002 of yacc.c  */
-#line 203 "src/parse-gram.y"
+/* Line 2001 of yacc.c  */
+#line 202 "src/parse-gram.y"
 
 # ifndef PARAM_TYPE
 #  define PARAM_TYPE
@@ -46,8 +45,8 @@
 # endif
 
 
-/* Line 2002 of yacc.c  */
-#line 51 "src/parse-gram.h"
+/* Line 2001 of yacc.c  */
+#line 50 "src/parse-gram.h"
 
 /* Tokens.  */
 #ifndef YYTOKENTYPE
@@ -175,8 +174,8 @@
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
 typedef union YYSTYPE
 {
-/* Line 2002 of yacc.c  */
-#line 89 "src/parse-gram.y"
+/* Line 2001 of yacc.c  */
+#line 88 "src/parse-gram.y"
 
   assoc assoc;
   char *code;
@@ -188,14 +187,14 @@ typedef union YYSTYPE
   uniqstr uniqstr;
   unsigned char character;
 
-/* Line 2002 of yacc.c  */
-#line 227 "src/parse-gram.y"
+/* Line 2001 of yacc.c  */
+#line 226 "src/parse-gram.y"
 
   param_type param;
 
 
-/* Line 2002 of yacc.c  */
-#line 199 "src/parse-gram.h"
+/* Line 2001 of yacc.c  */
+#line 198 "src/parse-gram.h"
 } YYSTYPE;
 # define YYSTYPE_IS_TRIVIAL 1
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
diff --git a/src/parse-gram.y b/src/parse-gram.y
index 8787882d..f79b0e92 100644
--- a/src/parse-gram.y
+++ b/src/parse-gram.y
@@ -1,7 +1,6 @@
 %{/* Bison Grammar Parser                             -*- C -*-
 
-   Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
-   Free Software Foundation, Inc.
+   Copyright (C) 2002-2011 Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/src/print-xml.c b/src/print-xml.c
index 2a37ebd9..1dc0268e 100644
--- a/src/print-xml.c
+++ b/src/print-xml.c
@@ -1,6 +1,6 @@
 /* Print an xml on generated parser, for Bison,
 
-   Copyright (C) 2007, 2009, 2010 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2009-2011 Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/src/print-xml.h b/src/print-xml.h
index 923538f2..5285473f 100644
--- a/src/print-xml.h
+++ b/src/print-xml.h
@@ -1,6 +1,6 @@
 /* Output an xml of the generated parser, for Bison.
 
-   Copyright (C) 2007, 2009, 2010 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2009-2011 Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/src/print.c b/src/print.c
index c427e190..a9882073 100644
--- a/src/print.c
+++ b/src/print.c
@@ -1,7 +1,7 @@
 /* Print information on generated parser, for bison,
 
-   Copyright (C) 1984, 1986, 1989, 2000, 2001, 2002, 2003, 2004, 2005,
-   2007, 2009, 2010 Free Software Foundation, Inc.
+   Copyright (C) 1984, 1986, 1989, 2000-2005, 2007, 2009-2011 Free
+   Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/src/print.h b/src/print.h
index b470c108..db0dfe39 100644
--- a/src/print.h
+++ b/src/print.h
@@ -1,6 +1,6 @@
 /* Print information on generated parser, for bison,
 
-   Copyright (C) 2000, 2009, 2010 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2009-2011 Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/src/print_graph.c b/src/print_graph.c
index b7d36d1f..155ffaf5 100644
--- a/src/print_graph.c
+++ b/src/print_graph.c
@@ -1,7 +1,6 @@
 /* Output a graph of the generated parser, for Bison.
 
-   Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2009, 2010
-   Free Software Foundation, Inc.
+   Copyright (C) 2001-2007, 2009-2011 Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/src/print_graph.h b/src/print_graph.h
index ebd5ea39..74e34460 100644
--- a/src/print_graph.h
+++ b/src/print_graph.h
@@ -1,6 +1,6 @@
 /* Output a graph of the generated parser, for Bison.
 
-   Copyright (C) 2000, 2006, 2009, 2010 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2006, 2009-2011 Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/src/reader.c b/src/reader.c
index e64741cb..ac95a215 100644
--- a/src/reader.c
+++ b/src/reader.c
@@ -1,7 +1,7 @@
 /* Input parser for Bison
 
-   Copyright (C) 1984, 1986, 1989, 1992, 1998, 2000, 2001, 2002, 2003,
-   2005, 2006, 2007, 2009, 2010 Free Software Foundation, Inc.
+   Copyright (C) 1984, 1986, 1989, 1992, 1998, 2000-2003, 2005-2007,
+   2009-2011 Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/src/reader.h b/src/reader.h
index da8a6c7e..cfc76232 100644
--- a/src/reader.h
+++ b/src/reader.h
@@ -1,7 +1,7 @@
 /* Input parser for Bison
 
-   Copyright (C) 2000, 2001, 2002, 2003, 2005, 2006, 2007, 2009, 2010
-   Free Software Foundation, Inc.
+   Copyright (C) 2000-2003, 2005-2007, 2009-2011 Free Software
+   Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/src/reduce.c b/src/reduce.c
index 6e16ce31..7a30e555 100644
--- a/src/reduce.c
+++ b/src/reduce.c
@@ -1,7 +1,7 @@
 /* Grammar reduction for Bison.
 
-   Copyright (C) 1988, 1989, 2000, 2001, 2002, 2003, 2005, 2006, 2007,
-   2008, 2009, 2010 Free Software Foundation, Inc.
+   Copyright (C) 1988-1989, 2000-2003, 2005-2011 Free Software
+   Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/src/reduce.h b/src/reduce.h
index bb01021a..c7a82eb0 100644
--- a/src/reduce.h
+++ b/src/reduce.h
@@ -1,7 +1,7 @@
 /* Grammar reduction for Bison.
 
-   Copyright (C) 2000, 2001, 2002, 2007, 2009, 2010 Free Software
-   Foundation, Inc.
+   Copyright (C) 2000-2002, 2007, 2009-2011 Free Software Foundation,
+   Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/src/relation.c b/src/relation.c
index 5d46b7ad..4682742c 100644
--- a/src/relation.c
+++ b/src/relation.c
@@ -1,7 +1,7 @@
 /* Binary relations.
 
-   Copyright (C) 2002, 2004, 2005, 2009, 2010 Free Software
-   Foundation, Inc.
+   Copyright (C) 2002, 2004-2005, 2009-2011 Free Software Foundation,
+   Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/src/relation.h b/src/relation.h
index 31efa705..bbbb5737 100644
--- a/src/relation.h
+++ b/src/relation.h
@@ -1,6 +1,6 @@
 /* Binary relations.
 
-   Copyright (C) 2002, 2004, 2009, 2010 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004, 2009-2011 Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/src/scan-code.h b/src/scan-code.h
index 79edc6e8..507da385 100644
--- a/src/scan-code.h
+++ b/src/scan-code.h
@@ -1,6 +1,6 @@
 /* Bison code properties structure and scanner.
 
-   Copyright (C) 2006, 2007, 2009, 2010 Free Software Foundation, Inc.
+   Copyright (C) 2006-2007, 2009-2011 Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/src/scan-code.l b/src/scan-code.l
index 200fdf4e..a5f570d7 100644
--- a/src/scan-code.l
+++ b/src/scan-code.l
@@ -1,7 +1,6 @@
 /* Bison Action Scanner                             -*- C -*-
 
-   Copyright (C) 2006, 2007, 2008, 2009, 2010 Free Software
-   Foundation, Inc.
+   Copyright (C) 2006-2011 Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/src/scan-gram.h b/src/scan-gram.h
index 18a461b2..50df2f51 100644
--- a/src/scan-gram.h
+++ b/src/scan-gram.h
@@ -1,6 +1,6 @@
 /* Bison Grammar Scanner
 
-   Copyright (C) 2006, 2007, 2009, 2010 Free Software Foundation, Inc.
+   Copyright (C) 2006-2007, 2009-2011 Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/src/scan-gram.l b/src/scan-gram.l
index 462d007d..b3a50988 100644
--- a/src/scan-gram.l
+++ b/src/scan-gram.l
@@ -1,7 +1,6 @@
 /* Bison Grammar Scanner                             -*- C -*-
 
-   Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
-   Free Software Foundation, Inc.
+   Copyright (C) 2002-2011 Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/src/scan-skel.h b/src/scan-skel.h
index 980cd6ec..9f419c15 100644
--- a/src/scan-skel.h
+++ b/src/scan-skel.h
@@ -1,7 +1,6 @@
 /* Scan Bison Skeletons.
 
-   Copyright (C) 2005, 2006, 2007, 2009, 2010 Free Software
-   Foundation, Inc.
+   Copyright (C) 2005-2007, 2009-2011 Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/src/scan-skel.l b/src/scan-skel.l
index ec16cfc4..805af34e 100644
--- a/src/scan-skel.l
+++ b/src/scan-skel.l
@@ -1,7 +1,6 @@
 /* Scan Bison Skeletons.                                       -*- C -*-
 
-   Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
-   2010 Free Software Foundation, Inc.
+   Copyright (C) 2001-2011 Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/src/state.c b/src/state.c
index b1e5f5dd..12d8df46 100644
--- a/src/state.c
+++ b/src/state.c
@@ -1,7 +1,6 @@
 /* Type definitions for the finite state machine for Bison.
 
-   Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2009, 2010
-   Free Software Foundation, Inc.
+   Copyright (C) 2001-2007, 2009-2011 Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/src/state.h b/src/state.h
index c0248e36..a1f379d4 100644
--- a/src/state.h
+++ b/src/state.h
@@ -1,7 +1,7 @@
 /* Type definitions for the finite state machine for Bison.
 
-   Copyright (C) 1984, 1989, 2000, 2001, 2002, 2003, 2004, 2007, 2009,
-   2010 Free Software Foundation, Inc.
+   Copyright (C) 1984, 1989, 2000-2004, 2007, 2009-2011 Free Software
+   Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/src/symlist.c b/src/symlist.c
index 83e37aa0..e717c3e1 100644
--- a/src/symlist.c
+++ b/src/symlist.c
@@ -1,7 +1,7 @@
 /* Lists of symbols for Bison
 
-   Copyright (C) 2002, 2005, 2006, 2007, 2009, 2010 Free Software
-   Foundation, Inc.
+   Copyright (C) 2002, 2005-2007, 2009-2011 Free Software Foundation,
+   Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/src/symlist.h b/src/symlist.h
index 84de2df5..297d414a 100644
--- a/src/symlist.h
+++ b/src/symlist.h
@@ -1,7 +1,7 @@
 /* Lists of symbols for Bison
 
-   Copyright (C) 2002, 2005, 2006, 2007, 2009, 2010 Free Software
-   Foundation, Inc.
+   Copyright (C) 2002, 2005-2007, 2009-2011 Free Software Foundation,
+   Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/src/symtab.c b/src/symtab.c
index 723b11fe..273cdd66 100644
--- a/src/symtab.c
+++ b/src/symtab.c
@@ -1,7 +1,7 @@
 /* Symbol table manager for Bison.
 
-   Copyright (C) 1984, 1989, 2000, 2001, 2002, 2004, 2005, 2006, 2007,
-   2008, 2009, 2010 Free Software Foundation, Inc.
+   Copyright (C) 1984, 1989, 2000-2002, 2004-2011 Free Software
+   Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/src/symtab.h b/src/symtab.h
index 08f64c41..b065d0db 100644
--- a/src/symtab.h
+++ b/src/symtab.h
@@ -1,7 +1,7 @@
 /* Definitions for symtab.c and callers, part of Bison.
 
-   Copyright (C) 1984, 1989, 1992, 2000, 2001, 2002, 2004, 2005, 2006,
-   2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+   Copyright (C) 1984, 1989, 1992, 2000-2002, 2004-2011 Free Software
+   Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/src/system.h b/src/system.h
index 0bd684f0..97a92257 100644
--- a/src/system.h
+++ b/src/system.h
@@ -1,7 +1,6 @@
 /* System-dependent definitions for Bison.
 
-   Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2009,
-   2010 Free Software Foundation, Inc.
+   Copyright (C) 2000-2007, 2009-2011 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
diff --git a/src/tables.c b/src/tables.c
index 90ca94c1..ef37fbab 100644
--- a/src/tables.c
+++ b/src/tables.c
@@ -1,7 +1,7 @@
 /* Output the generated parsing program for Bison.
 
-   Copyright (C) 1984, 1986, 1989, 1992, 2000, 2001, 2002, 2003, 2004,
-   2005, 2006, 2009, 2010 Free Software Foundation, Inc.
+   Copyright (C) 1984, 1986, 1989, 1992, 2000-2006, 2009-2011 Free
+   Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/src/tables.h b/src/tables.h
index 536d904e..c563476d 100644
--- a/src/tables.h
+++ b/src/tables.h
@@ -1,6 +1,6 @@
 /* Prepare the LALR and GLR parser tables.
 
-   Copyright (C) 2002, 2004, 2009, 2010 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004, 2009-2011 Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/src/uniqstr.c b/src/uniqstr.c
index 04add18f..dbe343f8 100644
--- a/src/uniqstr.c
+++ b/src/uniqstr.c
@@ -1,7 +1,6 @@
 /* Keep a unique copy of strings.
 
-   Copyright (C) 2002, 2003, 2004, 2005, 2009, 2010 Free Software
-   Foundation, Inc.
+   Copyright (C) 2002-2005, 2009-2011 Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/src/uniqstr.h b/src/uniqstr.h
index 757128fc..8beea278 100644
--- a/src/uniqstr.h
+++ b/src/uniqstr.h
@@ -1,7 +1,6 @@
 /* Keeping a unique copy of strings.
 
-   Copyright (C) 2002, 2003, 2008, 2009, 2010 Free Software
-   Foundation, Inc.
+   Copyright (C) 2002-2003, 2008-2011 Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/tests/actions.at b/tests/actions.at
index 4f7f5790..6f267af7 100644
--- a/tests/actions.at
+++ b/tests/actions.at
@@ -1,7 +1,6 @@
 # Executing Actions.                               -*- Autotest -*-
 
-# Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
-# 2010 Free Software Foundation, Inc.
+# Copyright (C) 2001-2011 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
diff --git a/tests/atlocal.in b/tests/atlocal.in
index 617fbb8f..294feee0 100644
--- a/tests/atlocal.in
+++ b/tests/atlocal.in
@@ -1,8 +1,7 @@
 # @configure_input@					-*- shell-script -*-
 # Configurable variable values for Bison test suite.
 
-# Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
-# 2009, 2010 Free Software Foundation, Inc.
+# Copyright (C) 2000-2011 Free Software Foundation, Inc.
 
 # We need a C compiler.
 : ${CC='@CC@'}
diff --git a/tests/c++.at b/tests/c++.at
index 5db78acd..c2b9e462 100644
--- a/tests/c++.at
+++ b/tests/c++.at
@@ -1,7 +1,6 @@
 # Checking the output filenames.                    -*- Autotest -*-
 
-# Copyright (C) 2004, 2005, 2007, 2008, 2009, 2010 Free Software
-# Foundation, Inc.
+# Copyright (C) 2004-2005, 2007-2011 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
diff --git a/tests/calc.at b/tests/calc.at
index 285b6349..0e5d0ec6 100644
--- a/tests/calc.at
+++ b/tests/calc.at
@@ -1,7 +1,6 @@
 # Simple calculator.                         -*- Autotest -*-
 
-# Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
-# 2009, 2010 Free Software Foundation, Inc.
+# Copyright (C) 2000-2011 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
diff --git a/tests/conflicts.at b/tests/conflicts.at
index 16e1956f..c933601d 100644
--- a/tests/conflicts.at
+++ b/tests/conflicts.at
@@ -1,7 +1,6 @@
 # Exercising Bison on conflicts.                         -*- Autotest -*-
 
-# Copyright (C) 2002, 2003, 2004, 2005, 2007, 2008, 2009, 2010 Free
-# Software Foundation, Inc.
+# Copyright (C) 2002-2005, 2007-2011 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
diff --git a/tests/cxx-type.at b/tests/cxx-type.at
index 5b062382..e7ac22c1 100644
--- a/tests/cxx-type.at
+++ b/tests/cxx-type.at
@@ -1,7 +1,6 @@
 # Checking GLR Parsing.                         -*- Autotest -*-
 
-# Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
-# Free Software Foundation, Inc.
+# Copyright (C) 2002-2011 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
diff --git a/tests/existing.at b/tests/existing.at
index c36e46f4..64e0b7be 100644
--- a/tests/existing.at
+++ b/tests/existing.at
@@ -1,7 +1,7 @@
 # Exercising Bison on actual grammars.                   -*- Autotest -*-
 
-# Copyright (C) 1989, 1990, 1991, 1992, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2007, 2009, 2010 Free Software Foundation, Inc.
+# Copyright (C) 1989-1992, 2000-2005, 2007, 2009-2011 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
diff --git a/tests/glr-regression.at b/tests/glr-regression.at
index 83fd382b..9e68a0f7 100644
--- a/tests/glr-regression.at
+++ b/tests/glr-regression.at
@@ -1,6 +1,6 @@
 # Checking GLR Parsing: Regression Tests           -*- Autotest -*-
 
-# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2009, 2010 Free Software
+# Copyright (C) 2002-2003, 2005-2007, 2009-2011 Free Software
 # Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
diff --git a/tests/headers.at b/tests/headers.at
index 0f31fea0..4e7ba495 100644
--- a/tests/headers.at
+++ b/tests/headers.at
@@ -1,6 +1,6 @@
 # Bison Parser Headers.                               -*- Autotest -*-
 
-# Copyright (C) 2001, 2002, 2006, 2007, 2009, 2010 Free Software
+# Copyright (C) 2001-2002, 2006-2007, 2009-2011 Free Software
 # Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
diff --git a/tests/input.at b/tests/input.at
index 6cfa2b12..f223a332 100644
--- a/tests/input.at
+++ b/tests/input.at
@@ -1,7 +1,6 @@
 # Checking the Bison scanner.                    -*- Autotest -*-
 
-# Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
-# Free Software Foundation, Inc.
+# Copyright (C) 2002-2011 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
diff --git a/tests/java.at b/tests/java.at
index dfd42523..2d8c7a4b 100644
--- a/tests/java.at
+++ b/tests/java.at
@@ -1,6 +1,6 @@
 # Java tests for simple calculator.           -*- Autotest -*-
 
-# Copyright (C) 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+# Copyright (C) 2007-2011 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
diff --git a/tests/local.at b/tests/local.at
index bdcbfc49..6417e708 100644
--- a/tests/local.at
+++ b/tests/local.at
@@ -2,8 +2,7 @@
 
 # Macros for the GNU Bison Test suite.
 
-# Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
-# Software Foundation, Inc.
+# Copyright (C) 2003-2011 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
diff --git a/tests/local.mk b/tests/local.mk
index 768c7020..3466a4fe 100644
--- a/tests/local.mk
+++ b/tests/local.mk
@@ -1,7 +1,6 @@
 ## Makefile for Bison testsuite.
 
-## Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
-## 2009, 2010 Free Software Foundation, Inc.
+## Copyright (C) 2000-2011 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
diff --git a/tests/named-refs.at b/tests/named-refs.at
index 79131cff..7824c9bf 100644
--- a/tests/named-refs.at
+++ b/tests/named-refs.at
@@ -1,6 +1,6 @@
 # Named references test.                           -*- Autotest -*-
 
-# Copyright (C) 2009, 2010 Free Software Foundation, Inc.
+# Copyright (C) 2009-2011 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
diff --git a/tests/output.at b/tests/output.at
index 5408e704..3446369c 100644
--- a/tests/output.at
+++ b/tests/output.at
@@ -1,7 +1,6 @@
 # Checking the output filenames.                    -*- Autotest -*-
 
-# Copyright (C) 2000, 2001, 2002, 2005, 2006, 2007, 2008, 2009, 2010
-# Free Software Foundation, Inc.
+# Copyright (C) 2000-2002, 2005-2011 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
diff --git a/tests/push.at b/tests/push.at
index c686ea5e..3119e730 100644
--- a/tests/push.at
+++ b/tests/push.at
@@ -1,6 +1,6 @@
 # Checking Push Parsing.                            -*- Autotest -*-
 
-# Copyright (C) 2007, 2009, 2010 Free Software Foundation, Inc.
+# Copyright (C) 2007, 2009-2011 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
diff --git a/tests/reduce.at b/tests/reduce.at
index 692a0199..65ccf16d 100644
--- a/tests/reduce.at
+++ b/tests/reduce.at
@@ -1,7 +1,6 @@
 # Exercising Bison Grammar Reduction.                      -*- Autotest -*-
 
-# Copyright (C) 2001, 2002, 2007, 2008, 2009, 2010 Free Software
-# Foundation, Inc.
+# Copyright (C) 2001-2002, 2007-2011 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
diff --git a/tests/regression.at b/tests/regression.at
index b1555c5c..a49d1df0 100644
--- a/tests/regression.at
+++ b/tests/regression.at
@@ -1,7 +1,6 @@
 # Bison Regressions.                               -*- Autotest -*-
 
-# Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
-# 2010 Free Software Foundation, Inc.
+# Copyright (C) 2001-2011 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
diff --git a/tests/sets.at b/tests/sets.at
index 178a47c2..e20874b6 100644
--- a/tests/sets.at
+++ b/tests/sets.at
@@ -1,6 +1,6 @@
 # Exercising Bison Grammar Sets.                      -*- Autotest -*-
 
-# Copyright (C) 2001, 2002, 2005, 2007, 2009, 2010 Free Software
+# Copyright (C) 2001-2002, 2005, 2007, 2009-2011 Free Software
 # Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
diff --git a/tests/skeletons.at b/tests/skeletons.at
index a4ec5b28..fa01c79e 100644
--- a/tests/skeletons.at
+++ b/tests/skeletons.at
@@ -1,6 +1,6 @@
 # Checking skeleton support.                     -*- Autotest -*-
 
-# Copyright (C) 2007, 2009, 2010 Free Software Foundation, Inc.
+# Copyright (C) 2007, 2009-2011 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
diff --git a/tests/synclines.at b/tests/synclines.at
index d7220c78..cc2a7229 100644
--- a/tests/synclines.at
+++ b/tests/synclines.at
@@ -1,6 +1,6 @@
 # Executing Actions.                               -*- Autotest -*-
 
-# Copyright (C) 2002, 2004, 2005, 2007, 2009, 2010 Free Software
+# Copyright (C) 2002, 2004-2005, 2007, 2009-2011 Free Software
 # Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
diff --git a/tests/testsuite.at b/tests/testsuite.at
index b5b093ac..7bf1ea61 100644
--- a/tests/testsuite.at
+++ b/tests/testsuite.at
@@ -1,7 +1,7 @@
 # Test suite for GNU Bison.				-*- Autotest -*-
 
-# Copyright (C) 2000, 2001, 2002, 2003, 2004, 2006, 2007, 2009, 2010
-# Free Software Foundation, Inc.
+# Copyright (C) 2000-2004, 2006-2007, 2009-2011 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
diff --git a/tests/torture.at b/tests/torture.at
index 68050bea..0076dfd1 100644
--- a/tests/torture.at
+++ b/tests/torture.at
@@ -1,7 +1,7 @@
 # Torturing Bison.                                    -*- Autotest -*-
 
-# Copyright (C) 2001, 2002, 2004, 2005, 2006, 2007, 2009, 2010 Free
-# Software Foundation, Inc.
+# Copyright (C) 2001-2002, 2004-2007, 2009-2011 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
-- 
2.50.0

