From 1462fcee1ed295b24f47758b370068aa6304bb41 Mon Sep 17 00:00:00 2001
From: "Joel E. Denny" <jdenny@clemson.edu>
Date: Mon, 4 Jan 2010 13:46:45 -0500
Subject: [PATCH] maint: run "make update-copyright"

---
 ChangeLog                     |   9 +-
 HACKING                       |   3 +-
 Makefile.am                   |   3 +-
 NEWS                          |   3 +-
 PACKAGING                     |   2 +-
 README                        |   4 +-
 README-alpha                  |   2 +-
 TODO                          |   3 +-
 bootstrap                     |   3 +-
 bootstrap.conf                |   2 +-
 build-aux/update-b4-copyright |   2 +-
 cfg.mk                        |   2 +-
 configure.ac                  |   3 +-
 data/Makefile.am              |   3 +-
 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                 |   9 +-
 data/lalr1.java               |   4 +-
 data/location.cc              |   7 +-
 data/xslt/bison.xsl           |   2 +-
 data/xslt/xml2dot.xsl         |   2 +-
 data/xslt/xml2text.xsl        |   2 +-
 data/xslt/xml2xhtml.xsl       |   2 +-
 data/yacc.c                   |  10 +-
 djgpp/Makefile.maint          |   3 +-
 djgpp/README.in               |   2 +-
 djgpp/config.bat              |   3 +-
 djgpp/config.sed              |   3 +-
 djgpp/config.site             |   3 +-
 djgpp/config_h.sed            |   3 +-
 djgpp/djunpack.bat            |   3 +-
 djgpp/subpipe.c               |   3 +-
 djgpp/subpipe.h               |   3 +-
 djgpp/testsuite.sed           |   2 +-
 doc/Makefile.am               |   3 +-
 doc/bison.texinfo             |   5 +-
 doc/refcard.tex               |   2 +-
 etc/Makefile.am               |   2 +-
 etc/README                    |   2 +-
 etc/bench.pl.in               |   2 +-
 examples/Makefile.am          |   2 +-
 examples/calc++/Makefile.am   |   2 +-
 examples/extexi               |   2 +-
 lib/Makefile.am               |   4 +-
 lib/abitset.c                 |   3 +-
 lib/abitset.h                 |   2 +-
 lib/bbitset.h                 |   2 +-
 lib/bitset.c                  |   3 +-
 lib/bitset.h                  |   2 +-
 lib/bitset_stats.c            |   3 +-
 lib/bitset_stats.h            |   2 +-
 lib/bitsetv-print.c           |   4 +-
 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                 |   2 +-
 lib/lbitset.h                 |   2 +-
 lib/libiberty.h               |   2 +-
 lib/main.c                    |   2 +-
 lib/subpipe.c                 |   2 +-
 lib/subpipe.h                 |   3 +-
 lib/timevar.c                 |   2 +-
 lib/timevar.def               |   2 +-
 lib/timevar.h                 |   3 +-
 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                 |   3 +-
 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                     |   2 +-
 src/Makefile.am               |   3 +-
 src/Sbitset.c                 |   2 +-
 src/Sbitset.h                 |   2 +-
 src/assoc.c                   |   3 +-
 src/assoc.h                   |   2 +-
 src/closure.c                 |   4 +-
 src/closure.h                 |   2 +-
 src/complain.c                |   4 +-
 src/complain.h                |   3 +-
 src/conflicts.c               |   4 +-
 src/conflicts.h               |   2 +-
 src/derives.c                 |   4 +-
 src/derives.h                 |   2 +-
 src/files.c                   |   4 +-
 src/files.h                   |   2 +-
 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/ielr.c                    |   2 +-
 src/ielr.h                    |   2 +-
 src/lalr.c                    |   4 +-
 src/lalr.h                    |   4 +-
 src/location.c                |   3 +-
 src/location.h                |   3 +-
 src/main.c                    |   4 +-
 src/muscle-tab.c              |   3 +-
 src/muscle-tab.h              |   2 +-
 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                  |   2 +-
 src/parse-gram.c              | 558 +++++++++++++++++-----------------
 src/parse-gram.h              |  13 +-
 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                  |   2 +-
 src/relation.c                |   3 +-
 src/relation.h                |   2 +-
 src/scan-code.h               |   2 +-
 src/scan-code.l               |   2 +-
 src/scan-gram.h               |   2 +-
 src/scan-gram.l               |   3 +-
 src/scan-skel.h               |   2 +-
 src/scan-skel.l               |   3 +-
 src/state.c                   |   3 +-
 src/state.h                   |   4 +-
 src/symlist.c                 |   2 +-
 src/symlist.h                 |   2 +-
 src/symtab.c                  |   5 +-
 src/symtab.h                  |   4 +-
 src/system.h                  |   3 +-
 src/tables.c                  |   4 +-
 src/tables.h                  |   2 +-
 src/uniqstr.c                 |   2 +-
 src/uniqstr.h                 |   2 +-
 tests/Makefile.am             |   3 +-
 tests/actions.at              |   3 +-
 tests/atlocal.in              |   3 +-
 tests/c++.at                  |   3 +-
 tests/calc.at                 |   3 +-
 tests/conflicts.at            |   4 +-
 tests/cxx-type.at             |   3 +-
 tests/existing.at             |   4 +-
 tests/glr-regression.at       |   2 +-
 tests/headers.at              |   4 +-
 tests/input.at                |   3 +-
 tests/java.at                 |   2 +-
 tests/local.at                |   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                 |   4 +-
 tests/skeletons.at            |   2 +-
 tests/synclines.at            |   4 +-
 tests/testsuite.at            |   4 +-
 tests/torture.at              |   2 +-
 181 files changed, 521 insertions(+), 564 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 077ec30c..1743e185 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-01-04  Joel E. Denny  <jdenny@clemson.edu>
+
+	maint: run "make update-copyright"
+
 2009-12-30  Joel E. Denny  <jdenny@clemson.edu>
 
 	POSIX: complain if %prec's token was not defined.
@@ -22809,9 +22813,8 @@
 
 	-----
 
-	Copyright (C) 1987, 1988, 1991, 1992, 1993, 1994, 1995, 1996,
-	1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-	2007, 2008, 2009 Free Software Foundation, Inc.
+	Copyright (C) 1987-1988, 1991-2010 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/HACKING b/HACKING
index d0307870..062952cc 100644
--- a/HACKING
+++ b/HACKING
@@ -363,8 +363,7 @@ Push these changes.
 
 -----
 
-Copyright (C) 2002, 2003, 2004, 2005, 2007, 2008, 2009
-Free Software Foundation, Inc.
+Copyright (C) 2002-2005, 2007-2010 Free Software Foundation, Inc.
 
 This file is part of GNU Bison.
 
diff --git a/Makefile.am b/Makefile.am
index 036efac7..8a705de6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,5 @@
 ## Process this file with automake to produce Makefile.in -*-Makefile-*-
-## Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008-2009
-## Free Software Foundation, Inc.
+## Copyright (C) 2001-2010 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 086325d5..9933922c 100644
--- a/NEWS
+++ b/NEWS
@@ -1319,8 +1319,7 @@ End:
 
 -----
 
-Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+Copyright (C) 1995-2010 Free Software Foundation, Inc.
 
 This file is part of Bison, the GNU Parser Generator.
 
diff --git a/PACKAGING b/PACKAGING
index 6f858727..12cd2953 100644
--- a/PACKAGING
+++ b/PACKAGING
@@ -36,7 +36,7 @@ to the bison package.
 
 -----
 
-Copyright (C) 2002, 2005, 2009 Free Software Foundation, Inc.
+Copyright (C) 2002, 2005, 2009-2010 Free Software Foundation, Inc.
 
 This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/README b/README
index 2bf62bf2..11466572 100644
--- a/README
+++ b/README
@@ -40,8 +40,8 @@ End:
 
 -----
 
-Copyright (C) 1992, 1998, 1999, 2003, 2004, 2005, 2008-2009 Free
-Software Foundation, Inc.
+Copyright (C) 1992, 1998-1999, 2003-2005, 2008-2010 Free Software
+Foundation, Inc.
 
 This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/README-alpha b/README-alpha
index 14ca052c..70122b99 100644
--- a/README-alpha
+++ b/README-alpha
@@ -12,7 +12,7 @@ the problems you encounter.
 
 -----
 
-Copyright (C) 2002, 2004, 2009 Free Software Foundation, Inc.
+Copyright (C) 2002, 2004, 2009-2010 Free Software Foundation, Inc.
 
 This file is part of GNU Bison.
 
diff --git a/TODO b/TODO
index 91845136..ee6f8e9a 100644
--- a/TODO
+++ b/TODO
@@ -287,8 +287,7 @@ Equip the parser with a means to create the (visual) parse tree.
 
 -----
 
-Copyright (C) 2001, 2002, 2003, 2004, 2006, 2009 Free Software
-Foundation, Inc.
+Copyright (C) 2001-2004, 2006, 2009-2010 Free Software Foundation, Inc.
 
 This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/bootstrap b/bootstrap
index 4d31cbe4..5717b46c 100755
--- a/bootstrap
+++ b/bootstrap
@@ -2,8 +2,7 @@
 
 # Bootstrap this package from checked-out sources.
 
-# Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009
-# Free Software Foundation, Inc.
+# Copyright (C) 2003-2010 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 4522d8c9..2d522e25 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -1,6 +1,6 @@
 # Bootstrap configuration.
 
-# Copyright (C) 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+# Copyright (C) 2006-2010 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 30c38013..689daad6 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 Free Software Foundation, Inc.
+# Copyright (C) 2009-2010 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 5c74313f..e8cdfbf3 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -1,5 +1,5 @@
 # Customize maint.mk                           -*- makefile -*-
-# Copyright (C) 2008-2009 Free Software Foundation, Inc.
+# Copyright (C) 2008-2010 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 faba6273..2dcd975f 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
-# Free Software Foundation, Inc.
+# Copyright (C) 2001-2010 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/Makefile.am b/data/Makefile.am
index 8ac50879..48ddc6d9 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,5 +1,4 @@
-## Copyright (C) 2002, 2005, 2006, 2007, 2008-2009 Free Software
-## Foundation, Inc.
+## Copyright (C) 2002, 2005-2010 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/README b/data/README
index 1de6c78c..1698e252 100644
--- a/data/README
+++ b/data/README
@@ -52,7 +52,7 @@ into various formats.
 
 -----
 
-Copyright (C) 2002, 2008-2009 Free Software Foundation, Inc.
+Copyright (C) 2002, 2008-2010 Free Software Foundation, Inc.
 
 This file is part of GNU Bison.
 
diff --git a/data/bison.m4 b/data/bison.m4
index 014f10f8..868f98a1 100644
--- a/data/bison.m4
+++ b/data/bison.m4
@@ -1,8 +1,7 @@
                                                             -*- Autoconf -*-
 
 # Language-independent M4 Macros for Bison.
-# Copyright (C) 2002, 2004, 2005, 2006, 2007, 2008, 2009 Free Software
-# Foundation, Inc.
+# Copyright (C) 2002, 2004-2010 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 b98f7bb7..f017abc2 100644
--- a/data/c++-skel.m4
+++ b/data/c++-skel.m4
@@ -1,7 +1,7 @@
                                                             -*- Autoconf -*-
 
 # C++ skeleton dispatching for Bison.
-# Copyright (C) 2006, 2007, 2009 Free Software Foundation, Inc.
+# Copyright (C) 2006-2007, 2009-2010 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 0502dfe9..7b58c90c 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 Free
-# Software Foundation, Inc.
+# Copyright (C) 2002-2010 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 20c2a831..a491b607 100644
--- a/data/c-skel.m4
+++ b/data/c-skel.m4
@@ -1,7 +1,7 @@
                                                             -*- Autoconf -*-
 
 # C skeleton dispatching for Bison.
-# Copyright (C) 2006, 2007, 2009 Free Software Foundation, Inc.
+# Copyright (C) 2006-2007, 2009-2010 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 bfa534b5..964fc2e0 100644
--- a/data/c.m4
+++ b/data/c.m4
@@ -1,8 +1,7 @@
                                                             -*- Autoconf -*-
 
 # C M4 Macros for Bison.
-# Copyright (C) 2002, 2004, 2005, 2006, 2007, 2008, 2009 Free Software
-# Foundation, Inc.
+# Copyright (C) 2002, 2004-2010 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 60c3e402..dcd56c23 100644
--- a/data/glr.c
+++ b/data/glr.c
@@ -1,8 +1,7 @@
                                                                     -*- C -*-
 
 # GLR skeleton for Bison
-# Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free
-# Software Foundation, Inc.
+# Copyright (C) 2002-2010 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
@@ -150,7 +149,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])
+             [2002-2010])
 [
 /* C GLR parser skeleton written by Paul Hilfinger.  */
 
@@ -2643,7 +2642,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])
+             [2002-2010])
 
 b4_shared_declarations
 
diff --git a/data/glr.cc b/data/glr.cc
index ff19e279..57b4f1f9 100644
--- a/data/glr.cc
+++ b/data/glr.cc
@@ -1,8 +1,7 @@
                                                                     -*- C -*-
 
 # C++ GLR skeleton for Bison
-# Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008-2009 Free
-# Software Foundation, Inc.
+# Copyright (C) 2002-2010 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
@@ -219,7 +218,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, 2009])[
+             [2002-2006, 2009-2010])[
 
 /* C++ GLR parser skeleton written by Akim Demaille.  */
 
diff --git a/data/java-skel.m4 b/data/java-skel.m4
index 7c314ceb..b5e66e44 100644
--- a/data/java-skel.m4
+++ b/data/java-skel.m4
@@ -1,7 +1,7 @@
                                                             -*- Autoconf -*-
 
 # Java skeleton dispatching for Bison.
-# Copyright (C) 2007, 2009 Free Software Foundation, Inc.
+# Copyright (C) 2007, 2009-2010 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 c03b65d7..91a1ed73 100644
--- a/data/java.m4
+++ b/data/java.m4
@@ -2,7 +2,7 @@
 
 # Java language support for Bison
 
-# Copyright (C) 2007, 2008-2009 Free Software Foundation, Inc.
+# Copyright (C) 2007-2010 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 a3f7567a..86cc7135 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
-# Free Software Foundation, Inc.
+# Copyright (C) 2002-2010 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
@@ -35,7 +34,7 @@ m4_divert_push(0)dnl
 b4_defines_if(
 [@output(b4_spec_defines_file@)@
 b4_copyright([Skeleton interface for Bison LALR(1) parsers in C++],
-             [2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009])
+             [2002-2010])
 dnl FIXME: This is wrong, we want computed header guards.
 [
 /* C++ LALR(1) parser skeleton written by Akim Demaille.  */
@@ -305,7 +304,7 @@ b4_percent_code_get([[provides]])[]dnl
 ])dnl
 @output(b4_parser_file_name@)@
 b4_copyright([Skeleton implementation for Bison LALR(1) parsers in C++],
-             [2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009])
+             [2002-2010])
 b4_percent_code_get([[top]])[]dnl
 m4_if(b4_prefix, [yy], [],
 [
@@ -1092,7 +1091,7 @@ b4_error_verbose_if([int yystate, int yytoken],
 dnl
 @output(b4_dir_prefix[]stack.hh@)@
 b4_copyright([Stack handling for Bison parsers in C++],
-             [2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009])[
+             [2002-2010])[
 
 #ifndef BISON_STACK_HH
 # define BISON_STACK_HH
diff --git a/data/lalr1.java b/data/lalr1.java
index 74fe39f9..8779c877 100644
--- a/data/lalr1.java
+++ b/data/lalr1.java
@@ -1,6 +1,6 @@
 # Java skeleton for Bison -*- autoconf -*-
 
-# Copyright (C) 2007, 2008, 2009 Free Software Foundation, Inc.
+# Copyright (C) 2007-2010 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
@@ -25,7 +25,7 @@ m4_ifval(m4_defn([b4_symbol_destructors]),
 m4_divert_push(0)dnl
 @output(b4_parser_file_name@)@
 b4_copyright([Skeleton implementation for Bison LALR(1) parsers in Java],
-             [2007, 2008, 2009])
+             [2007-2010])
 
 b4_percent_define_ifdef([package], [package b4_percent_define_get([package]);
 ])[/* First part of user declarations.  */
diff --git a/data/location.cc b/data/location.cc
index d21e362a..50a9065b 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, 2009
-# Free Software Foundation, Inc.
+# Copyright (C) 2002-2007, 2009-2010 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
@@ -21,7 +20,7 @@ m4_changecom()
 m4_divert_push(0)dnl
 @output(b4_dir_prefix[]position.hh@)@
 b4_copyright([Positions for Bison parsers in C++],
-             [2002, 2003, 2004, 2005, 2006, 2007, 2009])[
+             [2002-2007, 2009-2010])[
 
 /**
  ** \file position.hh
@@ -146,7 +145,7 @@ b4_copyright([Positions for Bison parsers in C++],
 #endif // not BISON_POSITION_HH]
 @output(b4_dir_prefix[]location.hh@)@
 b4_copyright([Locations for Bison parsers in C++],
-             [2002, 2003, 2004, 2005, 2006, 2007, 2009])[
+             [2002-2007, 2009-2010])[
 
 /**
  ** \file location.hh
diff --git a/data/xslt/bison.xsl b/data/xslt/bison.xsl
index f5f6323b..b5d163d3 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 Free Software Foundation, Inc.
+    Copyright (C) 2007-2010 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 aa9bde0a..887a9917 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 Free Software Foundation, Inc.
+    Copyright (C) 2007-2010 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 fbb6f2bd..866efe3b 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 Free Software Foundation, Inc.
+    Copyright (C) 2007-2010 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 e33f3eab..27707434 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 Free Software Foundation, Inc.
+    Copyright (C) 2007-2010 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 fc74e58a..4274673d 100644
--- a/data/yacc.c
+++ b/data/yacc.c
@@ -2,8 +2,8 @@
 
 # Yacc compatible skeleton for Bison
 
-# Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-# 2007, 2008, 2009 Free Software Foundation, Inc.
+# Copyright (C) 1984, 1989-1990, 2000-2010 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,8 +217,7 @@ m4_changecom()
 m4_divert_push(0)dnl
 @output(b4_parser_file_name@)@
 b4_copyright([Skeleton implementation for Bison's Yacc-like parsers in C],
-             [1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005,
-              2006, 2007, 2008, 2009])[
+             [1984, 1989-1990, 2000-2010])[
 
 /* C LALR(1) parser skeleton written by Richard Stallman, by
    simplifying the original so-called "semantic" parser.  */
@@ -1726,8 +1725,7 @@ yypushreturn:]])[
 b4_defines_if(
 [@output(b4_spec_defines_file@)@
 b4_copyright([Skeleton interface for Bison's Yacc-like parsers in C],
-             [1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005,
-              2006, 2007, 2008, 2009])
+             [1984, 1989-1990, 2000-2010])
 
 b4_percent_code_get([[requires]])[]dnl
 
diff --git a/djgpp/Makefile.maint b/djgpp/Makefile.maint
index 9a67b926..94cfbf21 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 Free Software Foundation,
-## Inc.
+## Copyright (C) 2005-2010 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 05081617..a02e9bf4 100644
--- a/djgpp/README.in
+++ b/djgpp/README.in
@@ -1,6 +1,6 @@
 This is a port of GNU Bison @VERSION@ to MSDOS/DJGPP.
 
-Copyright (C) 2005, 2006, 2007, 2008-2009 Free Software Foundation, Inc.
+Copyright (C) 2005-2010 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 b3d75d8e..a71543ce 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 Free Software Foundation,
-Rem Inc.
+Rem Copyright (C) 2005-2010 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 d906db8f..3c00de58 100644
--- a/djgpp/config.sed
+++ b/djgpp/config.sed
@@ -3,8 +3,7 @@
 # of the configure script generated by autoconf 2.62.
 
 
-# Copyright (C) 2005, 2006, 2007, 2008-2009 Free Software Foundation,
-# Inc.
+# Copyright (C) 2005-2010 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 2fee3746..ae10686d 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 Free Software Foundation,
-# Inc.
+# Copyright (C) 2005-2010 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 14a74f58..e24b4e70 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 Free Software Foundation,
-# Inc.
+# Copyright (C) 2005-2010 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 aa96efd8..cca988fc 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 Free Software Foundation,
-Rem Inc.
+Rem Copyright (C) 2005-2010 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/subpipe.c b/djgpp/subpipe.c
index bbff5904..213703d4 100644
--- a/djgpp/subpipe.c
+++ b/djgpp/subpipe.c
@@ -1,7 +1,6 @@
 /* Subprocesses with pipes.
 
-   Copyright (C) 2005, 2006, 2007, 2008-2009 Free Software Foundation,
-   Inc.
+   Copyright (C) 2005-2010 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 4257f418..aaf49bf7 100644
--- a/djgpp/subpipe.h
+++ b/djgpp/subpipe.h
@@ -1,6 +1,5 @@
 /* Subprocesses with pipes.
-   Copyright (C) 2005, 2006, 2007, 2008-2009 Free Software Foundation,
-   Inc.
+   Copyright (C) 2005-2010 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 d5a0d7b7..620c4718 100644
--- a/djgpp/testsuite.sed
+++ b/djgpp/testsuite.sed
@@ -3,7 +3,7 @@
 # of the testsuite script generated by autoconf 2.61.
 
 
-# Copyright (C) 2007, 2008-2009 Free Software Foundation, Inc.
+# Copyright (C) 2007-2010 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/Makefile.am b/doc/Makefile.am
index adf8ad89..53d70d9c 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,6 +1,5 @@
 ## Process this file with automake to produce Makefile.in -*-Makefile-*-
-## Copyright (C) 2001, 2002, 2003, 2005, 2006, 2007, 2008-2009 Free
-## Software Foundation, Inc.
+## Copyright (C) 2001-2003, 2005-2010 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 faafaabc..b6665318 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 Free
-Software Foundation, Inc.
+Copyright @copyright{} 1988-1993, 1995, 1998-2010 Free Software
+Foundation, Inc.
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
diff --git a/doc/refcard.tex b/doc/refcard.tex
index 59e9dea2..55acb28e 100644
--- a/doc/refcard.tex
+++ b/doc/refcard.tex
@@ -19,7 +19,7 @@
 \def\finalout{\overfullrule=0pt}
 %\finalout
 
-% Copyright (c) 1998, 2001, 2009 Free Software Foundation, Inc.
+% Copyright (c) 1998, 2001, 2009-2010 Free Software Foundation, Inc.
 %
 % This file is part of Bison.
 %
diff --git a/etc/Makefile.am b/etc/Makefile.am
index 6b5e36ed..3f789b96 100644
--- a/etc/Makefile.am
+++ b/etc/Makefile.am
@@ -1,4 +1,4 @@
-## Copyright (C) 2006, 2009 Free Software Foundation, Inc.
+## Copyright (C) 2006, 2009-2010 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/etc/README b/etc/README
index 01fa0518..0ae5b8d4 100644
--- a/etc/README
+++ b/etc/README
@@ -19,7 +19,7 @@ straightforward use of _build/src/bison would.)
 
 --
 
-Copyright (C) 2006, 2009 Free Software Foundation, Inc.
+Copyright (C) 2006, 2009-2010 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 f36691fe..5f83b778 100755
--- a/etc/bench.pl.in
+++ b/etc/bench.pl.in
@@ -1,6 +1,6 @@
 #! /usr/bin/perl -w
 
-# Copyright (C) 2006, 2008, 2009 Free Software Foundation, Inc.
+# Copyright (C) 2006, 2008-2010 Free Software Foundation, Inc.
 #
 # This file is part of Bison, the GNU Compiler Compiler.
 #
diff --git a/examples/Makefile.am b/examples/Makefile.am
index ba1d2161..552adf4b 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -1,5 +1,5 @@
 ## Process this file with automake to produce Makefile.in -*-Makefile-*-
-## Copyright (C) 2005, 2009 Free Software Foundation, Inc.
+## Copyright (C) 2005, 2009-2010 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 085ffaa8..df8204e2 100644
--- a/examples/calc++/Makefile.am
+++ b/examples/calc++/Makefile.am
@@ -1,5 +1,5 @@
 ## Process this file with automake to produce Makefile.in -*-Makefile-*-
-## Copyright (C) 2005, 2006, 2009 Free Software Foundation, Inc.
+## Copyright (C) 2005-2006, 2009-2010 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 15fb2787..373aea22 100644
--- a/examples/extexi
+++ b/examples/extexi
@@ -1,7 +1,7 @@
 # Extract all examples from the manual source.            -*- AWK -*-
 
 # This file is part of GNU Bison
-# Copyright (C) 1992, 2000, 2001, 2005, 2006, 2009 Free Software
+# Copyright (C) 1992, 2000-2001, 2005-2006, 2009-2010 Free Software
 # Foundation, Inc.
 #
 # This program is free software: you can redistribute it and/or modify
diff --git a/lib/Makefile.am b/lib/Makefile.am
index f7c3bef5..77ca6646 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,7 +1,7 @@
 # Make bison/lib.
 
-# Copyright (C) 2001, 2002, 2003, 2004, 2006, 2008, 2009
-# Free Software Foundation, Inc.
+# Copyright (C) 2001-2004, 2006, 2008-2010 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 551848c9..dc71713d 100644
--- a/lib/abitset.c
+++ b/lib/abitset.c
@@ -1,5 +1,6 @@
 /* Array bitsets.
-   Copyright (C) 2002, 2003, 2006, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2002-2003, 2006, 2009-2010 Free Software Foundation,
+   Inc.
    Contributed by Michael Hayes (m.hayes@elec.canterbury.ac.nz).
 
    This program is free software: you can redistribute it and/or modify
diff --git a/lib/abitset.h b/lib/abitset.h
index c4a0e535..86e20e1e 100644
--- a/lib/abitset.h
+++ b/lib/abitset.h
@@ -1,5 +1,5 @@
 /* Functions to support abitsets.
-   Copyright (C) 2002, 2004, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004, 2009-2010 Free Software Foundation, Inc.
    Contributed by Michael Hayes (m.hayes@elec.canterbury.ac.nz).
 
    This program is free software: you can redistribute it and/or modify
diff --git a/lib/bbitset.h b/lib/bbitset.h
index d9d5e4b5..c24d1163 100644
--- a/lib/bbitset.h
+++ b/lib/bbitset.h
@@ -1,5 +1,5 @@
 /* Base bitset stuff.
-   Copyright (C) 2002, 2003, 2004, 2006, 2009 Free Software Foundation,
+   Copyright (C) 2002-2004, 2006, 2009-2010 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 3b76618e..83d10a86 100644
--- a/lib/bitset.c
+++ b/lib/bitset.c
@@ -1,6 +1,5 @@
 /* General bitsets.
-   Copyright (C) 2002, 2003, 2004, 2005, 2006, 2009 Free Software
-   Foundation, Inc.
+   Copyright (C) 2002-2006, 2009-2010 Free Software Foundation, Inc.
    Contributed by Michael Hayes (m.hayes@elec.canterbury.ac.nz).
 
    This program is free software: you can redistribute it and/or modify
diff --git a/lib/bitset.h b/lib/bitset.h
index 07e1d9d6..8e319380 100644
--- a/lib/bitset.h
+++ b/lib/bitset.h
@@ -1,5 +1,5 @@
 /* Generic bitsets.
-   Copyright (C) 2002, 2003, 2004, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2002-2004, 2009-2010 Free Software Foundation, Inc.
    Contributed by Michael Hayes (m.hayes@elec.canterbury.ac.nz).
 
    This program is free software: you can redistribute it and/or modify
diff --git a/lib/bitset_stats.c b/lib/bitset_stats.c
index d71b91a0..a0563853 100644
--- a/lib/bitset_stats.c
+++ b/lib/bitset_stats.c
@@ -1,6 +1,5 @@
 /* Bitset statistics.
-   Copyright (C) 2002, 2003, 2004, 2005, 2006, 2009 Free Software
-   Foundation, Inc.
+   Copyright (C) 2002-2006, 2009-2010 Free Software Foundation, Inc.
    Contributed by Michael Hayes (m.hayes@elec.canterbury.ac.nz).
 
    This program is free software: you can redistribute it and/or modify
diff --git a/lib/bitset_stats.h b/lib/bitset_stats.h
index fb203c48..06dac77d 100644
--- a/lib/bitset_stats.h
+++ b/lib/bitset_stats.h
@@ -1,5 +1,5 @@
 /* Functions to support bitset statistics.
-   Copyright (C) 2002, 2003, 2004, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2002-2004, 2009-2010 Free Software Foundation, Inc.
    Contributed by Michael Hayes (m.hayes@elec.canterbury.ac.nz).
 
    This program is free software: you can redistribute it and/or modify
diff --git a/lib/bitsetv-print.c b/lib/bitsetv-print.c
index 3cc73bd8..3ab545e7 100644
--- a/lib/bitsetv-print.c
+++ b/lib/bitsetv-print.c
@@ -1,6 +1,6 @@
 /* Bitset vectors.
-   Copyright (C) 2001, 2002, 2004, 2006, 2009 Free Software Foundation,
-   Inc.
+   Copyright (C) 2001-2002, 2004, 2006, 2009-2010 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/bitsetv-print.h b/lib/bitsetv-print.h
index be55a68f..b4913184 100644
--- a/lib/bitsetv-print.h
+++ b/lib/bitsetv-print.h
@@ -1,5 +1,5 @@
 /* Bitset vectors.
-   Copyright (C) 2002, 2004, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004, 2009-2010 Free Software Foundation, Inc.
    Contributed by Akim Demaille (akim@freefriends.org).
 
    This program is free software: you can redistribute it and/or modify
diff --git a/lib/bitsetv.c b/lib/bitsetv.c
index 36b22742..3a082794 100644
--- a/lib/bitsetv.c
+++ b/lib/bitsetv.c
@@ -1,5 +1,5 @@
 /* Bitset vectors.
-   Copyright (C) 2001, 2002, 2004, 2005, 2006, 2009 Free Software
+   Copyright (C) 2001-2002, 2004-2006, 2009-2010 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 5ad8b6b7..2bec847c 100644
--- a/lib/bitsetv.h
+++ b/lib/bitsetv.h
@@ -1,5 +1,5 @@
 /* Bitset vectors.
-   Copyright (C) 2002, 2004, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004, 2009-2010 Free Software Foundation, Inc.
    Contributed by Michael Hayes (m.hayes@elec.canterbury.ac.nz).
 
    This program is free software: you can redistribute it and/or modify
diff --git a/lib/ebitset.c b/lib/ebitset.c
index e3839424..0d12d044 100644
--- a/lib/ebitset.c
+++ b/lib/ebitset.c
@@ -1,6 +1,5 @@
 /* Functions to support expandable bitsets.
-   Copyright (C) 2002, 2003, 2004, 2005, 2006, 2009 Free Software
-   Foundation, Inc.
+   Copyright (C) 2002-2006, 2009-2010 Free Software Foundation, Inc.
    Contributed by Michael Hayes (m.hayes@elec.canterbury.ac.nz).
 
    This program is free software: you can redistribute it and/or modify
diff --git a/lib/ebitset.h b/lib/ebitset.h
index d344513d..3d73acee 100644
--- a/lib/ebitset.h
+++ b/lib/ebitset.h
@@ -1,5 +1,5 @@
 /* Functions to support ebitsets.
-   Copyright (C) 2002, 2004, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004, 2009-2010 Free Software Foundation, Inc.
    Contributed by Michael Hayes (m.hayes@elec.canterbury.ac.nz).
 
    This program is free software: you can redistribute it and/or modify
diff --git a/lib/get-errno.c b/lib/get-errno.c
index 6d2dae79..f0a82e2c 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 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2006, 2009-2010 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 0f49a52a..5cb660bd 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 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2009-2010 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 81e934e6..d48a4a83 100644
--- a/lib/lbitset.c
+++ b/lib/lbitset.c
@@ -1,5 +1,5 @@
 /* Functions to support link list bitsets.
-   Copyright (C) 2002, 2003, 2004, 2006, 2009 Free Software Foundation,
+   Copyright (C) 2002-2004, 2006, 2009-2010 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 c67b4412..59f79144 100644
--- a/lib/lbitset.h
+++ b/lib/lbitset.h
@@ -1,5 +1,5 @@
 /* Functions to support lbitsets.
-   Copyright (C) 2002, 2004, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004, 2009-2010 Free Software Foundation, Inc.
    Contributed by Michael Hayes (m.hayes@elec.canterbury.ac.nz).
 
    This program is free software: you can redistribute it and/or modify
diff --git a/lib/libiberty.h b/lib/libiberty.h
index c71da38b..ac5842e7 100644
--- a/lib/libiberty.h
+++ b/lib/libiberty.h
@@ -1,5 +1,5 @@
 /* Fake libiberty.h for Bison.
-   Copyright (C) 2002, 2003, 2004, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2002-2004, 2009-2010 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 13cd9f46..028194a0 100644
--- a/lib/main.c
+++ b/lib/main.c
@@ -1,6 +1,6 @@
 /* Yacc library main function.
 
-   Copyright (C) 2002, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2009-2010 Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/lib/subpipe.c b/lib/subpipe.c
index d7b67ce7..1b7c36d8 100644
--- a/lib/subpipe.c
+++ b/lib/subpipe.c
@@ -1,6 +1,6 @@
 /* Subprocesses with pipes.
 
-   Copyright (C) 2002, 2004, 2005, 2006, 2009 Free Software Foundation,
+   Copyright (C) 2002, 2004-2006, 2009-2010 Free Software Foundation,
    Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/lib/subpipe.h b/lib/subpipe.h
index f20a0d72..ff791a81 100644
--- a/lib/subpipe.h
+++ b/lib/subpipe.h
@@ -1,5 +1,6 @@
 /* Subprocesses with pipes.
-   Copyright (C) 2002, 2004, 2005, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004-2005, 2009-2010 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/timevar.c b/lib/timevar.c
index 77709e93..00faaf91 100644
--- a/lib/timevar.c
+++ b/lib/timevar.c
@@ -1,5 +1,5 @@
 /* Timing variables for measuring compiler performance.
-   Copyright (C) 2000, 2002, 2004, 2005, 2006, 2009 Free Software
+   Copyright (C) 2000, 2002, 2004-2006, 2009-2010 Free Software
    Foundation, Inc.
    Contributed by Alex Samuel <samuel@codesourcery.com>
 
diff --git a/lib/timevar.def b/lib/timevar.def
index 5caf7c3d..ab04b226 100644
--- a/lib/timevar.def
+++ b/lib/timevar.def
@@ -1,6 +1,6 @@
 /* This file contains the definitions for timing variables used to -*- C -*-
    measure run-time performance of the compiler.
-   Copyright (C) 2002, 2007, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2007, 2009-2010 Free Software Foundation, Inc.
    Contributed by Akim Demaille <akim@freefriends.org>.
 
    This file is part of Bison, the GNU Compiler Compiler.
diff --git a/lib/timevar.h b/lib/timevar.h
index d2f061e8..52cc8e3e 100644
--- a/lib/timevar.h
+++ b/lib/timevar.h
@@ -1,5 +1,6 @@
 /* Timing variables for measuring compiler performance.
-   Copyright (C) 2000, 2002, 2004, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2002, 2004, 2009-2010 Free Software Foundation,
+   Inc.
    Contributed by Alex Samuel <samuel@codesourcery.com>
 
    This program is free software: you can redistribute it and/or modify
diff --git a/lib/vbitset.c b/lib/vbitset.c
index 799d2a92..d82f0ec9 100644
--- a/lib/vbitset.c
+++ b/lib/vbitset.c
@@ -1,6 +1,5 @@
 /* Variable array bitsets.
-   Copyright (C) 2002, 2003, 2004, 2005, 2006, 2009 Free Software
-   Foundation, Inc.
+   Copyright (C) 2002-2006, 2009-2010 Free Software Foundation, Inc.
    Contributed by Michael Hayes (m.hayes@elec.canterbury.ac.nz).
 
    This program is free software: you can redistribute it and/or modify
diff --git a/lib/vbitset.h b/lib/vbitset.h
index d7b5891d..d9f3a2eb 100644
--- a/lib/vbitset.h
+++ b/lib/vbitset.h
@@ -1,5 +1,5 @@
 /* Functions to support vbitsets.
-   Copyright (C) 2002, 2004, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004, 2009-2010 Free Software Foundation, Inc.
    Contributed by Michael Hayes (m.hayes@elec.canterbury.ac.nz).
 
    This program is free software: you can redistribute it and/or modify
diff --git a/lib/yyerror.c b/lib/yyerror.c
index 208ecccb..8e554a09 100644
--- a/lib/yyerror.c
+++ b/lib/yyerror.c
@@ -1,6 +1,6 @@
 /* Yacc library error-printing function.
 
-   Copyright (C) 2002, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2009-2010 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 a416e3af..0c04c8e3 100644
--- a/m4/bison-i18n.m4
+++ b/m4/bison-i18n.m4
@@ -1,5 +1,5 @@
 # bison-i18n.m4 serial 2
-dnl Copyright (C) 2005-2006, 2009 Free Software Foundation, Inc.
+dnl Copyright (C) 2005-2006, 2009-2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/c-working.m4 b/m4/c-working.m4
index 493a2268..f185812a 100644
--- a/m4/c-working.m4
+++ b/m4/c-working.m4
@@ -1,6 +1,6 @@
 # Sanity test a C compiler.
 
-# Copyright (C) 2006, 2009 Free Software Foundation, Inc.
+# Copyright (C) 2006, 2009-2010 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 3d5f400e..f9c6508e 100644
--- a/m4/cxx.m4
+++ b/m4/cxx.m4
@@ -1,7 +1,7 @@
 # -*- Autoconf -*-
 # Sanity-test a C++ compiler.
 #
-# Copyright (C) 2004, 2006, 2009 Free Software Foundation, Inc.
+# Copyright (C) 2004, 2006, 2009-2010 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 924a3196..774a8ab7 100644
--- a/m4/subpipe.m4
+++ b/m4/subpipe.m4
@@ -1,7 +1,8 @@
 # -*- Autoconf -*-
 # Checks required to run `subpipe'.
 #
-# Copyright (C) 2002, 2003, 2005, 2009 Free Software Foundation, Inc.
+# Copyright (C) 2002-2003, 2005, 2009-2010 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/timevar.m4 b/m4/timevar.m4
index 4fcbbdfd..b10a55c7 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 Free Software Foundation, Inc.
+# Copyright (C) 2002-2003, 2009-2010 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 d756f5d2..1745b4a5 100644
--- a/src/AnnotationList.c
+++ b/src/AnnotationList.c
@@ -1,6 +1,6 @@
 /* IELR's inadequacy annotation list.
 
-   Copyright (C) 2009 Free Software Foundation, Inc.
+   Copyright (C) 2009-2010 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 a9876e16..2f4a6108 100644
--- a/src/AnnotationList.h
+++ b/src/AnnotationList.h
@@ -1,6 +1,6 @@
 /* IELR's inadequacy annotation list.
 
-   Copyright (C) 2009 Free Software Foundation, Inc.
+   Copyright (C) 2009-2010 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 a79233e4..d1871697 100644
--- a/src/InadequacyList.c
+++ b/src/InadequacyList.c
@@ -1,6 +1,6 @@
 /* IELR's inadequacy list.
 
-   Copyright (C) 2009 Free Software Foundation, Inc.
+   Copyright (C) 2009-2010 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 9ec8a29b..20ebaceb 100644
--- a/src/InadequacyList.h
+++ b/src/InadequacyList.h
@@ -1,6 +1,6 @@
 /* IELR's inadequacy list.
 
-   Copyright (C) 2009 Free Software Foundation, Inc.
+   Copyright (C) 2009-2010 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 4725d6bc..fa563242 100644
--- a/src/LR0.c
+++ b/src/LR0.c
@@ -1,7 +1,7 @@
 /* Generate the nondeterministic finite state machine for Bison.
 
-   Copyright (C) 1984, 1986, 1989, 2000, 2001, 2002, 2004, 2005, 2006,
-   2007, 2009 Free Software Foundation, Inc.
+   Copyright (C) 1984, 1986, 1989, 2000-2002, 2004-2007, 2009-2010 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 60e95afe..44188713 100644
--- a/src/LR0.h
+++ b/src/LR0.h
@@ -1,5 +1,5 @@
 /* Generate the nondeterministic finite state machine for bison,
-   Copyright (C) 1984, 1986, 1989, 2000, 2001, 2002, 2009 Free Software
+   Copyright (C) 1984, 1986, 1989, 2000-2002, 2009-2010 Free Software
    Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
diff --git a/src/Makefile.am b/src/Makefile.am
index a7b3acbb..095a42be 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,7 +1,6 @@
 # Make bison/src.
 
-# Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
-# Free Software Foundation, Inc.
+# Copyright (C) 2001-2010 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/Sbitset.c b/src/Sbitset.c
index 742b5659..6602bdb9 100644
--- a/src/Sbitset.c
+++ b/src/Sbitset.c
@@ -1,6 +1,6 @@
 /* A simple, memory-efficient bitset implementation.
 
-   Copyright (C) 2009 Free Software Foundation, Inc.
+   Copyright (C) 2009-2010 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 e379398f..9d20335a 100644
--- a/src/Sbitset.h
+++ b/src/Sbitset.h
@@ -1,6 +1,6 @@
 /* A simple, memory-efficient bitset implementation.
 
-   Copyright (C) 2009 Free Software Foundation, Inc.
+   Copyright (C) 2009-2010 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 259877e8..308e2e87 100644
--- a/src/assoc.c
+++ b/src/assoc.c
@@ -1,5 +1,6 @@
 /* Associativity information.
-   Copyright (C) 2002, 2005, 2006, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2005-2006, 2009-2010 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 3168f998..2102289e 100644
--- a/src/assoc.h
+++ b/src/assoc.h
@@ -1,5 +1,5 @@
 /* Associativity information.
-   Copyright (C) 2002, 2006, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2006, 2009-2010 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 180e1dfc..b2f336aa 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
-   Free Software Foundation, Inc.
+   Copyright (C) 1984, 1989, 2000-2002, 2004-2005, 2007, 2009-2010 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 f64b7d5e..143d8641 100644
--- a/src/closure.h
+++ b/src/closure.h
@@ -1,6 +1,6 @@
 /* Subroutines for bison
 
-   Copyright (C) 1984, 1989, 2000, 2001, 2002, 2007, 2009 Free Software
+   Copyright (C) 1984, 1989, 2000-2002, 2007, 2009-2010 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 63dfc935..f7900af4 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
-   Free Software Foundation, Inc.
+   Copyright (C) 2000-2002, 2004-2006, 2009-2010 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 fe4ecf75..3e028d69 100644
--- a/src/complain.h
+++ b/src/complain.h
@@ -1,5 +1,6 @@
 /* Declaration for error-reporting function for Bison.
-   Copyright (C) 2000, 2001, 2002, 2006, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2000-2002, 2006, 2009-2010 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 98959cff..21f1408d 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, 2009 Free Software Foundation, Inc.
+   Copyright (C) 1984, 1989, 1992, 2000-2007, 2009-2010 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 901e88a9..2b37db24 100644
--- a/src/conflicts.h
+++ b/src/conflicts.h
@@ -1,5 +1,5 @@
 /* Find and resolve or report lookahead conflicts for bison,
-   Copyright (C) 2000, 2001, 2002, 2004, 2007, 2009 Free Software
+   Copyright (C) 2000-2002, 2004, 2007, 2009-2010 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 7442ca87..2d60fd85 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 Free
-   Software Foundation, Inc.
+   Copyright (C) 1984, 1989, 2000-2003, 2005, 2009-2010 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 d9de5b06..32978665 100644
--- a/src/derives.h
+++ b/src/derives.h
@@ -1,6 +1,6 @@
 /* Match rules with nonterminals for bison,
 
-   Copyright (C) 1984, 1989, 2000, 2001, 2002, 2009 Free Software
+   Copyright (C) 1984, 1989, 2000-2002, 2009-2010 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 41e2453b..243bf069 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 Free Software Foundation, Inc.
+   Copyright (C) 1984, 1986, 1989, 1992, 2000-2010 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 a75eda22..e8f28bff 100644
--- a/src/files.h
+++ b/src/files.h
@@ -1,6 +1,6 @@
 /* File names and variables for bison,
 
-   Copyright (C) 1984, 1989, 2000, 2001, 2002, 2006, 2007, 2009 Free
+   Copyright (C) 1984, 1989, 2000-2002, 2006-2007, 2009-2010 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 b859049e..bb4ef72f 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 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2009-2010 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 8f7e668f..c42416be 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 Free Software Foundation, Inc.
+   Copyright (C) 1984, 1986, 1989, 1992, 2000-2010 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 b3a2a9b2..65a1b8ed 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 Free Software Foundation, Inc.
+   Copyright (C) 1984, 1986, 1989, 1992, 2000-2010 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 e28b64da..363d5cf2 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 Free Software Foundation, Inc.
+   Copyright (C) 1984, 1986, 1989, 2001-2003, 2005-2010 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 1def4810..a82a6b40 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 Free Software Foundation, Inc.
+   Copyright (C) 1984, 1986, 1989, 1992, 2001-2007, 2009-2010 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 4c960035..3b483b5b 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 Free Software Foundation, Inc.
+   Copyright (C) 2006-2007, 2009-2010 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 c5aed0c6..f1b314a3 100644
--- a/src/ielr.c
+++ b/src/ielr.c
@@ -1,6 +1,6 @@
 /* IELR main implementation.
 
-   Copyright (C) 2009 Free Software Foundation, Inc.
+   Copyright (C) 2009-2010 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 feab49a8..2dc5defb 100644
--- a/src/ielr.h
+++ b/src/ielr.h
@@ -1,6 +1,6 @@
 /* IELR main implementation.
 
-   Copyright (C) 2009 Free Software Foundation, Inc.
+   Copyright (C) 2009-2010 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 fbd2800f..5944a483 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 Free Software Foundation, Inc.
+   Copyright (C) 1984, 1986, 1989, 2000-2010 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 103a4c86..5cd77750 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
-   Free Software Foundation, Inc.
+   Copyright (C) 1984, 1986, 1989, 2000, 2002, 2004, 2006-2007,
+   2009-2010 Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/src/location.c b/src/location.c
index e287aee7..6fddaddc 100644
--- a/src/location.c
+++ b/src/location.c
@@ -1,6 +1,5 @@
 /* Locations for Bison
-   Copyright (C) 2002, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-   Inc.
+   Copyright (C) 2002, 2005-2010 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 95c5a07b..e8e591c9 100644
--- a/src/location.h
+++ b/src/location.h
@@ -1,6 +1,5 @@
 /* Locations for Bison
-   Copyright (C) 2002, 2004, 2005, 2006, 2007, 2008, 2009 Free Software
-   Foundation, Inc.
+   Copyright (C) 2002, 2004-2010 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 c8dc696e..05470d79 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 Free Software Foundation, Inc.
+   Copyright (C) 1984, 1986, 1989, 1992, 1995, 2000-2002, 2004-2010 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 49a985b3..08383a6d 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 Free
-   Software Foundation, Inc.
+   Copyright (C) 2001-2010 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 e06126b3..9403e46b 100644
--- a/src/muscle-tab.h
+++ b/src/muscle-tab.h
@@ -1,5 +1,5 @@
 /* Muscle table manager for Bison,
-   Copyright (C) 2001, 2002, 2003, 2006, 2007, 2009 Free Software
+   Copyright (C) 2001-2003, 2006-2007, 2009-2010 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 5f2fc904..857c7dab 100644
--- a/src/named-ref.c
+++ b/src/named-ref.c
@@ -1,6 +1,6 @@
 /* Named symbol references for Bison
 
-   Copyright (C) 2009 Free Software Foundation, Inc.
+   Copyright (C) 2009-2010 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 82b24fd0..d9544f2e 100644
--- a/src/named-ref.h
+++ b/src/named-ref.h
@@ -1,6 +1,6 @@
 /* Named symbol references for Bison
 
-   Copyright (C) 2009 Free Software Foundation, Inc.
+   Copyright (C) 2009-2010 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 51b876c5..b708059a 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 Free Software Foundation, Inc.
+   Copyright (C) 1984, 1989, 2000-2006, 2009-2010 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 a8e9e28d..c3e11c1e 100644
--- a/src/nullable.h
+++ b/src/nullable.h
@@ -1,5 +1,5 @@
 /* Part of the bison parser generator,
-   Copyright (C) 2000, 2002, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2002, 2009-2010 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 01ca5bea..06edbcd6 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 Free Software Foundation, Inc.
+   Copyright (C) 1984, 1986, 1989, 1992, 2000-2010 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 ed97ed79..bf805f51 100644
--- a/src/output.h
+++ b/src/output.h
@@ -1,5 +1,5 @@
 /* Output the generated parsing program for bison,
-   Copyright (C) 2000, 2001, 2002, 2003, 2006, 2007, 2009 Free Software
+   Copyright (C) 2000-2003, 2006-2007, 2009-2010 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 19038b32..701b4c5e 100644
--- a/src/parse-gram.c
+++ b/src/parse-gram.c
@@ -1,9 +1,8 @@
-/* A Bison parser, made by GNU Bison 2.4.1.173-62efdd.  */
+/* A Bison parser, made by GNU Bison 2.4.1.184-510df.  */
 
 /* Skeleton implementation for Bison's Yacc-like parsers in C
    
-      Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-   2007, 2008, 2009 Free Software Foundation, Inc.
+      Copyright (C) 1984, 1989-1990, 2000-2010 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.1.173-62efdd"
+#define YYBISON_VERSION "2.4.1.184-510df"
 
 /* Skeleton name.  */
 #define YYSKELETON_NAME "yacc.c"
@@ -74,12 +73,11 @@
 
 /* Copy the first part of user declarations.  */
 
-/* Line 252 of yacc.c  */
+/* Line 251 of yacc.c  */
 #line 1 "parse-gram.y"
 /* Bison Grammar Parser                             -*- C -*-
 
-   Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free
-   Software Foundation, Inc.
+   Copyright (C) 2002-2010 Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
@@ -151,8 +149,8 @@ static int current_prec = 0;
 #define YYTYPE_UINT8 uint_fast8_t
 
 
-/* Line 252 of yacc.c  */
-#line 156 "parse-gram.c"
+/* Line 251 of yacc.c  */
+#line 154 "parse-gram.c"
 
 /* Enabling traces.  */
 #ifndef YYDEBUG
@@ -302,8 +300,8 @@ static int current_prec = 0;
 typedef union YYSTYPE
 {
 
-/* Line 277 of yacc.c  */
-#line 94 "parse-gram.y"
+/* Line 276 of yacc.c  */
+#line 93 "parse-gram.y"
 
   symbol *symbol;
   symbol_list *list;
@@ -317,8 +315,8 @@ typedef union YYSTYPE
 
 
 
-/* Line 277 of yacc.c  */
-#line 322 "parse-gram.c"
+/* Line 276 of yacc.c  */
+#line 320 "parse-gram.c"
 } YYSTYPE;
 # define YYSTYPE_IS_TRIVIAL 1
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
@@ -342,8 +340,8 @@ typedef struct YYLTYPE
 /* Copy the second part of user declarations.  */
 
 
-/* Line 327 of yacc.c  */
-#line 347 "parse-gram.c"
+/* Line 326 of yacc.c  */
+#line 345 "parse-gram.c"
 
 #ifdef short
 # undef short
@@ -669,17 +667,17 @@ static const yytype_int8 yyrhs[] =
 /* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
 static const yytype_uint16 yyrline[] =
 {
-       0,   209,   209,   217,   219,   223,   224,   234,   235,   240,
-     241,   246,   247,   248,   249,   250,   251,   256,   265,   266,
-     267,   268,   269,   270,   271,   272,   273,   274,   275,   290,
-     291,   315,   316,   317,   318,   322,   323,   324,   328,   335,
-     342,   346,   350,   357,   372,   373,   377,   389,   389,   394,
-     394,   399,   410,   425,   426,   427,   431,   432,   437,   439,
-     444,   445,   450,   452,   457,   458,   462,   463,   464,   465,
-     470,   475,   480,   486,   492,   503,   504,   513,   514,   520,
-     521,   522,   529,   529,   534,   535,   536,   541,   543,   545,
-     547,   549,   551,   556,   558,   569,   570,   575,   576,   577,
-     586,   606,   608,   617,   622,   623,   628,   635,   637
+       0,   208,   208,   216,   218,   222,   223,   233,   234,   239,
+     240,   245,   246,   247,   248,   249,   250,   255,   264,   265,
+     266,   267,   268,   269,   270,   271,   272,   273,   274,   289,
+     290,   314,   315,   316,   317,   321,   322,   323,   327,   334,
+     341,   345,   349,   356,   371,   372,   376,   388,   388,   393,
+     393,   398,   409,   424,   425,   426,   430,   431,   436,   438,
+     443,   444,   449,   451,   456,   457,   461,   462,   463,   464,
+     469,   474,   479,   485,   491,   502,   503,   512,   513,   519,
+     520,   521,   528,   528,   533,   534,   535,   540,   542,   544,
+     546,   548,   550,   555,   557,   568,   569,   574,   575,   576,
+     585,   605,   607,   616,   621,   622,   627,   634,   636
 };
 #endif
 
@@ -1049,165 +1047,165 @@ yy_symbol_value_print (yyoutput, yytype, yyvaluep, yylocationp)
     {
       case 3: /* "\"string\"" */
 
-/* Line 798 of yacc.c  */
-#line 184 "parse-gram.y"
+/* Line 797 of yacc.c  */
+#line 183 "parse-gram.y"
 	{ fputs (quotearg_style (c_quoting_style, (yyvaluep->chars)), stderr); };
 
-/* Line 798 of yacc.c  */
-#line 1058 "parse-gram.c"
+/* Line 797 of yacc.c  */
+#line 1056 "parse-gram.c"
 	break;
       case 4: /* "\"integer\"" */
 
-/* Line 798 of yacc.c  */
-#line 196 "parse-gram.y"
+/* Line 797 of yacc.c  */
+#line 195 "parse-gram.y"
 	{ fprintf (stderr, "%d", (yyvaluep->integer)); };
 
-/* Line 798 of yacc.c  */
-#line 1067 "parse-gram.c"
+/* Line 797 of yacc.c  */
+#line 1065 "parse-gram.c"
 	break;
       case 43: /* "\"{...}\"" */
 
-/* Line 798 of yacc.c  */
-#line 186 "parse-gram.y"
+/* Line 797 of yacc.c  */
+#line 185 "parse-gram.y"
 	{ fprintf (stderr, "{\n%s\n}", (yyvaluep->code)); };
 
-/* Line 798 of yacc.c  */
-#line 1076 "parse-gram.c"
+/* Line 797 of yacc.c  */
+#line 1074 "parse-gram.c"
 	break;
       case 44: /* "\"[identifier]\"" */
 
-/* Line 798 of yacc.c  */
-#line 191 "parse-gram.y"
+/* Line 797 of yacc.c  */
+#line 190 "parse-gram.y"
 	{ fprintf (stderr, "[%s]", (yyvaluep->uniqstr)); };
 
-/* Line 798 of yacc.c  */
-#line 1085 "parse-gram.c"
+/* Line 797 of yacc.c  */
+#line 1083 "parse-gram.c"
 	break;
       case 45: /* "\"char\"" */
 
-/* Line 798 of yacc.c  */
-#line 178 "parse-gram.y"
+/* Line 797 of yacc.c  */
+#line 177 "parse-gram.y"
 	{ fputs (char_name ((yyvaluep->character)), stderr); };
 
-/* Line 798 of yacc.c  */
-#line 1094 "parse-gram.c"
+/* Line 797 of yacc.c  */
+#line 1092 "parse-gram.c"
 	break;
       case 46: /* "\"epilogue\"" */
 
-/* Line 798 of yacc.c  */
-#line 186 "parse-gram.y"
+/* Line 797 of yacc.c  */
+#line 185 "parse-gram.y"
 	{ fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); };
 
-/* Line 798 of yacc.c  */
-#line 1103 "parse-gram.c"
+/* Line 797 of yacc.c  */
+#line 1101 "parse-gram.c"
 	break;
       case 48: /* "\"identifier\"" */
 
-/* Line 798 of yacc.c  */
-#line 190 "parse-gram.y"
+/* Line 797 of yacc.c  */
+#line 189 "parse-gram.y"
 	{ fputs ((yyvaluep->uniqstr), stderr); };
 
-/* Line 798 of yacc.c  */
-#line 1112 "parse-gram.c"
+/* Line 797 of yacc.c  */
+#line 1110 "parse-gram.c"
 	break;
       case 49: /* "\"identifier:\"" */
 
-/* Line 798 of yacc.c  */
-#line 192 "parse-gram.y"
+/* Line 797 of yacc.c  */
+#line 191 "parse-gram.y"
 	{ fprintf (stderr, "%s:", (yyvaluep->uniqstr)); };
 
-/* Line 798 of yacc.c  */
-#line 1121 "parse-gram.c"
+/* Line 797 of yacc.c  */
+#line 1119 "parse-gram.c"
 	break;
       case 52: /* "\"%{...%}\"" */
 
-/* Line 798 of yacc.c  */
-#line 186 "parse-gram.y"
+/* Line 797 of yacc.c  */
+#line 185 "parse-gram.y"
 	{ fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); };
 
-/* Line 798 of yacc.c  */
-#line 1130 "parse-gram.c"
+/* Line 797 of yacc.c  */
+#line 1128 "parse-gram.c"
 	break;
       case 54: /* "\"type\"" */
 
-/* Line 798 of yacc.c  */
-#line 193 "parse-gram.y"
+/* Line 797 of yacc.c  */
+#line 192 "parse-gram.y"
 	{ fprintf (stderr, "<%s>", (yyvaluep->uniqstr)); };
 
-/* Line 798 of yacc.c  */
-#line 1139 "parse-gram.c"
+/* Line 797 of yacc.c  */
+#line 1137 "parse-gram.c"
 	break;
       case 71: /* "symbol.prec" */
 
-/* Line 798 of yacc.c  */
-#line 199 "parse-gram.y"
+/* Line 797 of yacc.c  */
+#line 198 "parse-gram.y"
 	{ fprintf (stderr, "%s", (yyvaluep->symbol)->tag); };
 
-/* Line 798 of yacc.c  */
-#line 1148 "parse-gram.c"
+/* Line 797 of yacc.c  */
+#line 1146 "parse-gram.c"
 	break;
       case 84: /* "variable" */
 
-/* Line 798 of yacc.c  */
-#line 190 "parse-gram.y"
+/* Line 797 of yacc.c  */
+#line 189 "parse-gram.y"
 	{ fputs ((yyvaluep->uniqstr), stderr); };
 
-/* Line 798 of yacc.c  */
-#line 1157 "parse-gram.c"
+/* Line 797 of yacc.c  */
+#line 1155 "parse-gram.c"
 	break;
       case 85: /* "content.opt" */
 
-/* Line 798 of yacc.c  */
-#line 186 "parse-gram.y"
+/* Line 797 of yacc.c  */
+#line 185 "parse-gram.y"
 	{ fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); };
 
-/* Line 798 of yacc.c  */
-#line 1166 "parse-gram.c"
+/* Line 797 of yacc.c  */
+#line 1164 "parse-gram.c"
 	break;
       case 86: /* "braceless" */
 
-/* Line 798 of yacc.c  */
-#line 186 "parse-gram.y"
+/* Line 797 of yacc.c  */
+#line 185 "parse-gram.y"
 	{ fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); };
 
-/* Line 798 of yacc.c  */
-#line 1175 "parse-gram.c"
+/* Line 797 of yacc.c  */
+#line 1173 "parse-gram.c"
 	break;
       case 87: /* "id" */
 
-/* Line 798 of yacc.c  */
-#line 199 "parse-gram.y"
+/* Line 797 of yacc.c  */
+#line 198 "parse-gram.y"
 	{ fprintf (stderr, "%s", (yyvaluep->symbol)->tag); };
 
-/* Line 798 of yacc.c  */
-#line 1184 "parse-gram.c"
+/* Line 797 of yacc.c  */
+#line 1182 "parse-gram.c"
 	break;
       case 88: /* "id_colon" */
 
-/* Line 798 of yacc.c  */
-#line 200 "parse-gram.y"
+/* Line 797 of yacc.c  */
+#line 199 "parse-gram.y"
 	{ fprintf (stderr, "%s:", (yyvaluep->symbol)->tag); };
 
-/* Line 798 of yacc.c  */
-#line 1193 "parse-gram.c"
+/* Line 797 of yacc.c  */
+#line 1191 "parse-gram.c"
 	break;
       case 89: /* "symbol" */
 
-/* Line 798 of yacc.c  */
-#line 199 "parse-gram.y"
+/* Line 797 of yacc.c  */
+#line 198 "parse-gram.y"
 	{ fprintf (stderr, "%s", (yyvaluep->symbol)->tag); };
 
-/* Line 798 of yacc.c  */
-#line 1202 "parse-gram.c"
+/* Line 797 of yacc.c  */
+#line 1200 "parse-gram.c"
 	break;
       case 90: /* "string_as_id" */
 
-/* Line 798 of yacc.c  */
-#line 199 "parse-gram.y"
+/* Line 797 of yacc.c  */
+#line 198 "parse-gram.y"
 	{ fprintf (stderr, "%s", (yyvaluep->symbol)->tag); };
 
-/* Line 798 of yacc.c  */
-#line 1211 "parse-gram.c"
+/* Line 797 of yacc.c  */
+#line 1209 "parse-gram.c"
 	break;
       default:
 	break;
@@ -1734,8 +1732,8 @@ YYLTYPE yylloc;
 
 /* User initialization code.  */
 
-/* Line 1281 of yacc.c  */
-#line 86 "parse-gram.y"
+/* Line 1280 of yacc.c  */
+#line 85 "parse-gram.y"
 {
   /* Bison's grammar can initial empty locations, hence a default
      location is needed. */
@@ -1743,8 +1741,8 @@ YYLTYPE yylloc;
   boundary_set (&yylloc.end, current_file, 1, 1);
 }
 
-/* Line 1281 of yacc.c  */
-#line 1748 "parse-gram.c"
+/* Line 1280 of yacc.c  */
+#line 1746 "parse-gram.c"
   yylsp[0] = yylloc;
 
   goto yysetstate;
@@ -1931,8 +1929,8 @@ yyreduce:
     {
         case 6:
 
-/* Line 1494 of yacc.c  */
-#line 225 "parse-gram.y"
+/* Line 1493 of yacc.c  */
+#line 224 "parse-gram.y"
     {
       code_props plain_code;
       code_props_plain_init (&plain_code, (yyvsp[(1) - (1)].chars), (yylsp[(1) - (1)]));
@@ -1946,15 +1944,15 @@ yyreduce:
 
   case 7:
 
-/* Line 1494 of yacc.c  */
-#line 234 "parse-gram.y"
+/* Line 1493 of yacc.c  */
+#line 233 "parse-gram.y"
     { debug_flag = true; }
     break;
 
   case 8:
 
-/* Line 1494 of yacc.c  */
-#line 236 "parse-gram.y"
+/* Line 1493 of yacc.c  */
+#line 235 "parse-gram.y"
     {
       muscle_percent_define_insert ((yyvsp[(2) - (3)].uniqstr), (yylsp[(2) - (3)]), (yyvsp[(3) - (3)].chars),
                                     MUSCLE_PERCENT_DEFINE_GRAMMAR_FILE);
@@ -1963,15 +1961,15 @@ yyreduce:
 
   case 9:
 
-/* Line 1494 of yacc.c  */
-#line 240 "parse-gram.y"
+/* Line 1493 of yacc.c  */
+#line 239 "parse-gram.y"
     { defines_flag = true; }
     break;
 
   case 10:
 
-/* Line 1494 of yacc.c  */
-#line 242 "parse-gram.y"
+/* Line 1493 of yacc.c  */
+#line 241 "parse-gram.y"
     {
       defines_flag = true;
       spec_defines_file = xstrdup ((yyvsp[(2) - (2)].chars));
@@ -1980,43 +1978,43 @@ yyreduce:
 
   case 11:
 
-/* Line 1494 of yacc.c  */
-#line 246 "parse-gram.y"
+/* Line 1493 of yacc.c  */
+#line 245 "parse-gram.y"
     { error_verbose = true; }
     break;
 
   case 12:
 
-/* Line 1494 of yacc.c  */
-#line 247 "parse-gram.y"
+/* Line 1493 of yacc.c  */
+#line 246 "parse-gram.y"
     { expected_sr_conflicts = (yyvsp[(2) - (2)].integer); }
     break;
 
   case 13:
 
-/* Line 1494 of yacc.c  */
-#line 248 "parse-gram.y"
+/* Line 1493 of yacc.c  */
+#line 247 "parse-gram.y"
     { expected_rr_conflicts = (yyvsp[(2) - (2)].integer); }
     break;
 
   case 14:
 
-/* Line 1494 of yacc.c  */
-#line 249 "parse-gram.y"
+/* Line 1493 of yacc.c  */
+#line 248 "parse-gram.y"
     { spec_file_prefix = (yyvsp[(2) - (2)].chars); }
     break;
 
   case 15:
 
-/* Line 1494 of yacc.c  */
-#line 250 "parse-gram.y"
+/* Line 1493 of yacc.c  */
+#line 249 "parse-gram.y"
     { spec_file_prefix = (yyvsp[(3) - (3)].chars); }
     break;
 
   case 16:
 
-/* Line 1494 of yacc.c  */
-#line 252 "parse-gram.y"
+/* Line 1493 of yacc.c  */
+#line 251 "parse-gram.y"
     {
       nondeterministic_parser = true;
       glr_parser = true;
@@ -2025,8 +2023,8 @@ yyreduce:
 
   case 17:
 
-/* Line 1494 of yacc.c  */
-#line 257 "parse-gram.y"
+/* Line 1493 of yacc.c  */
+#line 256 "parse-gram.y"
     {
       code_props action;
       code_props_symbol_action_init (&action, (yyvsp[(2) - (2)].code), (yylsp[(2) - (2)]));
@@ -2039,78 +2037,78 @@ yyreduce:
 
   case 18:
 
-/* Line 1494 of yacc.c  */
-#line 265 "parse-gram.y"
+/* Line 1493 of yacc.c  */
+#line 264 "parse-gram.y"
     { language_argmatch ((yyvsp[(2) - (2)].chars), grammar_prio, (yylsp[(1) - (2)])); }
     break;
 
   case 19:
 
-/* Line 1494 of yacc.c  */
-#line 266 "parse-gram.y"
+/* Line 1493 of yacc.c  */
+#line 265 "parse-gram.y"
     { add_param ("lex_param", (yyvsp[(2) - (2)].code), (yylsp[(2) - (2)])); }
     break;
 
   case 20:
 
-/* Line 1494 of yacc.c  */
-#line 267 "parse-gram.y"
+/* Line 1493 of yacc.c  */
+#line 266 "parse-gram.y"
     { locations_flag = true; }
     break;
 
   case 21:
 
-/* Line 1494 of yacc.c  */
-#line 268 "parse-gram.y"
+/* Line 1493 of yacc.c  */
+#line 267 "parse-gram.y"
     { spec_name_prefix = (yyvsp[(2) - (2)].chars); }
     break;
 
   case 22:
 
-/* Line 1494 of yacc.c  */
-#line 269 "parse-gram.y"
+/* Line 1493 of yacc.c  */
+#line 268 "parse-gram.y"
     { spec_name_prefix = (yyvsp[(3) - (3)].chars); }
     break;
 
   case 23:
 
-/* Line 1494 of yacc.c  */
-#line 270 "parse-gram.y"
+/* Line 1493 of yacc.c  */
+#line 269 "parse-gram.y"
     { no_lines_flag = true; }
     break;
 
   case 24:
 
-/* Line 1494 of yacc.c  */
-#line 271 "parse-gram.y"
+/* Line 1493 of yacc.c  */
+#line 270 "parse-gram.y"
     { nondeterministic_parser = true; }
     break;
 
   case 25:
 
-/* Line 1494 of yacc.c  */
-#line 272 "parse-gram.y"
+/* Line 1493 of yacc.c  */
+#line 271 "parse-gram.y"
     { spec_outfile = (yyvsp[(2) - (2)].chars); }
     break;
 
   case 26:
 
-/* Line 1494 of yacc.c  */
-#line 273 "parse-gram.y"
+/* Line 1493 of yacc.c  */
+#line 272 "parse-gram.y"
     { spec_outfile = (yyvsp[(3) - (3)].chars); }
     break;
 
   case 27:
 
-/* Line 1494 of yacc.c  */
-#line 274 "parse-gram.y"
+/* Line 1493 of yacc.c  */
+#line 273 "parse-gram.y"
     { add_param ("parse_param", (yyvsp[(2) - (2)].code), (yylsp[(2) - (2)])); }
     break;
 
   case 28:
 
-/* Line 1494 of yacc.c  */
-#line 276 "parse-gram.y"
+/* Line 1493 of yacc.c  */
+#line 275 "parse-gram.y"
     {
       /* %pure-parser is deprecated in favor of `%define api.pure', so use
          `%define api.pure' in a backward-compatible manner here.  First, don't
@@ -2129,15 +2127,15 @@ yyreduce:
 
   case 29:
 
-/* Line 1494 of yacc.c  */
-#line 290 "parse-gram.y"
+/* Line 1493 of yacc.c  */
+#line 289 "parse-gram.y"
     { version_check (&(yylsp[(2) - (2)]), (yyvsp[(2) - (2)].chars)); }
     break;
 
   case 30:
 
-/* Line 1494 of yacc.c  */
-#line 292 "parse-gram.y"
+/* Line 1493 of yacc.c  */
+#line 291 "parse-gram.y"
     {
       char const *skeleton_user = (yyvsp[(2) - (2)].chars);
       if (strchr (skeleton_user, '/'))
@@ -2165,29 +2163,29 @@ yyreduce:
 
   case 31:
 
-/* Line 1494 of yacc.c  */
-#line 315 "parse-gram.y"
+/* Line 1493 of yacc.c  */
+#line 314 "parse-gram.y"
     { token_table_flag = true; }
     break;
 
   case 32:
 
-/* Line 1494 of yacc.c  */
-#line 316 "parse-gram.y"
+/* Line 1493 of yacc.c  */
+#line 315 "parse-gram.y"
     { report_flag |= report_states; }
     break;
 
   case 33:
 
-/* Line 1494 of yacc.c  */
-#line 317 "parse-gram.y"
+/* Line 1493 of yacc.c  */
+#line 316 "parse-gram.y"
     { yacc_flag = true; }
     break;
 
   case 37:
 
-/* Line 1494 of yacc.c  */
-#line 325 "parse-gram.y"
+/* Line 1493 of yacc.c  */
+#line 324 "parse-gram.y"
     {
       grammar_start_symbol_set ((yyvsp[(2) - (2)].symbol), (yylsp[(2) - (2)]));
     }
@@ -2195,8 +2193,8 @@ yyreduce:
 
   case 38:
 
-/* Line 1494 of yacc.c  */
-#line 329 "parse-gram.y"
+/* Line 1493 of yacc.c  */
+#line 328 "parse-gram.y"
     {
       symbol_list *list;
       for (list = (yyvsp[(3) - (3)].list); list; list = list->next)
@@ -2207,8 +2205,8 @@ yyreduce:
 
   case 39:
 
-/* Line 1494 of yacc.c  */
-#line 336 "parse-gram.y"
+/* Line 1493 of yacc.c  */
+#line 335 "parse-gram.y"
     {
       symbol_list *list;
       for (list = (yyvsp[(3) - (3)].list); list; list = list->next)
@@ -2219,8 +2217,8 @@ yyreduce:
 
   case 40:
 
-/* Line 1494 of yacc.c  */
-#line 343 "parse-gram.y"
+/* Line 1493 of yacc.c  */
+#line 342 "parse-gram.y"
     {
       default_prec = true;
     }
@@ -2228,8 +2226,8 @@ yyreduce:
 
   case 41:
 
-/* Line 1494 of yacc.c  */
-#line 347 "parse-gram.y"
+/* Line 1493 of yacc.c  */
+#line 346 "parse-gram.y"
     {
       default_prec = false;
     }
@@ -2237,8 +2235,8 @@ yyreduce:
 
   case 42:
 
-/* Line 1494 of yacc.c  */
-#line 351 "parse-gram.y"
+/* Line 1493 of yacc.c  */
+#line 350 "parse-gram.y"
     {
       /* Do not invoke muscle_percent_code_grow here since it invokes
          muscle_user_name_list_grow.  */
@@ -2249,8 +2247,8 @@ yyreduce:
 
   case 43:
 
-/* Line 1494 of yacc.c  */
-#line 358 "parse-gram.y"
+/* Line 1493 of yacc.c  */
+#line 357 "parse-gram.y"
     {
       muscle_percent_code_grow ((yyvsp[(2) - (3)].uniqstr), (yylsp[(2) - (3)]), (yyvsp[(3) - (3)].chars), (yylsp[(3) - (3)]));
       code_scanner_last_string_free ();
@@ -2259,22 +2257,22 @@ yyreduce:
 
   case 44:
 
-/* Line 1494 of yacc.c  */
-#line 372 "parse-gram.y"
+/* Line 1493 of yacc.c  */
+#line 371 "parse-gram.y"
     {}
     break;
 
   case 45:
 
-/* Line 1494 of yacc.c  */
-#line 373 "parse-gram.y"
+/* Line 1493 of yacc.c  */
+#line 372 "parse-gram.y"
     { muscle_code_grow ("union_name", (yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); }
     break;
 
   case 46:
 
-/* Line 1494 of yacc.c  */
-#line 378 "parse-gram.y"
+/* Line 1493 of yacc.c  */
+#line 377 "parse-gram.y"
     {
       union_seen = true;
       muscle_code_grow ("stype", (yyvsp[(3) - (3)].chars), (yylsp[(3) - (3)]));
@@ -2284,15 +2282,15 @@ yyreduce:
 
   case 47:
 
-/* Line 1494 of yacc.c  */
-#line 389 "parse-gram.y"
+/* Line 1493 of yacc.c  */
+#line 388 "parse-gram.y"
     { current_class = nterm_sym; }
     break;
 
   case 48:
 
-/* Line 1494 of yacc.c  */
-#line 390 "parse-gram.y"
+/* Line 1493 of yacc.c  */
+#line 389 "parse-gram.y"
     {
       current_class = unknown_sym;
       current_type = NULL;
@@ -2301,15 +2299,15 @@ yyreduce:
 
   case 49:
 
-/* Line 1494 of yacc.c  */
-#line 394 "parse-gram.y"
+/* Line 1493 of yacc.c  */
+#line 393 "parse-gram.y"
     { current_class = token_sym; }
     break;
 
   case 50:
 
-/* Line 1494 of yacc.c  */
-#line 395 "parse-gram.y"
+/* Line 1493 of yacc.c  */
+#line 394 "parse-gram.y"
     {
       current_class = unknown_sym;
       current_type = NULL;
@@ -2318,8 +2316,8 @@ yyreduce:
 
   case 51:
 
-/* Line 1494 of yacc.c  */
-#line 400 "parse-gram.y"
+/* Line 1493 of yacc.c  */
+#line 399 "parse-gram.y"
     {
       symbol_list *list;
       tag_seen = true;
@@ -2331,8 +2329,8 @@ yyreduce:
 
   case 52:
 
-/* Line 1494 of yacc.c  */
-#line 411 "parse-gram.y"
+/* Line 1493 of yacc.c  */
+#line 410 "parse-gram.y"
     {
       symbol_list *list;
       ++current_prec;
@@ -2348,127 +2346,127 @@ yyreduce:
 
   case 53:
 
-/* Line 1494 of yacc.c  */
-#line 425 "parse-gram.y"
+/* Line 1493 of yacc.c  */
+#line 424 "parse-gram.y"
     { (yyval.assoc) = left_assoc; }
     break;
 
   case 54:
 
-/* Line 1494 of yacc.c  */
-#line 426 "parse-gram.y"
+/* Line 1493 of yacc.c  */
+#line 425 "parse-gram.y"
     { (yyval.assoc) = right_assoc; }
     break;
 
   case 55:
 
-/* Line 1494 of yacc.c  */
-#line 427 "parse-gram.y"
+/* Line 1493 of yacc.c  */
+#line 426 "parse-gram.y"
     { (yyval.assoc) = non_assoc; }
     break;
 
   case 56:
 
-/* Line 1494 of yacc.c  */
-#line 431 "parse-gram.y"
+/* Line 1493 of yacc.c  */
+#line 430 "parse-gram.y"
     { current_type = NULL; }
     break;
 
   case 57:
 
-/* Line 1494 of yacc.c  */
-#line 432 "parse-gram.y"
+/* Line 1493 of yacc.c  */
+#line 431 "parse-gram.y"
     { current_type = (yyvsp[(1) - (1)].uniqstr); tag_seen = true; }
     break;
 
   case 58:
 
-/* Line 1494 of yacc.c  */
-#line 438 "parse-gram.y"
+/* Line 1493 of yacc.c  */
+#line 437 "parse-gram.y"
     { (yyval.list) = symbol_list_sym_new ((yyvsp[(1) - (1)].symbol), (yylsp[(1) - (1)])); }
     break;
 
   case 59:
 
-/* Line 1494 of yacc.c  */
-#line 440 "parse-gram.y"
+/* Line 1493 of yacc.c  */
+#line 439 "parse-gram.y"
     { (yyval.list) = symbol_list_prepend ((yyvsp[(1) - (2)].list), symbol_list_sym_new ((yyvsp[(2) - (2)].symbol), (yylsp[(2) - (2)]))); }
     break;
 
   case 60:
 
-/* Line 1494 of yacc.c  */
-#line 444 "parse-gram.y"
+/* Line 1493 of yacc.c  */
+#line 443 "parse-gram.y"
     { (yyval.symbol) = (yyvsp[(1) - (1)].symbol); }
     break;
 
   case 61:
 
-/* Line 1494 of yacc.c  */
-#line 445 "parse-gram.y"
+/* Line 1493 of yacc.c  */
+#line 444 "parse-gram.y"
     { (yyval.symbol) = (yyvsp[(1) - (2)].symbol); symbol_user_token_number_set ((yyvsp[(1) - (2)].symbol), (yyvsp[(2) - (2)].integer), (yylsp[(2) - (2)])); }
     break;
 
   case 62:
 
-/* Line 1494 of yacc.c  */
-#line 451 "parse-gram.y"
+/* Line 1493 of yacc.c  */
+#line 450 "parse-gram.y"
     { (yyval.list) = symbol_list_sym_new ((yyvsp[(1) - (1)].symbol), (yylsp[(1) - (1)])); }
     break;
 
   case 63:
 
-/* Line 1494 of yacc.c  */
-#line 453 "parse-gram.y"
+/* Line 1493 of yacc.c  */
+#line 452 "parse-gram.y"
     { (yyval.list) = symbol_list_prepend ((yyvsp[(1) - (2)].list), symbol_list_sym_new ((yyvsp[(2) - (2)].symbol), (yylsp[(2) - (2)]))); }
     break;
 
   case 64:
 
-/* Line 1494 of yacc.c  */
-#line 457 "parse-gram.y"
+/* Line 1493 of yacc.c  */
+#line 456 "parse-gram.y"
     { (yyval.list) = (yyvsp[(1) - (1)].list); }
     break;
 
   case 65:
 
-/* Line 1494 of yacc.c  */
-#line 458 "parse-gram.y"
+/* Line 1493 of yacc.c  */
+#line 457 "parse-gram.y"
     { (yyval.list) = symbol_list_prepend ((yyvsp[(1) - (2)].list), (yyvsp[(2) - (2)].list)); }
     break;
 
   case 66:
 
-/* Line 1494 of yacc.c  */
-#line 462 "parse-gram.y"
+/* Line 1493 of yacc.c  */
+#line 461 "parse-gram.y"
     { (yyval.list) = symbol_list_sym_new ((yyvsp[(1) - (1)].symbol), (yylsp[(1) - (1)])); }
     break;
 
   case 67:
 
-/* Line 1494 of yacc.c  */
-#line 463 "parse-gram.y"
+/* Line 1493 of yacc.c  */
+#line 462 "parse-gram.y"
     { (yyval.list) = symbol_list_type_new ((yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); }
     break;
 
   case 68:
 
-/* Line 1494 of yacc.c  */
-#line 464 "parse-gram.y"
+/* Line 1493 of yacc.c  */
+#line 463 "parse-gram.y"
     { (yyval.list) = symbol_list_default_tagged_new ((yylsp[(1) - (1)])); }
     break;
 
   case 69:
 
-/* Line 1494 of yacc.c  */
-#line 465 "parse-gram.y"
+/* Line 1493 of yacc.c  */
+#line 464 "parse-gram.y"
     { (yyval.list) = symbol_list_default_tagless_new ((yylsp[(1) - (1)])); }
     break;
 
   case 70:
 
-/* Line 1494 of yacc.c  */
-#line 471 "parse-gram.y"
+/* Line 1493 of yacc.c  */
+#line 470 "parse-gram.y"
     {
        current_type = (yyvsp[(1) - (1)].uniqstr);
        tag_seen = true;
@@ -2477,8 +2475,8 @@ yyreduce:
 
   case 71:
 
-/* Line 1494 of yacc.c  */
-#line 476 "parse-gram.y"
+/* Line 1493 of yacc.c  */
+#line 475 "parse-gram.y"
     {
        symbol_class_set ((yyvsp[(1) - (1)].symbol), current_class, (yylsp[(1) - (1)]), true);
        symbol_type_set ((yyvsp[(1) - (1)].symbol), current_type, (yylsp[(1) - (1)]));
@@ -2487,8 +2485,8 @@ yyreduce:
 
   case 72:
 
-/* Line 1494 of yacc.c  */
-#line 481 "parse-gram.y"
+/* Line 1493 of yacc.c  */
+#line 480 "parse-gram.y"
     {
       symbol_class_set ((yyvsp[(1) - (2)].symbol), current_class, (yylsp[(1) - (2)]), true);
       symbol_type_set ((yyvsp[(1) - (2)].symbol), current_type, (yylsp[(1) - (2)]));
@@ -2498,8 +2496,8 @@ yyreduce:
 
   case 73:
 
-/* Line 1494 of yacc.c  */
-#line 487 "parse-gram.y"
+/* Line 1493 of yacc.c  */
+#line 486 "parse-gram.y"
     {
       symbol_class_set ((yyvsp[(1) - (2)].symbol), current_class, (yylsp[(1) - (2)]), true);
       symbol_type_set ((yyvsp[(1) - (2)].symbol), current_type, (yylsp[(1) - (2)]));
@@ -2509,8 +2507,8 @@ yyreduce:
 
   case 74:
 
-/* Line 1494 of yacc.c  */
-#line 493 "parse-gram.y"
+/* Line 1493 of yacc.c  */
+#line 492 "parse-gram.y"
     {
       symbol_class_set ((yyvsp[(1) - (3)].symbol), current_class, (yylsp[(1) - (3)]), true);
       symbol_type_set ((yyvsp[(1) - (3)].symbol), current_type, (yylsp[(1) - (3)]));
@@ -2521,8 +2519,8 @@ yyreduce:
 
   case 81:
 
-/* Line 1494 of yacc.c  */
-#line 523 "parse-gram.y"
+/* Line 1493 of yacc.c  */
+#line 522 "parse-gram.y"
     {
       yyerrok;
     }
@@ -2530,108 +2528,108 @@ yyreduce:
 
   case 82:
 
-/* Line 1494 of yacc.c  */
-#line 529 "parse-gram.y"
+/* Line 1493 of yacc.c  */
+#line 528 "parse-gram.y"
     { current_lhs = (yyvsp[(1) - (2)].symbol); current_lhs_location = (yylsp[(1) - (2)]);
     current_lhs_named_ref = (yyvsp[(2) - (2)].named_ref); }
     break;
 
   case 84:
 
-/* Line 1494 of yacc.c  */
-#line 534 "parse-gram.y"
+/* Line 1493 of yacc.c  */
+#line 533 "parse-gram.y"
     { grammar_current_rule_end ((yylsp[(1) - (1)])); }
     break;
 
   case 85:
 
-/* Line 1494 of yacc.c  */
-#line 535 "parse-gram.y"
+/* Line 1493 of yacc.c  */
+#line 534 "parse-gram.y"
     { grammar_current_rule_end ((yylsp[(3) - (3)])); }
     break;
 
   case 87:
 
-/* Line 1494 of yacc.c  */
-#line 541 "parse-gram.y"
+/* Line 1493 of yacc.c  */
+#line 540 "parse-gram.y"
     { grammar_current_rule_begin (current_lhs, current_lhs_location,
 				  current_lhs_named_ref); }
     break;
 
   case 88:
 
-/* Line 1494 of yacc.c  */
-#line 544 "parse-gram.y"
+/* Line 1493 of yacc.c  */
+#line 543 "parse-gram.y"
     { grammar_current_rule_symbol_append ((yyvsp[(2) - (3)].symbol), (yylsp[(2) - (3)]), (yyvsp[(3) - (3)].named_ref)); }
     break;
 
   case 89:
 
-/* Line 1494 of yacc.c  */
-#line 546 "parse-gram.y"
+/* Line 1493 of yacc.c  */
+#line 545 "parse-gram.y"
     { grammar_current_rule_action_append ((yyvsp[(2) - (3)].code), (yylsp[(2) - (3)]), (yyvsp[(3) - (3)].named_ref)); }
     break;
 
   case 90:
 
-/* Line 1494 of yacc.c  */
-#line 548 "parse-gram.y"
+/* Line 1493 of yacc.c  */
+#line 547 "parse-gram.y"
     { grammar_current_rule_prec_set ((yyvsp[(3) - (3)].symbol), (yylsp[(3) - (3)])); }
     break;
 
   case 91:
 
-/* Line 1494 of yacc.c  */
-#line 550 "parse-gram.y"
+/* Line 1493 of yacc.c  */
+#line 549 "parse-gram.y"
     { grammar_current_rule_dprec_set ((yyvsp[(3) - (3)].integer), (yylsp[(3) - (3)])); }
     break;
 
   case 92:
 
-/* Line 1494 of yacc.c  */
-#line 552 "parse-gram.y"
+/* Line 1493 of yacc.c  */
+#line 551 "parse-gram.y"
     { grammar_current_rule_merge_set ((yyvsp[(3) - (3)].uniqstr), (yylsp[(3) - (3)])); }
     break;
 
   case 93:
 
-/* Line 1494 of yacc.c  */
-#line 556 "parse-gram.y"
+/* Line 1493 of yacc.c  */
+#line 555 "parse-gram.y"
     { (yyval.named_ref) = 0; }
     break;
 
   case 94:
 
-/* Line 1494 of yacc.c  */
-#line 558 "parse-gram.y"
+/* Line 1493 of yacc.c  */
+#line 557 "parse-gram.y"
     { (yyval.named_ref) = named_ref_new((yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); }
     break;
 
   case 96:
 
-/* Line 1494 of yacc.c  */
-#line 570 "parse-gram.y"
+/* Line 1493 of yacc.c  */
+#line 569 "parse-gram.y"
     { (yyval.uniqstr) = uniqstr_new ((yyvsp[(1) - (1)].chars)); }
     break;
 
   case 97:
 
-/* Line 1494 of yacc.c  */
-#line 575 "parse-gram.y"
+/* Line 1493 of yacc.c  */
+#line 574 "parse-gram.y"
     { (yyval.chars) = ""; }
     break;
 
   case 98:
 
-/* Line 1494 of yacc.c  */
-#line 576 "parse-gram.y"
+/* Line 1493 of yacc.c  */
+#line 575 "parse-gram.y"
     { (yyval.chars) = (yyvsp[(1) - (1)].uniqstr); }
     break;
 
   case 100:
 
-/* Line 1494 of yacc.c  */
-#line 587 "parse-gram.y"
+/* Line 1493 of yacc.c  */
+#line 586 "parse-gram.y"
     {
       code_props plain_code;
       (yyvsp[(1) - (1)].code)[strlen ((yyvsp[(1) - (1)].code)) - 1] = '\n';
@@ -2644,15 +2642,15 @@ yyreduce:
 
   case 101:
 
-/* Line 1494 of yacc.c  */
-#line 607 "parse-gram.y"
+/* Line 1493 of yacc.c  */
+#line 606 "parse-gram.y"
     { (yyval.symbol) = symbol_from_uniqstr ((yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); }
     break;
 
   case 102:
 
-/* Line 1494 of yacc.c  */
-#line 609 "parse-gram.y"
+/* Line 1493 of yacc.c  */
+#line 608 "parse-gram.y"
     {
       (yyval.symbol) = symbol_get (char_name ((yyvsp[(1) - (1)].character)), (yylsp[(1) - (1)]));
       symbol_class_set ((yyval.symbol), token_sym, (yylsp[(1) - (1)]), false);
@@ -2662,15 +2660,15 @@ yyreduce:
 
   case 103:
 
-/* Line 1494 of yacc.c  */
-#line 617 "parse-gram.y"
+/* Line 1493 of yacc.c  */
+#line 616 "parse-gram.y"
     { (yyval.symbol) = symbol_from_uniqstr ((yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); }
     break;
 
   case 106:
 
-/* Line 1494 of yacc.c  */
-#line 629 "parse-gram.y"
+/* Line 1493 of yacc.c  */
+#line 628 "parse-gram.y"
     {
       (yyval.symbol) = symbol_get (quotearg_style (c_quoting_style, (yyvsp[(1) - (1)].chars)), (yylsp[(1) - (1)]));
       symbol_class_set ((yyval.symbol), token_sym, (yylsp[(1) - (1)]), false);
@@ -2679,8 +2677,8 @@ yyreduce:
 
   case 108:
 
-/* Line 1494 of yacc.c  */
-#line 638 "parse-gram.y"
+/* Line 1493 of yacc.c  */
+#line 637 "parse-gram.y"
     {
       code_props plain_code;
       code_props_plain_init (&plain_code, (yyvsp[(2) - (2)].chars), (yylsp[(2) - (2)]));
@@ -2693,8 +2691,8 @@ yyreduce:
 
 
 
-/* Line 1494 of yacc.c  */
-#line 2698 "parse-gram.c"
+/* Line 1493 of yacc.c  */
+#line 2696 "parse-gram.c"
       default: break;
     }
   /* User semantic actions sometimes alter yychar, and that requires
@@ -2923,8 +2921,8 @@ yyreturn:
 
 
 
-/* Line 1725 of yacc.c  */
-#line 648 "parse-gram.y"
+/* Line 1724 of yacc.c  */
+#line 647 "parse-gram.y"
 
 
 
diff --git a/src/parse-gram.h b/src/parse-gram.h
index d307aa08..77a6c83b 100644
--- a/src/parse-gram.h
+++ b/src/parse-gram.h
@@ -1,9 +1,8 @@
-/* A Bison parser, made by GNU Bison 2.4.1.173-62efdd.  */
+/* A Bison parser, made by GNU Bison 2.4.1.184-510df.  */
 
 /* Skeleton interface for Bison's Yacc-like parsers in C
    
-      Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-   2007, 2008, 2009 Free Software Foundation, Inc.
+      Copyright (C) 1984, 1989-1990, 2000-2010 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
@@ -161,8 +160,8 @@
 typedef union YYSTYPE
 {
 
-/* Line 1726 of yacc.c  */
-#line 94 "parse-gram.y"
+/* Line 1725 of yacc.c  */
+#line 93 "parse-gram.y"
 
   symbol *symbol;
   symbol_list *list;
@@ -176,8 +175,8 @@ typedef union YYSTYPE
 
 
 
-/* Line 1726 of yacc.c  */
-#line 181 "parse-gram.h"
+/* Line 1725 of yacc.c  */
+#line 180 "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 f7843ecf..b7f7ad65 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 Free
-   Software Foundation, Inc.
+   Copyright (C) 2002-2010 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 d8becc54..0d68171b 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 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2009-2010 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 cb6f5ec1..0c99859b 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 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2009-2010 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 41cd19a0..14d2fd37 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 Free Software Foundation, Inc.
+   Copyright (C) 1984, 1986, 1989, 2000-2005, 2007, 2009-2010 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 19f05057..bada3663 100644
--- a/src/print.h
+++ b/src/print.h
@@ -1,5 +1,5 @@
 /* Print information on generated parser, for bison,
-   Copyright (C) 2000, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2009-2010 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 86877c35..b9bd8eee 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 Free
-   Software Foundation, Inc.
+   Copyright (C) 2001-2007, 2009-2010 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 a2288cd3..0b86c2db 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 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2006, 2009-2010 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 3f007541..03c5bae5 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 Free Software Foundation, Inc.
+   Copyright (C) 1984, 1986, 1989, 1992, 1998, 2000-2003, 2005-2007,
+   2009-2010 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 e5710052..5fb0ef5e 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 Free
-   Software Foundation, Inc.
+   Copyright (C) 2000-2003, 2005-2007, 2009-2010 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 67e72a36..733cd08c 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 Free Software Foundation, Inc.
+   Copyright (C) 1988-1989, 2000-2003, 2005-2010 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 2b6b8e58..b16ce256 100644
--- a/src/reduce.h
+++ b/src/reduce.h
@@ -1,6 +1,6 @@
 /* Grammar reduction for Bison.
 
-   Copyright (C) 2000, 2001, 2002, 2007, 2009 Free Software Foundation,
+   Copyright (C) 2000-2002, 2007, 2009-2010 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 32305221..c9b6331a 100644
--- a/src/relation.c
+++ b/src/relation.c
@@ -1,5 +1,6 @@
 /* Binary relations.
-   Copyright (C) 2002, 2004, 2005, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004-2005, 2009-2010 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 7af2ae83..1906db80 100644
--- a/src/relation.h
+++ b/src/relation.h
@@ -1,5 +1,5 @@
 /* Binary relations.
-   Copyright (C) 2002, 2004, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004, 2009-2010 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 c98a54ad..a2942a07 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 Free Software Foundation, Inc.
+   Copyright (C) 2006-2007, 2009-2010 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 e2eb76a7..31565ef2 100644
--- a/src/scan-code.l
+++ b/src/scan-code.l
@@ -1,6 +1,6 @@
 /* Bison Action Scanner                             -*- C -*-
 
-   Copyright (C) 2006, 2007, 2008-2009 Free Software Foundation, Inc.
+   Copyright (C) 2006-2010 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 decb545c..4fe819cb 100644
--- a/src/scan-gram.h
+++ b/src/scan-gram.h
@@ -1,6 +1,6 @@
 /* Bison Grammar Scanner
 
-   Copyright (C) 2006, 2007, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2006-2007, 2009-2010 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 f199ec38..f046ae43 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 Free
-   Software Foundation, Inc.
+   Copyright (C) 2002-2010 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 428c4d9d..bef1a335 100644
--- a/src/scan-skel.h
+++ b/src/scan-skel.h
@@ -1,6 +1,6 @@
 /* Scan Bison Skeletons.
 
-   Copyright (C) 2005, 2006, 2007, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2005-2007, 2009-2010 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 8b3c5933..90a52dda 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, 2009 Free
-   Software Foundation, Inc.
+   Copyright (C) 2001-2007, 2009-2010 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 b5cd6a32..aa80ebcd 100644
--- a/src/state.c
+++ b/src/state.c
@@ -1,7 +1,6 @@
 /* Type definitions for nondeterministic finite state machine for Bison.
 
-   Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2009 Free
-   Software Foundation, Inc.
+   Copyright (C) 2001-2007, 2009-2010 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 931b48f1..99e09c44 100644
--- a/src/state.h
+++ b/src/state.h
@@ -1,7 +1,7 @@
 /* Type definitions for nondeterministic finite state machine for Bison.
 
-   Copyright (C) 1984, 1989, 2000, 2001, 2002, 2003, 2004, 2007, 2009
-   Free Software Foundation, Inc.
+   Copyright (C) 1984, 1989, 2000-2004, 2007, 2009-2010 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 74cbe8b6..8546c96b 100644
--- a/src/symlist.c
+++ b/src/symlist.c
@@ -1,6 +1,6 @@
 /* Lists of symbols for Bison
 
-   Copyright (C) 2002, 2005, 2006, 2007, 2009 Free Software Foundation,
+   Copyright (C) 2002, 2005-2007, 2009-2010 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 629bcd61..3d439e85 100644
--- a/src/symlist.h
+++ b/src/symlist.h
@@ -1,6 +1,6 @@
 /* Lists of symbols for Bison
 
-   Copyright (C) 2002, 2005, 2006, 2007, 2009 Free Software Foundation,
+   Copyright (C) 2002, 2005-2007, 2009-2010 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 fd1e481c..93badb99 100644
--- a/src/symtab.c
+++ b/src/symtab.c
@@ -1,8 +1,7 @@
 /* Symbol table manager for Bison.
 
-   Copyright (C) 1984, 1989, 2000, 2001, 2002, 2004, 2005, 2006, 2007,
-   2008, 2009
-   Free Software Foundation, Inc.
+   Copyright (C) 1984, 1989, 2000-2002, 2004-2010 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 feb78fb1..9fd92a16 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, 2009 Free Software Foundation, Inc.
+   Copyright (C) 1984, 1989, 1992, 2000-2002, 2004-2007, 2009-2010 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 8d2358c2..c5a685bc 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
-   Free Software Foundation, Inc.
+   Copyright (C) 2000-2007, 2009-2010 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 d1f7e7d9..01bccfc7 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 Free Software Foundation, Inc.
+   Copyright (C) 1984, 1986, 1989, 1992, 2000-2006, 2009-2010 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 02381e2c..a2d09867 100644
--- a/src/tables.h
+++ b/src/tables.h
@@ -1,5 +1,5 @@
 /* Prepare the LALR and GLR parser tables.
-   Copyright (C) 2002, 2004, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004, 2009-2010 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 ed8f79a7..f21d46f0 100644
--- a/src/uniqstr.c
+++ b/src/uniqstr.c
@@ -1,6 +1,6 @@
 /* Keep a unique copy of strings.
 
-   Copyright (C) 2002, 2003, 2004, 2005, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2002-2005, 2009-2010 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 2f9fce03..132f203f 100644
--- a/src/uniqstr.h
+++ b/src/uniqstr.h
@@ -1,6 +1,6 @@
 /* Keeping a unique copy of strings.
 
-   Copyright (C) 2002, 2003, 2008, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2002-2003, 2008-2010 Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/tests/Makefile.am b/tests/Makefile.am
index a4495208..b5d41cac 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -2,8 +2,7 @@
 
 ## Makefile for Bison testsuite.
 
-## Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
-## 2008-2009 Free Software Foundation, Inc.
+## Copyright (C) 2000-2010 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/actions.at b/tests/actions.at
index 4833a4fb..af0ac5b5 100644
--- a/tests/actions.at
+++ b/tests/actions.at
@@ -1,6 +1,5 @@
 # Executing Actions.                               -*- Autotest -*-
-# Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008-2009 Free
-# Software Foundation, Inc.
+# Copyright (C) 2001-2010 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 7277a597..d2c6f036 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 Free Software Foundation, Inc.
+# Copyright (C) 2000-2010 Free Software Foundation, Inc.
 
 # We need a C compiler.
 : ${CC='@CC@'}
diff --git a/tests/c++.at b/tests/c++.at
index 341e48ad..fa6ce9bd 100644
--- a/tests/c++.at
+++ b/tests/c++.at
@@ -1,5 +1,6 @@
 # Checking the output filenames.                    -*- Autotest -*-
-# Copyright (C) 2004, 2005, 2007, 2009 Free Software Foundation, Inc.
+# Copyright (C) 2004-2005, 2007, 2009-2010 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 d085e826..d28b04a9 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 Free Software Foundation, Inc.
+# Copyright (C) 2000-2010 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 18877296..09a7e11d 100644
--- a/tests/conflicts.at
+++ b/tests/conflicts.at
@@ -1,7 +1,7 @@
 # Exercising Bison on conflicts.                         -*- Autotest -*-
 
-# Copyright (C) 2002, 2003, 2004, 2005, 2007, 2009 Free Software
-# Foundation, Inc.
+# Copyright (C) 2002-2005, 2007, 2009-2010 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 9daaa44e..9feb42b8 100644
--- a/tests/cxx-type.at
+++ b/tests/cxx-type.at
@@ -1,6 +1,5 @@
 # Checking GLR Parsing.                         -*- Autotest -*-
-# Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008-2009 Free
-# Software Foundation, Inc.
+# Copyright (C) 2002-2010 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 ba06626b..f0af11a4 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 Free Software Foundation, Inc.
+# Copyright (C) 1989-1992, 2000-2005, 2007, 2009-2010 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 e5d68374..dd24eb01 100644
--- a/tests/glr-regression.at
+++ b/tests/glr-regression.at
@@ -1,5 +1,5 @@
 # Checking GLR Parsing: Regression Tests           -*- Autotest -*-
-# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2009 Free Software
+# Copyright (C) 2002-2003, 2005-2007, 2009-2010 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 66a606c7..02e517ab 100644
--- a/tests/headers.at
+++ b/tests/headers.at
@@ -1,6 +1,6 @@
 # Bison Parser Headers.                               -*- Autotest -*-
-# Copyright (C) 2001, 2002, 2006, 2007, 2009 Free Software Foundation,
-# Inc.
+# Copyright (C) 2001-2002, 2006-2007, 2009-2010 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/input.at b/tests/input.at
index 27f12f2e..fb537cee 100644
--- a/tests/input.at
+++ b/tests/input.at
@@ -1,6 +1,5 @@
 # Checking the Bison scanner.                    -*- Autotest -*-
-# Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
-# Free Software Foundation, Inc.
+# Copyright (C) 2002-2010 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 ac6564f7..db0be29f 100644
--- a/tests/java.at
+++ b/tests/java.at
@@ -1,6 +1,6 @@
 # Java tests for simple calculator.           -*- Autotest -*-
 
-# Copyright (C) 2007, 2008, 2009 Free Software Foundation, Inc.
+# Copyright (C) 2007-2010 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 c71b12da..8cd21cee 100644
--- a/tests/local.at
+++ b/tests/local.at
@@ -1,8 +1,7 @@
 # Process this -*- Autotest -*- file with autom4te.
 
 # Macros for the GNU Bison Test suite.
-# Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software
-# Foundation, Inc.
+# Copyright (C) 2003-2010 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 085c2478..0da8b6d8 100644
--- a/tests/named-refs.at
+++ b/tests/named-refs.at
@@ -1,6 +1,6 @@
 # Named references test.                           -*- Autotest -*-
 
-# Copyright (C) 2009 Free Software Foundation, Inc.
+# Copyright (C) 2009-2010 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 e8f863d0..f8e16532 100644
--- a/tests/output.at
+++ b/tests/output.at
@@ -1,6 +1,5 @@
 # Checking the output filenames.                    -*- Autotest -*-
-# Copyright (C) 2000, 2001, 2002, 2005, 2006, 2007, 2008, 2009 Free
-# Software Foundation, Inc.
+# Copyright (C) 2000-2002, 2005-2010 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 741b3624..587c4164 100644
--- a/tests/push.at
+++ b/tests/push.at
@@ -1,5 +1,5 @@
 # Checking Push Parsing.                            -*- Autotest -*-
-# Copyright (C) 2007, 2009 Free Software Foundation, Inc.
+# Copyright (C) 2007, 2009-2010 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 e1e33678..2a594539 100644
--- a/tests/reduce.at
+++ b/tests/reduce.at
@@ -1,6 +1,5 @@
 # Exercising Bison Grammar Reduction.                      -*- Autotest -*-
-# Copyright (C) 2001, 2002, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# Copyright (C) 2001-2002, 2007-2010 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 ea60f371..ca6ba1dd 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 Free Software
-# Foundation, Inc.
+# Copyright (C) 2001-2010 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 84070a6b..4c2a046b 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 Free Software Foundation,
-# Inc.
+# Copyright (C) 2001-2002, 2005, 2007, 2009-2010 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/skeletons.at b/tests/skeletons.at
index 60fc1176..f96d13e2 100644
--- a/tests/skeletons.at
+++ b/tests/skeletons.at
@@ -1,5 +1,5 @@
 # Checking skeleton support.                     -*- Autotest -*-
-# Copyright (C) 2007, 2009 Free Software Foundation, Inc.
+# Copyright (C) 2007, 2009-2010 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 8653b460..08b33c5f 100644
--- a/tests/synclines.at
+++ b/tests/synclines.at
@@ -1,6 +1,6 @@
 # Executing Actions.                               -*- Autotest -*-
-# Copyright (C) 2002, 2004, 2005, 2007, 2009 Free Software Foundation,
-# Inc.
+# Copyright (C) 2002, 2004-2005, 2007, 2009-2010 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/testsuite.at b/tests/testsuite.at
index 9af11f9f..4c2848d7 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 Free
-# Software Foundation, Inc.
+# Copyright (C) 2000-2004, 2006-2007, 2009-2010 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 47435cbc..33532377 100644
--- a/tests/torture.at
+++ b/tests/torture.at
@@ -1,5 +1,5 @@
 # Torturing Bison.                                    -*- Autotest -*-
-# Copyright (C) 2001, 2002, 2004, 2005, 2006, 2007, 2009 Free Software
+# Copyright (C) 2001-2002, 2004-2007, 2009-2010 Free Software
 # Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
-- 
2.50.0

