From: Joel E. Denny <jdenny@clemson.edu>
Date: Mon, 4 Jan 2010 18:38:09 +0000 (-0500)
Subject: maint: run "make update-copyright"
X-Git-Tag: v2.7.90~727
X-Git-Url: https://git.saurik.com/bison.git/commitdiff_plain/e141f4d4bb6584bfbf13003047a2e48e9a6eab6a

maint: run "make update-copyright"
---

diff --git a/ChangeLog b/ChangeLog
index 5388e29c..7ad82da0 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.
@@ -25137,9 +25141,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 c507cc8e..e980b1c7 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 13b199e6..ae87c0af 100644
--- a/NEWS
+++ b/NEWS
@@ -1369,8 +1369,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 7f4c5148..d9221b0e 100644
--- a/TODO
+++ b/TODO
@@ -474,8 +474,7 @@ Here's a proposal for how a new implementation might look:
 
 -----
 
-Copyright (C) 2001, 2002, 2003, 2004, 2006, 2008-2009 Free Software
-Foundation, Inc.
+Copyright (C) 2001-2004, 2006, 2008-2010 Free Software Foundation, Inc.
 
 This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/bootstrap b/bootstrap
index 00ea4bc1..486d41f7 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 8e9fc296..d4de7bff 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/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 f7c84633..5a5df0f3 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 22b3375a..80c74511 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 5cd404d1..e7308be3 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 8c964e50..bb0f6d7f 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
@@ -158,7 +157,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.  */
 
@@ -2579,7 +2578,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 87e3eab1..4ebb3d1b 100644
--- a/data/glr.cc
+++ b/data/glr.cc
@@ -1,6 +1,5 @@
 # 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
@@ -215,7 +214,7 @@ m4_popdef([b4_parse_param])
 m4_divert_push(0)
 @output(b4_spec_defines_file@)@
 b4_copyright([Skeleton interface for Bison GLR parsers in C++],
-             [2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009])[
+             [2002-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 690d8858..d216c1b0 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 6174e824..b89a6df8 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
@@ -116,7 +115,7 @@ m4_popdef([b4_dollar_dollar])dnl
 
 
 m4_pushdef([b4_copyright_years],
-           [2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009])
+           [2002-2010])
 
 m4_define([b4_parser_class_name],
           [b4_percent_define_get([[parser_class_name]])])
diff --git a/data/lalr1.java b/data/lalr1.java
index 275b97f2..c156e5e7 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
@@ -33,7 +33,7 @@ b4_symbol_foreach([b4_symbol_no_destructor_assert])
 m4_divert_push(0)dnl
 @output(b4_parser_file_name@)@
 b4_copyright([Skeleton implementation for Bison LALR(1) parsers in Java],
-             [2007, 2008, 2009])
+             [2007-2010])
 
 b4_percent_define_ifdef([package], [package b4_percent_define_get([package]);
 ])[/* First part of user declarations.  */
diff --git a/data/local.mk b/data/local.mk
index 158b633e..1eb96060 100644
--- a/data/local.mk
+++ b/data/local.mk
@@ -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/location.cc b/data/location.cc
index 0f82340c..5cf96de7 100644
--- a/data/location.cc
+++ b/data/location.cc
@@ -1,7 +1,6 @@
 # C++ skeleton for Bison
 
-# Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
-# 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
@@ -17,7 +16,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 m4_pushdef([b4_copyright_years],
-           [2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009])
+           [2002-2010])
 
 # We do want M4 expansion after # for CPP macros.
 m4_changecom()
diff --git a/data/stack.hh b/data/stack.hh
index e8ea9e45..b97674c0 100644
--- a/data/stack.hh
+++ b/data/stack.hh
@@ -1,7 +1,6 @@
 # C++ skeleton for Bison
 
-# Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008-2009 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
@@ -17,7 +16,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 m4_pushdef([b4_copyright_years],
-           [2002, 2003, 2004, 2005, 2006, 2007, 2008-2009])
+           [2002-2010])
 
 # We do want M4 expansion after # for CPP macros.
 m4_changecom()
diff --git a/data/variant.hh b/data/variant.hh
index 31af62b3..20279875 100644
--- a/data/variant.hh
+++ b/data/variant.hh
@@ -1,7 +1,6 @@
 # C++ skeleton for Bison
 
-# Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008-2009 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/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 462b8526..5780a295 100644
--- a/data/yacc.c
+++ b/data/yacc.c
@@ -1,12 +1,11 @@
                                                              -*- C -*-
 # 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.
 
 m4_pushdef([b4_copyright_years],
-           [1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-            2007, 2008, 2009])
+           [1984, 1989-1990, 2000-2010])
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/djgpp/Makefile.maint b/djgpp/Makefile.maint
index 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/local.mk b/djgpp/local.mk
index c4fe15ed..bff5c68a 100644
--- a/djgpp/local.mk
+++ b/djgpp/local.mk
@@ -1,4 +1,4 @@
-## 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/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/bison.texinfo b/doc/bison.texinfo
index ab2cd6c5..bac6ac54 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/local.mk b/doc/local.mk
index f0860848..f57c162d 100644
--- a/doc/local.mk
+++ b/doc/local.mk
@@ -1,5 +1,4 @@
-## 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/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/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 cfa055d3..0e80b461 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/etc/local.mk b/etc/local.mk
index bace0c32..2481d3cc 100644
--- a/etc/local.mk
+++ b/etc/local.mk
@@ -1,4 +1,4 @@
-## Copyright (C) 2006, 2008-2009 Free Software Foundation, Inc.
+## Copyright (C) 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/examples/calc++/Makefile.am b/examples/calc++/Makefile.am
index d99a7dc8..2abfea3b 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, 2008, 2009 Free Software Foundation, Inc.
+## Copyright (C) 2005-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/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/examples/local.mk b/examples/local.mk
index bcab1487..04db134c 100644
--- a/examples/local.mk
+++ b/examples/local.mk
@@ -1,4 +1,4 @@
-## Copyright (C) 2005, 2008-2009 Free Software Foundation, Inc.
+## Copyright (C) 2005, 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/local.mk b/lib/local.mk
index 70aea4b3..e9edefb2 100644
--- a/lib/local.mk
+++ b/lib/local.mk
@@ -1,7 +1,7 @@
 # Make bison/lib.
 
-# Copyright (C) 2001, 2002, 2003, 2004, 2006, 2008-2009 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/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 2f5778fc..fc582a6e 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, 2008-2009 Free Software Foundation, Inc.
+   Copyright (C) 1984, 1986, 1989, 2000-2002, 2004-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/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 1bd4ced4..d8cedc15 100644
--- a/src/assoc.c
+++ b/src/assoc.c
@@ -1,5 +1,5 @@
 /* Associativity information.
-   Copyright (C) 2002, 2005, 2006, 2008-2009 Free Software Foundation,
+   Copyright (C) 2002, 2005-2006, 2008-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 b83fcea0..f6b6c998 100644
--- a/src/assoc.h
+++ b/src/assoc.h
@@ -1,5 +1,5 @@
 /* Associativity information.
-   Copyright (C) 2002, 2006, 2008-2009 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2006, 2008-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 f11d8e3a..f21a627c 100644
--- a/src/conflicts.c
+++ b/src/conflicts.c
@@ -1,7 +1,7 @@
 /* Find and resolve or report lookahead conflicts for bison,
 
-   Copyright (C) 1984, 1989, 1992, 2000, 2001, 2002, 2003, 2004, 2005,
-   2006, 2007, 2008-2009 Free Software Foundation, Inc.
+   Copyright (C) 1984, 1989, 1992, 2000-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 bc8677f5..45679852 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 8c624d76..1edd5771 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 cca5d520..0c15ebb8 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 7dca7bdd..05628651 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/local.mk b/src/local.mk
index 753172b0..4d3c13e7 100644
--- a/src/local.mk
+++ b/src/local.mk
@@ -1,5 +1,4 @@
-## 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/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 455515b0..f1267a32 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 a1fd9210..73e64027 100644
--- a/src/muscle-tab.h
+++ b/src/muscle-tab.h
@@ -1,7 +1,6 @@
 /* Muscle table manager for Bison,
 
-   Copyright (C) 2001, 2002, 2003, 2006, 2007, 2008, 2009
-   Free Software Foundation, Inc.
+   Copyright (C) 2001-2003, 2006-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 562918c0..3c1da649 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 a572fbab..cb757d7f 100644
--- a/src/parse-gram.c
+++ b/src/parse-gram.c
@@ -1,9 +1,8 @@
-/* A Bison parser, made by GNU Bison 2.4.457-4395a.  */
+/* A Bison parser, made by GNU Bison 2.4.462-882b.  */
 
 /* 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.457-4395a"
+#define YYBISON_VERSION "2.4.462-882b"
 
 /* Skeleton name.  */
 #define YYSKELETON_NAME "yacc.c"
@@ -73,12 +72,11 @@
 #define yylloc          gram_lloc
 
 /* Copy the first part of user declarations.  */
-/* Line 253 of yacc.c  */
+/* Line 252 of yacc.c  */
 #line 1 "src/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.
 
@@ -128,8 +126,8 @@ static void gram_error (location const *, char const *);
 
 static char const *char_name (char);
 
-/* Line 253 of yacc.c  */
-#line 133 "src/parse-gram.c"
+/* Line 252 of yacc.c  */
+#line 131 "src/parse-gram.c"
 
 /* Enabling traces.  */
 #ifndef YYDEBUG
@@ -150,8 +148,8 @@ static char const *char_name (char);
 #endif
 
 /* "%code requires" blocks.  */
-/* Line 273 of yacc.c  */
-#line 202 "src/parse-gram.y"
+/* Line 272 of yacc.c  */
+#line 201 "src/parse-gram.y"
 
 # ifndef PARAM_TYPE
 #  define PARAM_TYPE
@@ -165,8 +163,8 @@ static char const *char_name (char);
 # endif
 
 
-/* Line 273 of yacc.c  */
-#line 170 "src/parse-gram.c"
+/* Line 272 of yacc.c  */
+#line 168 "src/parse-gram.c"
 
 /* Tokens.  */
 #ifndef YYTOKENTYPE
@@ -292,8 +290,8 @@ static char const *char_name (char);
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
 typedef union YYSTYPE
 {
-/* Line 278 of yacc.c  */
-#line 88 "src/parse-gram.y"
+/* Line 277 of yacc.c  */
+#line 87 "src/parse-gram.y"
 
   assoc assoc;
   char *code;
@@ -305,14 +303,14 @@ typedef union YYSTYPE
   uniqstr uniqstr;
   unsigned char character;
 
-/* Line 278 of yacc.c  */
-#line 226 "src/parse-gram.y"
+/* Line 277 of yacc.c  */
+#line 225 "src/parse-gram.y"
 
   param_type param;
 
 
-/* Line 278 of yacc.c  */
-#line 316 "src/parse-gram.c"
+/* Line 277 of yacc.c  */
+#line 314 "src/parse-gram.c"
 } YYSTYPE;
 # define YYSTYPE_IS_TRIVIAL 1
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
@@ -335,11 +333,11 @@ typedef struct YYLTYPE
 
 /* Copy the second part of user declarations.  */
 
-/* Line 328 of yacc.c  */
-#line 340 "src/parse-gram.c"
+/* Line 327 of yacc.c  */
+#line 338 "src/parse-gram.c"
 /* Unqualified %code blocks.  */
-/* Line 329 of yacc.c  */
-#line 56 "src/parse-gram.y"
+/* Line 328 of yacc.c  */
+#line 55 "src/parse-gram.y"
 
   static int current_prec = 0;
   static location current_lhs_location;
@@ -353,8 +351,8 @@ typedef struct YYLTYPE
   #define YYTYPE_UINT16 uint_fast16_t
   #define YYTYPE_UINT8 uint_fast8_t
 
-/* Line 329 of yacc.c  */
-#line 215 "src/parse-gram.y"
+/* Line 328 of yacc.c  */
+#line 214 "src/parse-gram.y"
 
   /** Add a lex-param and/or a parse-param.
    *
@@ -366,8 +364,8 @@ typedef struct YYLTYPE
   static param_type current_param = param_none;
 
 
-/* Line 329 of yacc.c  */
-#line 371 "src/parse-gram.c"
+/* Line 328 of yacc.c  */
+#line 369 "src/parse-gram.c"
 
 #ifdef short
 # undef short
@@ -645,17 +643,17 @@ static const yytype_uint8 yytranslate[] =
   /* YYRLINEYYN -- Source line where rule number YYN was defined.    */
 static const yytype_uint16 yyrline[] =
 {
-       0,   251,   251,   259,   261,   265,   266,   276,   280,   285,
-     286,   291,   296,   297,   298,   299,   300,   305,   314,   315,
-     316,   317,   318,   319,   320,   321,   321,   322,   323,   347,
-     348,   349,   350,   354,   355,   364,   365,   366,   370,   377,
-     384,   388,   392,   399,   414,   415,   419,   431,   431,   436,
-     436,   441,   452,   467,   468,   469,   470,   474,   475,   480,
-     482,   487,   488,   493,   495,   500,   501,   505,   506,   507,
-     508,   513,   518,   523,   529,   535,   546,   547,   556,   557,
-     563,   564,   565,   572,   572,   577,   578,   579,   584,   586,
-     588,   590,   592,   594,   599,   601,   612,   613,   618,   619,
-     620,   629,   649,   651,   660,   665,   666,   671,   678,   680
+       0,   250,   250,   258,   260,   264,   265,   275,   279,   284,
+     285,   290,   295,   296,   297,   298,   299,   304,   313,   314,
+     315,   316,   317,   318,   319,   320,   320,   321,   322,   346,
+     347,   348,   349,   353,   354,   363,   364,   365,   369,   376,
+     383,   387,   391,   398,   413,   414,   418,   430,   430,   435,
+     435,   440,   451,   466,   467,   468,   469,   473,   474,   479,
+     481,   486,   487,   492,   494,   499,   500,   504,   505,   506,
+     507,   512,   517,   522,   528,   534,   545,   546,   555,   556,
+     562,   563,   564,   571,   571,   576,   577,   578,   583,   585,
+     587,   589,   591,   593,   598,   600,   611,   612,   617,   618,
+     619,   628,   648,   650,   659,   664,   665,   670,   677,   679
 };
 #endif
 
@@ -1028,107 +1026,107 @@ yy_symbol_value_print (yyoutput, yytype, yyvaluep, yylocationp)
     {
             case 3: // "string"
 
-/* Line 730 of yacc.c  */
-#line 175 "src/parse-gram.y"
+/* Line 729 of yacc.c  */
+#line 174 "src/parse-gram.y"
         { fputs (quotearg_style (c_quoting_style, ((*yyvaluep).chars)), stderr); }
-/* Line 730 of yacc.c  */
-#line 1036 "src/parse-gram.c"
+/* Line 729 of yacc.c  */
+#line 1034 "src/parse-gram.c"
         break;
 
             case 4: // "integer"
 
-/* Line 730 of yacc.c  */
-#line 188 "src/parse-gram.y"
+/* Line 729 of yacc.c  */
+#line 187 "src/parse-gram.y"
         { fprintf (stderr, "%d", ((*yyvaluep).integer)); }
-/* Line 730 of yacc.c  */
-#line 1045 "src/parse-gram.c"
+/* Line 729 of yacc.c  */
+#line 1043 "src/parse-gram.c"
         break;
 
             case 24: // "%<flag>"
 
-/* Line 730 of yacc.c  */
-#line 184 "src/parse-gram.y"
+/* Line 729 of yacc.c  */
+#line 183 "src/parse-gram.y"
         { fprintf (stderr, "%%%s", ((*yyvaluep).uniqstr)); }
-/* Line 730 of yacc.c  */
-#line 1054 "src/parse-gram.c"
+/* Line 729 of yacc.c  */
+#line 1052 "src/parse-gram.c"
         break;
 
             case 40: // "{...}"
 
-/* Line 730 of yacc.c  */
-#line 177 "src/parse-gram.y"
+/* Line 729 of yacc.c  */
+#line 176 "src/parse-gram.y"
         { fprintf (stderr, "{\n%s\n}", ((*yyvaluep).code)); }
-/* Line 730 of yacc.c  */
-#line 1063 "src/parse-gram.c"
+/* Line 729 of yacc.c  */
+#line 1061 "src/parse-gram.c"
         break;
 
             case 41: // "[identifier]"
 
-/* Line 730 of yacc.c  */
-#line 182 "src/parse-gram.y"
+/* Line 729 of yacc.c  */
+#line 181 "src/parse-gram.y"
         { fprintf (stderr, "[%s]", ((*yyvaluep).uniqstr)); }
-/* Line 730 of yacc.c  */
-#line 1072 "src/parse-gram.c"
+/* Line 729 of yacc.c  */
+#line 1070 "src/parse-gram.c"
         break;
 
             case 42: // "char"
 
-/* Line 730 of yacc.c  */
-#line 169 "src/parse-gram.y"
+/* Line 729 of yacc.c  */
+#line 168 "src/parse-gram.y"
         { fputs (char_name (((*yyvaluep).character)), stderr); }
-/* Line 730 of yacc.c  */
-#line 1081 "src/parse-gram.c"
+/* Line 729 of yacc.c  */
+#line 1079 "src/parse-gram.c"
         break;
 
             case 43: // "epilogue"
 
-/* Line 730 of yacc.c  */
-#line 177 "src/parse-gram.y"
+/* Line 729 of yacc.c  */
+#line 176 "src/parse-gram.y"
         { fprintf (stderr, "{\n%s\n}", ((*yyvaluep).chars)); }
-/* Line 730 of yacc.c  */
-#line 1090 "src/parse-gram.c"
+/* Line 729 of yacc.c  */
+#line 1088 "src/parse-gram.c"
         break;
 
             case 45: // "identifier"
 
-/* Line 730 of yacc.c  */
-#line 181 "src/parse-gram.y"
+/* Line 729 of yacc.c  */
+#line 180 "src/parse-gram.y"
         { fputs (((*yyvaluep).uniqstr), stderr); }
-/* Line 730 of yacc.c  */
-#line 1099 "src/parse-gram.c"
+/* Line 729 of yacc.c  */
+#line 1097 "src/parse-gram.c"
         break;
 
             case 46: // "identifier:"
 
-/* Line 730 of yacc.c  */
-#line 183 "src/parse-gram.y"
+/* Line 729 of yacc.c  */
+#line 182 "src/parse-gram.y"
         { fprintf (stderr, "%s:", ((*yyvaluep).uniqstr)); }
-/* Line 730 of yacc.c  */
-#line 1108 "src/parse-gram.c"
+/* Line 729 of yacc.c  */
+#line 1106 "src/parse-gram.c"
         break;
 
             case 49: // "%{...%}"
 
-/* Line 730 of yacc.c  */
-#line 177 "src/parse-gram.y"
+/* Line 729 of yacc.c  */
+#line 176 "src/parse-gram.y"
         { fprintf (stderr, "{\n%s\n}", ((*yyvaluep).chars)); }
-/* Line 730 of yacc.c  */
-#line 1117 "src/parse-gram.c"
+/* Line 729 of yacc.c  */
+#line 1115 "src/parse-gram.c"
         break;
 
             case 51: // "<tag>"
 
-/* Line 730 of yacc.c  */
-#line 185 "src/parse-gram.y"
+/* Line 729 of yacc.c  */
+#line 184 "src/parse-gram.y"
         { fprintf (stderr, "<%s>", ((*yyvaluep).uniqstr)); }
-/* Line 730 of yacc.c  */
-#line 1126 "src/parse-gram.c"
+/* Line 729 of yacc.c  */
+#line 1124 "src/parse-gram.c"
         break;
 
             case 54: // "%param"
 
-/* Line 730 of yacc.c  */
-#line 231 "src/parse-gram.y"
+/* Line 729 of yacc.c  */
+#line 230 "src/parse-gram.y"
         {
   switch (((*yyvaluep).param))
     {
@@ -1141,80 +1139,80 @@ yy_symbol_value_print (yyoutput, yytype, yyvaluep, yylocationp)
       case param_none: aver (false); break;
     }
 }
-/* Line 730 of yacc.c  */
-#line 1146 "src/parse-gram.c"
+/* Line 729 of yacc.c  */
+#line 1144 "src/parse-gram.c"
         break;
 
             case 71: // symbol.prec
 
-/* Line 730 of yacc.c  */
-#line 191 "src/parse-gram.y"
+/* Line 729 of yacc.c  */
+#line 190 "src/parse-gram.y"
         { fprintf (stderr, "%s", ((*yyvaluep).symbol)->tag); }
-/* Line 730 of yacc.c  */
-#line 1155 "src/parse-gram.c"
+/* Line 729 of yacc.c  */
+#line 1153 "src/parse-gram.c"
         break;
 
             case 84: // variable
 
-/* Line 730 of yacc.c  */
-#line 181 "src/parse-gram.y"
+/* Line 729 of yacc.c  */
+#line 180 "src/parse-gram.y"
         { fputs (((*yyvaluep).uniqstr), stderr); }
-/* Line 730 of yacc.c  */
-#line 1164 "src/parse-gram.c"
+/* Line 729 of yacc.c  */
+#line 1162 "src/parse-gram.c"
         break;
 
             case 85: // content.opt
 
-/* Line 730 of yacc.c  */
-#line 177 "src/parse-gram.y"
+/* Line 729 of yacc.c  */
+#line 176 "src/parse-gram.y"
         { fprintf (stderr, "{\n%s\n}", ((*yyvaluep).chars)); }
-/* Line 730 of yacc.c  */
-#line 1173 "src/parse-gram.c"
+/* Line 729 of yacc.c  */
+#line 1171 "src/parse-gram.c"
         break;
 
             case 86: // braceless
 
-/* Line 730 of yacc.c  */
-#line 177 "src/parse-gram.y"
+/* Line 729 of yacc.c  */
+#line 176 "src/parse-gram.y"
         { fprintf (stderr, "{\n%s\n}", ((*yyvaluep).chars)); }
-/* Line 730 of yacc.c  */
-#line 1182 "src/parse-gram.c"
+/* Line 729 of yacc.c  */
+#line 1180 "src/parse-gram.c"
         break;
 
             case 87: // id
 
-/* Line 730 of yacc.c  */
-#line 191 "src/parse-gram.y"
+/* Line 729 of yacc.c  */
+#line 190 "src/parse-gram.y"
         { fprintf (stderr, "%s", ((*yyvaluep).symbol)->tag); }
-/* Line 730 of yacc.c  */
-#line 1191 "src/parse-gram.c"
+/* Line 729 of yacc.c  */
+#line 1189 "src/parse-gram.c"
         break;
 
             case 88: // id_colon
 
-/* Line 730 of yacc.c  */
-#line 192 "src/parse-gram.y"
+/* Line 729 of yacc.c  */
+#line 191 "src/parse-gram.y"
         { fprintf (stderr, "%s:", ((*yyvaluep).symbol)->tag); }
-/* Line 730 of yacc.c  */
-#line 1200 "src/parse-gram.c"
+/* Line 729 of yacc.c  */
+#line 1198 "src/parse-gram.c"
         break;
 
             case 89: // symbol
 
-/* Line 730 of yacc.c  */
-#line 191 "src/parse-gram.y"
+/* Line 729 of yacc.c  */
+#line 190 "src/parse-gram.y"
         { fprintf (stderr, "%s", ((*yyvaluep).symbol)->tag); }
-/* Line 730 of yacc.c  */
-#line 1209 "src/parse-gram.c"
+/* Line 729 of yacc.c  */
+#line 1207 "src/parse-gram.c"
         break;
 
             case 90: // string_as_id
 
-/* Line 730 of yacc.c  */
-#line 191 "src/parse-gram.y"
+/* Line 729 of yacc.c  */
+#line 190 "src/parse-gram.y"
         { fprintf (stderr, "%s", ((*yyvaluep).symbol)->tag); }
-/* Line 730 of yacc.c  */
-#line 1218 "src/parse-gram.c"
+/* Line 729 of yacc.c  */
+#line 1216 "src/parse-gram.c"
         break;
 
       default:
@@ -1744,16 +1742,16 @@ YYLTYPE yylloc;
 #endif
 
 /* User initialization code.  */
-/* Line 1215 of yacc.c  */
-#line 80 "src/parse-gram.y"
+/* Line 1214 of yacc.c  */
+#line 79 "src/parse-gram.y"
 {
   /* Bison's grammar can initial empty locations, hence a default
      location is needed. */
   boundary_set (&yylloc.start, current_file, 1, 1);
   boundary_set (&yylloc.end, current_file, 1, 1);
 }
-/* Line 1215 of yacc.c  */
-#line 1757 "src/parse-gram.c"
+/* Line 1214 of yacc.c  */
+#line 1755 "src/parse-gram.c"
   yylsp[0] = yylloc;
 
   goto yysetstate;
@@ -1939,8 +1937,8 @@ yyreduce:
   switch (yyn)
     {
         case 6:
-/* Line 1428 of yacc.c  */
-#line 267 "src/parse-gram.y"
+/* Line 1427 of yacc.c  */
+#line 266 "src/parse-gram.y"
     {
       code_props plain_code;
       code_props_plain_init (&plain_code, (yyvsp[0].chars), (yylsp[0]));
@@ -1950,107 +1948,107 @@ yyreduce:
                         plain_code.code, (yylsp[0]));
       code_scanner_last_string_free ();
     }
-/* Line 1428 of yacc.c  */
-#line 1955 "src/parse-gram.c"
+/* Line 1427 of yacc.c  */
+#line 1953 "src/parse-gram.c"
     break;
 
   case 7:
-/* Line 1428 of yacc.c  */
-#line 277 "src/parse-gram.y"
+/* Line 1427 of yacc.c  */
+#line 276 "src/parse-gram.y"
     {
       muscle_percent_define_ensure ((yyvsp[0].uniqstr), (yylsp[0]), true);
     }
-/* Line 1428 of yacc.c  */
-#line 1965 "src/parse-gram.c"
+/* Line 1427 of yacc.c  */
+#line 1963 "src/parse-gram.c"
     break;
 
   case 8:
-/* Line 1428 of yacc.c  */
-#line 281 "src/parse-gram.y"
+/* Line 1427 of yacc.c  */
+#line 280 "src/parse-gram.y"
     {
       muscle_percent_define_insert ((yyvsp[-1].uniqstr), (yylsp[-1]), (yyvsp[0].chars),
                                     MUSCLE_PERCENT_DEFINE_GRAMMAR_FILE);
     }
-/* Line 1428 of yacc.c  */
-#line 1976 "src/parse-gram.c"
+/* Line 1427 of yacc.c  */
+#line 1974 "src/parse-gram.c"
     break;
 
   case 9:
-/* Line 1428 of yacc.c  */
-#line 285 "src/parse-gram.y"
+/* Line 1427 of yacc.c  */
+#line 284 "src/parse-gram.y"
     { defines_flag = true; }
-/* Line 1428 of yacc.c  */
-#line 1984 "src/parse-gram.c"
+/* Line 1427 of yacc.c  */
+#line 1982 "src/parse-gram.c"
     break;
 
   case 10:
-/* Line 1428 of yacc.c  */
-#line 287 "src/parse-gram.y"
+/* Line 1427 of yacc.c  */
+#line 286 "src/parse-gram.y"
     {
       defines_flag = true;
       spec_defines_file = xstrdup ((yyvsp[0].chars));
     }
-/* Line 1428 of yacc.c  */
-#line 1995 "src/parse-gram.c"
+/* Line 1427 of yacc.c  */
+#line 1993 "src/parse-gram.c"
     break;
 
   case 11:
-/* Line 1428 of yacc.c  */
-#line 292 "src/parse-gram.y"
+/* Line 1427 of yacc.c  */
+#line 291 "src/parse-gram.y"
     {
       muscle_percent_define_insert ("parse.error", (yylsp[0]), "verbose",
                                     MUSCLE_PERCENT_DEFINE_GRAMMAR_FILE);
     }
-/* Line 1428 of yacc.c  */
-#line 2006 "src/parse-gram.c"
+/* Line 1427 of yacc.c  */
+#line 2004 "src/parse-gram.c"
     break;
 
   case 12:
-/* Line 1428 of yacc.c  */
-#line 296 "src/parse-gram.y"
+/* Line 1427 of yacc.c  */
+#line 295 "src/parse-gram.y"
     { expected_sr_conflicts = (yyvsp[0].integer); }
-/* Line 1428 of yacc.c  */
-#line 2014 "src/parse-gram.c"
+/* Line 1427 of yacc.c  */
+#line 2012 "src/parse-gram.c"
     break;
 
   case 13:
-/* Line 1428 of yacc.c  */
-#line 297 "src/parse-gram.y"
+/* Line 1427 of yacc.c  */
+#line 296 "src/parse-gram.y"
     { expected_rr_conflicts = (yyvsp[0].integer); }
-/* Line 1428 of yacc.c  */
-#line 2022 "src/parse-gram.c"
+/* Line 1427 of yacc.c  */
+#line 2020 "src/parse-gram.c"
     break;
 
   case 14:
-/* Line 1428 of yacc.c  */
-#line 298 "src/parse-gram.y"
+/* Line 1427 of yacc.c  */
+#line 297 "src/parse-gram.y"
     { spec_file_prefix = (yyvsp[0].chars); }
-/* Line 1428 of yacc.c  */
-#line 2030 "src/parse-gram.c"
+/* Line 1427 of yacc.c  */
+#line 2028 "src/parse-gram.c"
     break;
 
   case 15:
-/* Line 1428 of yacc.c  */
-#line 299 "src/parse-gram.y"
+/* Line 1427 of yacc.c  */
+#line 298 "src/parse-gram.y"
     { spec_file_prefix = (yyvsp[0].chars); }
-/* Line 1428 of yacc.c  */
-#line 2038 "src/parse-gram.c"
+/* Line 1427 of yacc.c  */
+#line 2036 "src/parse-gram.c"
     break;
 
   case 16:
-/* Line 1428 of yacc.c  */
-#line 301 "src/parse-gram.y"
+/* Line 1427 of yacc.c  */
+#line 300 "src/parse-gram.y"
     {
       nondeterministic_parser = true;
       glr_parser = true;
     }
-/* Line 1428 of yacc.c  */
-#line 2049 "src/parse-gram.c"
+/* Line 1427 of yacc.c  */
+#line 2047 "src/parse-gram.c"
     break;
 
   case 17:
-/* Line 1428 of yacc.c  */
-#line 306 "src/parse-gram.y"
+/* Line 1427 of yacc.c  */
+#line 305 "src/parse-gram.y"
     {
       code_props action;
       code_props_symbol_action_init (&action, (yyvsp[0].code), (yylsp[0]));
@@ -2059,93 +2057,93 @@ yyreduce:
       muscle_code_grow ("initial_action", action.code, (yylsp[0]));
       code_scanner_last_string_free ();
     }
-/* Line 1428 of yacc.c  */
-#line 2064 "src/parse-gram.c"
+/* Line 1427 of yacc.c  */
+#line 2062 "src/parse-gram.c"
     break;
 
   case 18:
-/* Line 1428 of yacc.c  */
-#line 314 "src/parse-gram.y"
+/* Line 1427 of yacc.c  */
+#line 313 "src/parse-gram.y"
     { language_argmatch ((yyvsp[0].chars), grammar_prio, (yylsp[-1])); }
-/* Line 1428 of yacc.c  */
-#line 2072 "src/parse-gram.c"
+/* Line 1427 of yacc.c  */
+#line 2070 "src/parse-gram.c"
     break;
 
   case 19:
-/* Line 1428 of yacc.c  */
-#line 315 "src/parse-gram.y"
+/* Line 1427 of yacc.c  */
+#line 314 "src/parse-gram.y"
     { spec_name_prefix = (yyvsp[0].chars); }
-/* Line 1428 of yacc.c  */
-#line 2080 "src/parse-gram.c"
+/* Line 1427 of yacc.c  */
+#line 2078 "src/parse-gram.c"
     break;
 
   case 20:
-/* Line 1428 of yacc.c  */
-#line 316 "src/parse-gram.y"
+/* Line 1427 of yacc.c  */
+#line 315 "src/parse-gram.y"
     { spec_name_prefix = (yyvsp[0].chars); }
-/* Line 1428 of yacc.c  */
-#line 2088 "src/parse-gram.c"
+/* Line 1427 of yacc.c  */
+#line 2086 "src/parse-gram.c"
     break;
 
   case 21:
-/* Line 1428 of yacc.c  */
-#line 317 "src/parse-gram.y"
+/* Line 1427 of yacc.c  */
+#line 316 "src/parse-gram.y"
     { no_lines_flag = true; }
-/* Line 1428 of yacc.c  */
-#line 2096 "src/parse-gram.c"
+/* Line 1427 of yacc.c  */
+#line 2094 "src/parse-gram.c"
     break;
 
   case 22:
-/* Line 1428 of yacc.c  */
-#line 318 "src/parse-gram.y"
+/* Line 1427 of yacc.c  */
+#line 317 "src/parse-gram.y"
     { nondeterministic_parser = true; }
-/* Line 1428 of yacc.c  */
-#line 2104 "src/parse-gram.c"
+/* Line 1427 of yacc.c  */
+#line 2102 "src/parse-gram.c"
     break;
 
   case 23:
-/* Line 1428 of yacc.c  */
-#line 319 "src/parse-gram.y"
+/* Line 1427 of yacc.c  */
+#line 318 "src/parse-gram.y"
     { spec_outfile = (yyvsp[0].chars); }
-/* Line 1428 of yacc.c  */
-#line 2112 "src/parse-gram.c"
+/* Line 1427 of yacc.c  */
+#line 2110 "src/parse-gram.c"
     break;
 
   case 24:
-/* Line 1428 of yacc.c  */
-#line 320 "src/parse-gram.y"
+/* Line 1427 of yacc.c  */
+#line 319 "src/parse-gram.y"
     { spec_outfile = (yyvsp[0].chars); }
-/* Line 1428 of yacc.c  */
-#line 2120 "src/parse-gram.c"
+/* Line 1427 of yacc.c  */
+#line 2118 "src/parse-gram.c"
     break;
 
   case 25:
-/* Line 1428 of yacc.c  */
-#line 321 "src/parse-gram.y"
+/* Line 1427 of yacc.c  */
+#line 320 "src/parse-gram.y"
     { current_param = (yyvsp[0].param); }
-/* Line 1428 of yacc.c  */
-#line 2128 "src/parse-gram.c"
+/* Line 1427 of yacc.c  */
+#line 2126 "src/parse-gram.c"
     break;
 
   case 26:
-/* Line 1428 of yacc.c  */
-#line 321 "src/parse-gram.y"
+/* Line 1427 of yacc.c  */
+#line 320 "src/parse-gram.y"
     { current_param = param_none; }
-/* Line 1428 of yacc.c  */
-#line 2136 "src/parse-gram.c"
+/* Line 1427 of yacc.c  */
+#line 2134 "src/parse-gram.c"
     break;
 
   case 27:
-/* Line 1428 of yacc.c  */
-#line 322 "src/parse-gram.y"
+/* Line 1427 of yacc.c  */
+#line 321 "src/parse-gram.y"
     { version_check (&(yylsp[0]), (yyvsp[0].chars)); }
-/* Line 1428 of yacc.c  */
-#line 2144 "src/parse-gram.c"
+/* Line 1427 of yacc.c  */
+#line 2142 "src/parse-gram.c"
     break;
 
   case 28:
-/* Line 1428 of yacc.c  */
-#line 324 "src/parse-gram.y"
+/* Line 1427 of yacc.c  */
+#line 323 "src/parse-gram.y"
     {
       char const *skeleton_user = (yyvsp[0].chars);
       if (strchr (skeleton_user, '/'))
@@ -2169,199 +2167,199 @@ yyreduce:
         }
       skeleton_arg (skeleton_user, grammar_prio, (yylsp[-1]));
     }
-/* Line 1428 of yacc.c  */
-#line 2174 "src/parse-gram.c"
+/* Line 1427 of yacc.c  */
+#line 2172 "src/parse-gram.c"
     break;
 
   case 29:
-/* Line 1428 of yacc.c  */
-#line 347 "src/parse-gram.y"
+/* Line 1427 of yacc.c  */
+#line 346 "src/parse-gram.y"
     { token_table_flag = true; }
-/* Line 1428 of yacc.c  */
-#line 2182 "src/parse-gram.c"
+/* Line 1427 of yacc.c  */
+#line 2180 "src/parse-gram.c"
     break;
 
   case 30:
-/* Line 1428 of yacc.c  */
-#line 348 "src/parse-gram.y"
+/* Line 1427 of yacc.c  */
+#line 347 "src/parse-gram.y"
     { report_flag |= report_states; }
-/* Line 1428 of yacc.c  */
-#line 2190 "src/parse-gram.c"
+/* Line 1427 of yacc.c  */
+#line 2188 "src/parse-gram.c"
     break;
 
   case 31:
-/* Line 1428 of yacc.c  */
-#line 349 "src/parse-gram.y"
+/* Line 1427 of yacc.c  */
+#line 348 "src/parse-gram.y"
     { yacc_flag = true; }
-/* Line 1428 of yacc.c  */
-#line 2198 "src/parse-gram.c"
+/* Line 1427 of yacc.c  */
+#line 2196 "src/parse-gram.c"
     break;
 
   case 33:
-/* Line 1428 of yacc.c  */
-#line 354 "src/parse-gram.y"
+/* Line 1427 of yacc.c  */
+#line 353 "src/parse-gram.y"
     { add_param (current_param, (yyvsp[0].code), (yylsp[0])); }
-/* Line 1428 of yacc.c  */
-#line 2206 "src/parse-gram.c"
+/* Line 1427 of yacc.c  */
+#line 2204 "src/parse-gram.c"
     break;
 
   case 34:
-/* Line 1428 of yacc.c  */
-#line 355 "src/parse-gram.y"
+/* Line 1427 of yacc.c  */
+#line 354 "src/parse-gram.y"
     { add_param (current_param, (yyvsp[0].code), (yylsp[0])); }
-/* Line 1428 of yacc.c  */
-#line 2214 "src/parse-gram.c"
+/* Line 1427 of yacc.c  */
+#line 2212 "src/parse-gram.c"
     break;
 
   case 37:
-/* Line 1428 of yacc.c  */
-#line 367 "src/parse-gram.y"
+/* Line 1427 of yacc.c  */
+#line 366 "src/parse-gram.y"
     {
       grammar_start_symbol_set ((yyvsp[0].symbol), (yylsp[0]));
     }
-/* Line 1428 of yacc.c  */
-#line 2224 "src/parse-gram.c"
+/* Line 1427 of yacc.c  */
+#line 2222 "src/parse-gram.c"
     break;
 
   case 38:
-/* Line 1428 of yacc.c  */
-#line 371 "src/parse-gram.y"
+/* Line 1427 of yacc.c  */
+#line 370 "src/parse-gram.y"
     {
       symbol_list *list;
       for (list = (yyvsp[0].list); list; list = list->next)
 	symbol_list_destructor_set (list, (yyvsp[-1].code), (yylsp[-1]));
       symbol_list_free ((yyvsp[0].list));
     }
-/* Line 1428 of yacc.c  */
-#line 2237 "src/parse-gram.c"
+/* Line 1427 of yacc.c  */
+#line 2235 "src/parse-gram.c"
     break;
 
   case 39:
-/* Line 1428 of yacc.c  */
-#line 378 "src/parse-gram.y"
+/* Line 1427 of yacc.c  */
+#line 377 "src/parse-gram.y"
     {
       symbol_list *list;
       for (list = (yyvsp[0].list); list; list = list->next)
 	symbol_list_printer_set (list, (yyvsp[-1].code), (yylsp[-1]));
       symbol_list_free ((yyvsp[0].list));
     }
-/* Line 1428 of yacc.c  */
-#line 2250 "src/parse-gram.c"
+/* Line 1427 of yacc.c  */
+#line 2248 "src/parse-gram.c"
     break;
 
   case 40:
-/* Line 1428 of yacc.c  */
-#line 385 "src/parse-gram.y"
+/* Line 1427 of yacc.c  */
+#line 384 "src/parse-gram.y"
     {
       default_prec = true;
     }
-/* Line 1428 of yacc.c  */
-#line 2260 "src/parse-gram.c"
+/* Line 1427 of yacc.c  */
+#line 2258 "src/parse-gram.c"
     break;
 
   case 41:
-/* Line 1428 of yacc.c  */
-#line 389 "src/parse-gram.y"
+/* Line 1427 of yacc.c  */
+#line 388 "src/parse-gram.y"
     {
       default_prec = false;
     }
-/* Line 1428 of yacc.c  */
-#line 2270 "src/parse-gram.c"
+/* Line 1427 of yacc.c  */
+#line 2268 "src/parse-gram.c"
     break;
 
   case 42:
-/* Line 1428 of yacc.c  */
-#line 393 "src/parse-gram.y"
+/* Line 1427 of yacc.c  */
+#line 392 "src/parse-gram.y"
     {
       /* Do not invoke muscle_percent_code_grow here since it invokes
          muscle_user_name_list_grow.  */
       muscle_code_grow ("percent_code()", (yyvsp[0].chars), (yylsp[0]));
       code_scanner_last_string_free ();
     }
-/* Line 1428 of yacc.c  */
-#line 2283 "src/parse-gram.c"
+/* Line 1427 of yacc.c  */
+#line 2281 "src/parse-gram.c"
     break;
 
   case 43:
-/* Line 1428 of yacc.c  */
-#line 400 "src/parse-gram.y"
+/* Line 1427 of yacc.c  */
+#line 399 "src/parse-gram.y"
     {
       muscle_percent_code_grow ((yyvsp[-1].uniqstr), (yylsp[-1]), (yyvsp[0].chars), (yylsp[0]));
       code_scanner_last_string_free ();
     }
-/* Line 1428 of yacc.c  */
-#line 2294 "src/parse-gram.c"
+/* Line 1427 of yacc.c  */
+#line 2292 "src/parse-gram.c"
     break;
 
   case 44:
-/* Line 1428 of yacc.c  */
-#line 414 "src/parse-gram.y"
+/* Line 1427 of yacc.c  */
+#line 413 "src/parse-gram.y"
     {}
-/* Line 1428 of yacc.c  */
-#line 2302 "src/parse-gram.c"
+/* Line 1427 of yacc.c  */
+#line 2300 "src/parse-gram.c"
     break;
 
   case 45:
-/* Line 1428 of yacc.c  */
-#line 415 "src/parse-gram.y"
+/* Line 1427 of yacc.c  */
+#line 414 "src/parse-gram.y"
     { muscle_code_grow ("union_name", (yyvsp[0].uniqstr), (yylsp[0])); }
-/* Line 1428 of yacc.c  */
-#line 2310 "src/parse-gram.c"
+/* Line 1427 of yacc.c  */
+#line 2308 "src/parse-gram.c"
     break;
 
   case 46:
-/* Line 1428 of yacc.c  */
-#line 420 "src/parse-gram.y"
+/* Line 1427 of yacc.c  */
+#line 419 "src/parse-gram.y"
     {
       union_seen = true;
       muscle_code_grow ("stype", (yyvsp[0].chars), (yylsp[0]));
       code_scanner_last_string_free ();
     }
-/* Line 1428 of yacc.c  */
-#line 2322 "src/parse-gram.c"
+/* Line 1427 of yacc.c  */
+#line 2320 "src/parse-gram.c"
     break;
 
   case 47:
-/* Line 1428 of yacc.c  */
-#line 431 "src/parse-gram.y"
+/* Line 1427 of yacc.c  */
+#line 430 "src/parse-gram.y"
     { current_class = nterm_sym; }
-/* Line 1428 of yacc.c  */
-#line 2330 "src/parse-gram.c"
+/* Line 1427 of yacc.c  */
+#line 2328 "src/parse-gram.c"
     break;
 
   case 48:
-/* Line 1428 of yacc.c  */
-#line 432 "src/parse-gram.y"
+/* Line 1427 of yacc.c  */
+#line 431 "src/parse-gram.y"
     {
       current_class = unknown_sym;
       current_type = NULL;
     }
-/* Line 1428 of yacc.c  */
-#line 2341 "src/parse-gram.c"
+/* Line 1427 of yacc.c  */
+#line 2339 "src/parse-gram.c"
     break;
 
   case 49:
-/* Line 1428 of yacc.c  */
-#line 436 "src/parse-gram.y"
+/* Line 1427 of yacc.c  */
+#line 435 "src/parse-gram.y"
     { current_class = token_sym; }
-/* Line 1428 of yacc.c  */
-#line 2349 "src/parse-gram.c"
+/* Line 1427 of yacc.c  */
+#line 2347 "src/parse-gram.c"
     break;
 
   case 50:
-/* Line 1428 of yacc.c  */
-#line 437 "src/parse-gram.y"
+/* Line 1427 of yacc.c  */
+#line 436 "src/parse-gram.y"
     {
       current_class = unknown_sym;
       current_type = NULL;
     }
-/* Line 1428 of yacc.c  */
-#line 2360 "src/parse-gram.c"
+/* Line 1427 of yacc.c  */
+#line 2358 "src/parse-gram.c"
     break;
 
   case 51:
-/* Line 1428 of yacc.c  */
-#line 442 "src/parse-gram.y"
+/* Line 1427 of yacc.c  */
+#line 441 "src/parse-gram.y"
     {
       symbol_list *list;
       tag_seen = true;
@@ -2369,13 +2367,13 @@ yyreduce:
 	symbol_type_set (list->content.sym, (yyvsp[-1].uniqstr), (yylsp[-1]));
       symbol_list_free ((yyvsp[0].list));
     }
-/* Line 1428 of yacc.c  */
-#line 2374 "src/parse-gram.c"
+/* Line 1427 of yacc.c  */
+#line 2372 "src/parse-gram.c"
     break;
 
   case 52:
-/* Line 1428 of yacc.c  */
-#line 453 "src/parse-gram.y"
+/* Line 1427 of yacc.c  */
+#line 452 "src/parse-gram.y"
     {
       symbol_list *list;
       ++current_prec;
@@ -2387,340 +2385,340 @@ yyreduce:
       symbol_list_free ((yyvsp[0].list));
       current_type = NULL;
     }
-/* Line 1428 of yacc.c  */
-#line 2392 "src/parse-gram.c"
+/* Line 1427 of yacc.c  */
+#line 2390 "src/parse-gram.c"
     break;
 
   case 53:
-/* Line 1428 of yacc.c  */
-#line 467 "src/parse-gram.y"
+/* Line 1427 of yacc.c  */
+#line 466 "src/parse-gram.y"
     { (yyval.assoc) = left_assoc; }
-/* Line 1428 of yacc.c  */
-#line 2400 "src/parse-gram.c"
+/* Line 1427 of yacc.c  */
+#line 2398 "src/parse-gram.c"
     break;
 
   case 54:
-/* Line 1428 of yacc.c  */
-#line 468 "src/parse-gram.y"
+/* Line 1427 of yacc.c  */
+#line 467 "src/parse-gram.y"
     { (yyval.assoc) = right_assoc; }
-/* Line 1428 of yacc.c  */
-#line 2408 "src/parse-gram.c"
+/* Line 1427 of yacc.c  */
+#line 2406 "src/parse-gram.c"
     break;
 
   case 55:
-/* Line 1428 of yacc.c  */
-#line 469 "src/parse-gram.y"
+/* Line 1427 of yacc.c  */
+#line 468 "src/parse-gram.y"
     { (yyval.assoc) = non_assoc; }
-/* Line 1428 of yacc.c  */
-#line 2416 "src/parse-gram.c"
+/* Line 1427 of yacc.c  */
+#line 2414 "src/parse-gram.c"
     break;
 
   case 56:
-/* Line 1428 of yacc.c  */
-#line 470 "src/parse-gram.y"
+/* Line 1427 of yacc.c  */
+#line 469 "src/parse-gram.y"
     { (yyval.assoc) = precedence_assoc; }
-/* Line 1428 of yacc.c  */
-#line 2424 "src/parse-gram.c"
+/* Line 1427 of yacc.c  */
+#line 2422 "src/parse-gram.c"
     break;
 
   case 57:
-/* Line 1428 of yacc.c  */
-#line 474 "src/parse-gram.y"
+/* Line 1427 of yacc.c  */
+#line 473 "src/parse-gram.y"
     { current_type = NULL; }
-/* Line 1428 of yacc.c  */
-#line 2432 "src/parse-gram.c"
+/* Line 1427 of yacc.c  */
+#line 2430 "src/parse-gram.c"
     break;
 
   case 58:
-/* Line 1428 of yacc.c  */
-#line 475 "src/parse-gram.y"
+/* Line 1427 of yacc.c  */
+#line 474 "src/parse-gram.y"
     { current_type = (yyvsp[0].uniqstr); tag_seen = true; }
-/* Line 1428 of yacc.c  */
-#line 2440 "src/parse-gram.c"
+/* Line 1427 of yacc.c  */
+#line 2438 "src/parse-gram.c"
     break;
 
   case 59:
-/* Line 1428 of yacc.c  */
-#line 481 "src/parse-gram.y"
+/* Line 1427 of yacc.c  */
+#line 480 "src/parse-gram.y"
     { (yyval.list) = symbol_list_sym_new ((yyvsp[0].symbol), (yylsp[0])); }
-/* Line 1428 of yacc.c  */
-#line 2448 "src/parse-gram.c"
+/* Line 1427 of yacc.c  */
+#line 2446 "src/parse-gram.c"
     break;
 
   case 60:
-/* Line 1428 of yacc.c  */
-#line 483 "src/parse-gram.y"
+/* Line 1427 of yacc.c  */
+#line 482 "src/parse-gram.y"
     { (yyval.list) = symbol_list_prepend ((yyvsp[-1].list), symbol_list_sym_new ((yyvsp[0].symbol), (yylsp[0]))); }
-/* Line 1428 of yacc.c  */
-#line 2456 "src/parse-gram.c"
+/* Line 1427 of yacc.c  */
+#line 2454 "src/parse-gram.c"
     break;
 
   case 61:
-/* Line 1428 of yacc.c  */
-#line 487 "src/parse-gram.y"
+/* Line 1427 of yacc.c  */
+#line 486 "src/parse-gram.y"
     { (yyval.symbol) = (yyvsp[0].symbol); }
-/* Line 1428 of yacc.c  */
-#line 2464 "src/parse-gram.c"
+/* Line 1427 of yacc.c  */
+#line 2462 "src/parse-gram.c"
     break;
 
   case 62:
-/* Line 1428 of yacc.c  */
-#line 488 "src/parse-gram.y"
+/* Line 1427 of yacc.c  */
+#line 487 "src/parse-gram.y"
     { (yyval.symbol) = (yyvsp[-1].symbol); symbol_user_token_number_set ((yyvsp[-1].symbol), (yyvsp[0].integer), (yylsp[0])); }
-/* Line 1428 of yacc.c  */
-#line 2472 "src/parse-gram.c"
+/* Line 1427 of yacc.c  */
+#line 2470 "src/parse-gram.c"
     break;
 
   case 63:
-/* Line 1428 of yacc.c  */
-#line 494 "src/parse-gram.y"
+/* Line 1427 of yacc.c  */
+#line 493 "src/parse-gram.y"
     { (yyval.list) = symbol_list_sym_new ((yyvsp[0].symbol), (yylsp[0])); }
-/* Line 1428 of yacc.c  */
-#line 2480 "src/parse-gram.c"
+/* Line 1427 of yacc.c  */
+#line 2478 "src/parse-gram.c"
     break;
 
   case 64:
-/* Line 1428 of yacc.c  */
-#line 496 "src/parse-gram.y"
+/* Line 1427 of yacc.c  */
+#line 495 "src/parse-gram.y"
     { (yyval.list) = symbol_list_prepend ((yyvsp[-1].list), symbol_list_sym_new ((yyvsp[0].symbol), (yylsp[0]))); }
-/* Line 1428 of yacc.c  */
-#line 2488 "src/parse-gram.c"
+/* Line 1427 of yacc.c  */
+#line 2486 "src/parse-gram.c"
     break;
 
   case 65:
-/* Line 1428 of yacc.c  */
-#line 500 "src/parse-gram.y"
+/* Line 1427 of yacc.c  */
+#line 499 "src/parse-gram.y"
     { (yyval.list) = (yyvsp[0].list); }
-/* Line 1428 of yacc.c  */
-#line 2496 "src/parse-gram.c"
+/* Line 1427 of yacc.c  */
+#line 2494 "src/parse-gram.c"
     break;
 
   case 66:
-/* Line 1428 of yacc.c  */
-#line 501 "src/parse-gram.y"
+/* Line 1427 of yacc.c  */
+#line 500 "src/parse-gram.y"
     { (yyval.list) = symbol_list_prepend ((yyvsp[-1].list), (yyvsp[0].list)); }
-/* Line 1428 of yacc.c  */
-#line 2504 "src/parse-gram.c"
+/* Line 1427 of yacc.c  */
+#line 2502 "src/parse-gram.c"
     break;
 
   case 67:
-/* Line 1428 of yacc.c  */
-#line 505 "src/parse-gram.y"
+/* Line 1427 of yacc.c  */
+#line 504 "src/parse-gram.y"
     { (yyval.list) = symbol_list_sym_new ((yyvsp[0].symbol), (yylsp[0])); }
-/* Line 1428 of yacc.c  */
-#line 2512 "src/parse-gram.c"
+/* Line 1427 of yacc.c  */
+#line 2510 "src/parse-gram.c"
     break;
 
   case 68:
-/* Line 1428 of yacc.c  */
-#line 506 "src/parse-gram.y"
+/* Line 1427 of yacc.c  */
+#line 505 "src/parse-gram.y"
     { (yyval.list) = symbol_list_type_new ((yyvsp[0].uniqstr), (yylsp[0])); }
-/* Line 1428 of yacc.c  */
-#line 2520 "src/parse-gram.c"
+/* Line 1427 of yacc.c  */
+#line 2518 "src/parse-gram.c"
     break;
 
   case 69:
-/* Line 1428 of yacc.c  */
-#line 507 "src/parse-gram.y"
+/* Line 1427 of yacc.c  */
+#line 506 "src/parse-gram.y"
     { (yyval.list) = symbol_list_default_tagged_new ((yylsp[0])); }
-/* Line 1428 of yacc.c  */
-#line 2528 "src/parse-gram.c"
+/* Line 1427 of yacc.c  */
+#line 2526 "src/parse-gram.c"
     break;
 
   case 70:
-/* Line 1428 of yacc.c  */
-#line 508 "src/parse-gram.y"
+/* Line 1427 of yacc.c  */
+#line 507 "src/parse-gram.y"
     { (yyval.list) = symbol_list_default_tagless_new ((yylsp[0])); }
-/* Line 1428 of yacc.c  */
-#line 2536 "src/parse-gram.c"
+/* Line 1427 of yacc.c  */
+#line 2534 "src/parse-gram.c"
     break;
 
   case 71:
-/* Line 1428 of yacc.c  */
-#line 514 "src/parse-gram.y"
+/* Line 1427 of yacc.c  */
+#line 513 "src/parse-gram.y"
     {
        current_type = (yyvsp[0].uniqstr);
        tag_seen = true;
      }
-/* Line 1428 of yacc.c  */
-#line 2547 "src/parse-gram.c"
+/* Line 1427 of yacc.c  */
+#line 2545 "src/parse-gram.c"
     break;
 
   case 72:
-/* Line 1428 of yacc.c  */
-#line 519 "src/parse-gram.y"
+/* Line 1427 of yacc.c  */
+#line 518 "src/parse-gram.y"
     {
        symbol_class_set ((yyvsp[0].symbol), current_class, (yylsp[0]), true);
        symbol_type_set ((yyvsp[0].symbol), current_type, (yylsp[0]));
      }
-/* Line 1428 of yacc.c  */
-#line 2558 "src/parse-gram.c"
+/* Line 1427 of yacc.c  */
+#line 2556 "src/parse-gram.c"
     break;
 
   case 73:
-/* Line 1428 of yacc.c  */
-#line 524 "src/parse-gram.y"
+/* Line 1427 of yacc.c  */
+#line 523 "src/parse-gram.y"
     {
       symbol_class_set ((yyvsp[-1].symbol), current_class, (yylsp[-1]), true);
       symbol_type_set ((yyvsp[-1].symbol), current_type, (yylsp[-1]));
       symbol_user_token_number_set ((yyvsp[-1].symbol), (yyvsp[0].integer), (yylsp[0]));
     }
-/* Line 1428 of yacc.c  */
-#line 2570 "src/parse-gram.c"
+/* Line 1427 of yacc.c  */
+#line 2568 "src/parse-gram.c"
     break;
 
   case 74:
-/* Line 1428 of yacc.c  */
-#line 530 "src/parse-gram.y"
+/* Line 1427 of yacc.c  */
+#line 529 "src/parse-gram.y"
     {
       symbol_class_set ((yyvsp[-1].symbol), current_class, (yylsp[-1]), true);
       symbol_type_set ((yyvsp[-1].symbol), current_type, (yylsp[-1]));
       symbol_make_alias ((yyvsp[-1].symbol), (yyvsp[0].symbol), (yyloc));
     }
-/* Line 1428 of yacc.c  */
-#line 2582 "src/parse-gram.c"
+/* Line 1427 of yacc.c  */
+#line 2580 "src/parse-gram.c"
     break;
 
   case 75:
-/* Line 1428 of yacc.c  */
-#line 536 "src/parse-gram.y"
+/* Line 1427 of yacc.c  */
+#line 535 "src/parse-gram.y"
     {
       symbol_class_set ((yyvsp[-2].symbol), current_class, (yylsp[-2]), true);
       symbol_type_set ((yyvsp[-2].symbol), current_type, (yylsp[-2]));
       symbol_user_token_number_set ((yyvsp[-2].symbol), (yyvsp[-1].integer), (yylsp[-1]));
       symbol_make_alias ((yyvsp[-2].symbol), (yyvsp[0].symbol), (yyloc));
     }
-/* Line 1428 of yacc.c  */
-#line 2595 "src/parse-gram.c"
+/* Line 1427 of yacc.c  */
+#line 2593 "src/parse-gram.c"
     break;
 
   case 82:
-/* Line 1428 of yacc.c  */
-#line 566 "src/parse-gram.y"
+/* Line 1427 of yacc.c  */
+#line 565 "src/parse-gram.y"
     {
       yyerrok;
     }
-/* Line 1428 of yacc.c  */
-#line 2605 "src/parse-gram.c"
+/* Line 1427 of yacc.c  */
+#line 2603 "src/parse-gram.c"
     break;
 
   case 83:
-/* Line 1428 of yacc.c  */
-#line 572 "src/parse-gram.y"
+/* Line 1427 of yacc.c  */
+#line 571 "src/parse-gram.y"
     { current_lhs = (yyvsp[-1].symbol); current_lhs_location = (yylsp[-1]);
     current_lhs_named_ref = (yyvsp[0].named_ref); }
-/* Line 1428 of yacc.c  */
-#line 2614 "src/parse-gram.c"
+/* Line 1427 of yacc.c  */
+#line 2612 "src/parse-gram.c"
     break;
 
   case 85:
-/* Line 1428 of yacc.c  */
-#line 577 "src/parse-gram.y"
+/* Line 1427 of yacc.c  */
+#line 576 "src/parse-gram.y"
     { grammar_current_rule_end ((yylsp[0])); }
-/* Line 1428 of yacc.c  */
-#line 2622 "src/parse-gram.c"
+/* Line 1427 of yacc.c  */
+#line 2620 "src/parse-gram.c"
     break;
 
   case 86:
-/* Line 1428 of yacc.c  */
-#line 578 "src/parse-gram.y"
+/* Line 1427 of yacc.c  */
+#line 577 "src/parse-gram.y"
     { grammar_current_rule_end ((yylsp[0])); }
-/* Line 1428 of yacc.c  */
-#line 2630 "src/parse-gram.c"
+/* Line 1427 of yacc.c  */
+#line 2628 "src/parse-gram.c"
     break;
 
   case 88:
-/* Line 1428 of yacc.c  */
-#line 584 "src/parse-gram.y"
+/* Line 1427 of yacc.c  */
+#line 583 "src/parse-gram.y"
     { grammar_current_rule_begin (current_lhs, current_lhs_location,
 				  current_lhs_named_ref); }
-/* Line 1428 of yacc.c  */
-#line 2639 "src/parse-gram.c"
+/* Line 1427 of yacc.c  */
+#line 2637 "src/parse-gram.c"
     break;
 
   case 89:
-/* Line 1428 of yacc.c  */
-#line 587 "src/parse-gram.y"
+/* Line 1427 of yacc.c  */
+#line 586 "src/parse-gram.y"
     { grammar_current_rule_symbol_append ((yyvsp[-1].symbol), (yylsp[-1]), (yyvsp[0].named_ref)); }
-/* Line 1428 of yacc.c  */
-#line 2647 "src/parse-gram.c"
+/* Line 1427 of yacc.c  */
+#line 2645 "src/parse-gram.c"
     break;
 
   case 90:
-/* Line 1428 of yacc.c  */
-#line 589 "src/parse-gram.y"
+/* Line 1427 of yacc.c  */
+#line 588 "src/parse-gram.y"
     { grammar_current_rule_action_append ((yyvsp[-1].code), (yylsp[-1]), (yyvsp[0].named_ref)); }
-/* Line 1428 of yacc.c  */
-#line 2655 "src/parse-gram.c"
+/* Line 1427 of yacc.c  */
+#line 2653 "src/parse-gram.c"
     break;
 
   case 91:
-/* Line 1428 of yacc.c  */
-#line 591 "src/parse-gram.y"
+/* Line 1427 of yacc.c  */
+#line 590 "src/parse-gram.y"
     { grammar_current_rule_prec_set ((yyvsp[0].symbol), (yylsp[0])); }
-/* Line 1428 of yacc.c  */
-#line 2663 "src/parse-gram.c"
+/* Line 1427 of yacc.c  */
+#line 2661 "src/parse-gram.c"
     break;
 
   case 92:
-/* Line 1428 of yacc.c  */
-#line 593 "src/parse-gram.y"
+/* Line 1427 of yacc.c  */
+#line 592 "src/parse-gram.y"
     { grammar_current_rule_dprec_set ((yyvsp[0].integer), (yylsp[0])); }
-/* Line 1428 of yacc.c  */
-#line 2671 "src/parse-gram.c"
+/* Line 1427 of yacc.c  */
+#line 2669 "src/parse-gram.c"
     break;
 
   case 93:
-/* Line 1428 of yacc.c  */
-#line 595 "src/parse-gram.y"
+/* Line 1427 of yacc.c  */
+#line 594 "src/parse-gram.y"
     { grammar_current_rule_merge_set ((yyvsp[0].uniqstr), (yylsp[0])); }
-/* Line 1428 of yacc.c  */
-#line 2679 "src/parse-gram.c"
+/* Line 1427 of yacc.c  */
+#line 2677 "src/parse-gram.c"
     break;
 
   case 94:
-/* Line 1428 of yacc.c  */
-#line 599 "src/parse-gram.y"
+/* Line 1427 of yacc.c  */
+#line 598 "src/parse-gram.y"
     { (yyval.named_ref) = 0; }
-/* Line 1428 of yacc.c  */
-#line 2687 "src/parse-gram.c"
+/* Line 1427 of yacc.c  */
+#line 2685 "src/parse-gram.c"
     break;
 
   case 95:
-/* Line 1428 of yacc.c  */
-#line 601 "src/parse-gram.y"
+/* Line 1427 of yacc.c  */
+#line 600 "src/parse-gram.y"
     { (yyval.named_ref) = named_ref_new((yyvsp[0].uniqstr), (yylsp[0])); }
-/* Line 1428 of yacc.c  */
-#line 2695 "src/parse-gram.c"
+/* Line 1427 of yacc.c  */
+#line 2693 "src/parse-gram.c"
     break;
 
   case 97:
-/* Line 1428 of yacc.c  */
-#line 613 "src/parse-gram.y"
+/* Line 1427 of yacc.c  */
+#line 612 "src/parse-gram.y"
     { (yyval.uniqstr) = uniqstr_new ((yyvsp[0].chars)); }
-/* Line 1428 of yacc.c  */
-#line 2703 "src/parse-gram.c"
+/* Line 1427 of yacc.c  */
+#line 2701 "src/parse-gram.c"
     break;
 
   case 98:
-/* Line 1428 of yacc.c  */
-#line 618 "src/parse-gram.y"
+/* Line 1427 of yacc.c  */
+#line 617 "src/parse-gram.y"
     { (yyval.chars) = ""; }
-/* Line 1428 of yacc.c  */
-#line 2711 "src/parse-gram.c"
+/* Line 1427 of yacc.c  */
+#line 2709 "src/parse-gram.c"
     break;
 
   case 99:
-/* Line 1428 of yacc.c  */
-#line 619 "src/parse-gram.y"
+/* Line 1427 of yacc.c  */
+#line 618 "src/parse-gram.y"
     { (yyval.chars) = (yyvsp[0].uniqstr); }
-/* Line 1428 of yacc.c  */
-#line 2719 "src/parse-gram.c"
+/* Line 1427 of yacc.c  */
+#line 2717 "src/parse-gram.c"
     break;
 
   case 101:
-/* Line 1428 of yacc.c  */
-#line 630 "src/parse-gram.y"
+/* Line 1427 of yacc.c  */
+#line 629 "src/parse-gram.y"
     {
       code_props plain_code;
       (yyvsp[0].code)[strlen ((yyvsp[0].code)) - 1] = '\n';
@@ -2729,52 +2727,52 @@ yyreduce:
       gram_scanner_last_string_free ();
       (yyval.chars) = plain_code.code;
     }
-/* Line 1428 of yacc.c  */
-#line 2734 "src/parse-gram.c"
+/* Line 1427 of yacc.c  */
+#line 2732 "src/parse-gram.c"
     break;
 
   case 102:
-/* Line 1428 of yacc.c  */
-#line 650 "src/parse-gram.y"
+/* Line 1427 of yacc.c  */
+#line 649 "src/parse-gram.y"
     { (yyval.symbol) = symbol_from_uniqstr ((yyvsp[0].uniqstr), (yylsp[0])); }
-/* Line 1428 of yacc.c  */
-#line 2742 "src/parse-gram.c"
+/* Line 1427 of yacc.c  */
+#line 2740 "src/parse-gram.c"
     break;
 
   case 103:
-/* Line 1428 of yacc.c  */
-#line 652 "src/parse-gram.y"
+/* Line 1427 of yacc.c  */
+#line 651 "src/parse-gram.y"
     {
       (yyval.symbol) = symbol_get (char_name ((yyvsp[0].character)), (yylsp[0]));
       symbol_class_set ((yyval.symbol), token_sym, (yylsp[0]), false);
       symbol_user_token_number_set ((yyval.symbol), (yyvsp[0].character), (yylsp[0]));
     }
-/* Line 1428 of yacc.c  */
-#line 2754 "src/parse-gram.c"
+/* Line 1427 of yacc.c  */
+#line 2752 "src/parse-gram.c"
     break;
 
   case 104:
-/* Line 1428 of yacc.c  */
-#line 660 "src/parse-gram.y"
+/* Line 1427 of yacc.c  */
+#line 659 "src/parse-gram.y"
     { (yyval.symbol) = symbol_from_uniqstr ((yyvsp[0].uniqstr), (yylsp[0])); }
-/* Line 1428 of yacc.c  */
-#line 2762 "src/parse-gram.c"
+/* Line 1427 of yacc.c  */
+#line 2760 "src/parse-gram.c"
     break;
 
   case 107:
-/* Line 1428 of yacc.c  */
-#line 672 "src/parse-gram.y"
+/* Line 1427 of yacc.c  */
+#line 671 "src/parse-gram.y"
     {
       (yyval.symbol) = symbol_get (quotearg_style (c_quoting_style, (yyvsp[0].chars)), (yylsp[0]));
       symbol_class_set ((yyval.symbol), token_sym, (yylsp[0]), false);
     }
-/* Line 1428 of yacc.c  */
-#line 2773 "src/parse-gram.c"
+/* Line 1427 of yacc.c  */
+#line 2771 "src/parse-gram.c"
     break;
 
   case 109:
-/* Line 1428 of yacc.c  */
-#line 681 "src/parse-gram.y"
+/* Line 1427 of yacc.c  */
+#line 680 "src/parse-gram.y"
     {
       code_props plain_code;
       code_props_plain_init (&plain_code, (yyvsp[0].chars), (yylsp[0]));
@@ -2783,13 +2781,13 @@ yyreduce:
       muscle_code_grow ("epilogue", plain_code.code, (yylsp[0]));
       code_scanner_last_string_free ();
     }
-/* Line 1428 of yacc.c  */
-#line 2788 "src/parse-gram.c"
+/* Line 1427 of yacc.c  */
+#line 2786 "src/parse-gram.c"
     break;
 
 
-/* Line 1428 of yacc.c  */
-#line 2793 "src/parse-gram.c"
+/* Line 1427 of yacc.c  */
+#line 2791 "src/parse-gram.c"
       default: break;
     }
   /* User semantic actions sometimes alter yychar, and that requires
@@ -3016,8 +3014,8 @@ yyreturn:
   return YYID (yyresult);
 }
 
-/* Line 1658 of yacc.c  */
-#line 691 "src/parse-gram.y"
+/* Line 1657 of yacc.c  */
+#line 690 "src/parse-gram.y"
 
 
 
diff --git a/src/parse-gram.h b/src/parse-gram.h
index 17f86cde..e334290e 100644
--- a/src/parse-gram.h
+++ b/src/parse-gram.h
@@ -1,9 +1,8 @@
-/* A Bison parser, made by GNU Bison 2.4.457-4395a.  */
+/* A Bison parser, made by GNU Bison 2.4.462-882b.  */
 
 /* 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
@@ -31,8 +30,8 @@
    This special exception was added by the Free Software Foundation in
    version 2.2 of Bison.  */
 /* "%code requires" blocks.  */
-/* Line 1659 of yacc.c  */
-#line 202 "src/parse-gram.y"
+/* Line 1658 of yacc.c  */
+#line 201 "src/parse-gram.y"
 
 # ifndef PARAM_TYPE
 #  define PARAM_TYPE
@@ -46,8 +45,8 @@
 # endif
 
 
-/* Line 1659 of yacc.c  */
-#line 51 "src/parse-gram.h"
+/* Line 1658 of yacc.c  */
+#line 50 "src/parse-gram.h"
 
 /* Tokens.  */
 #ifndef YYTOKENTYPE
@@ -173,8 +172,8 @@
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
 typedef union YYSTYPE
 {
-/* Line 1659 of yacc.c  */
-#line 88 "src/parse-gram.y"
+/* Line 1658 of yacc.c  */
+#line 87 "src/parse-gram.y"
 
   assoc assoc;
   char *code;
@@ -186,14 +185,14 @@ typedef union YYSTYPE
   uniqstr uniqstr;
   unsigned char character;
 
-/* Line 1659 of yacc.c  */
-#line 226 "src/parse-gram.y"
+/* Line 1658 of yacc.c  */
+#line 225 "src/parse-gram.y"
 
   param_type param;
 
 
-/* Line 1659 of yacc.c  */
-#line 197 "src/parse-gram.h"
+/* Line 1658 of yacc.c  */
+#line 196 "src/parse-gram.h"
 } YYSTYPE;
 # define YYSTYPE_IS_TRIVIAL 1
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
diff --git a/src/parse-gram.y b/src/parse-gram.y
index 4d48d7ad..663f1701 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 4f362f8c..d66fc38d 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 700488e8..f4bb13ba 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 aff07697..52762508 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 f342604b..6cf360a8 100644
--- a/src/scan-skel.l
+++ b/src/scan-skel.l
@@ -1,7 +1,6 @@
 /* Scan Bison Skeletons.                                       -*- C -*-
 
-   Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008-2009
-   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/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 ebdf04c1..54ab0569 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 6204d90d..d56e8f88 100644
--- a/src/symtab.h
+++ b/src/symtab.h
@@ -1,7 +1,7 @@
 /* Definitions for symtab.c and callers, part of Bison.
 
-   Copyright (C) 1984, 1989, 1992, 2000, 2001, 2002, 2004, 2005, 2006,
-   2007, 2008-2009 Free Software Foundation, Inc.
+   Copyright (C) 1984, 1989, 1992, 2000-2002, 2004-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/actions.at b/tests/actions.at
index 144791c5..33a9786a 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 6a8d2c5d..bcd98005 100644
--- a/tests/c++.at
+++ b/tests/c++.at
@@ -1,5 +1,5 @@
 # Checking the output filenames.                    -*- Autotest -*-
-# Copyright (C) 2004, 2005, 2007, 2008, 2009 Free Software Foundation, Inc.
+# Copyright (C) 2004-2005, 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/calc.at b/tests/calc.at
index 52051ef7..5a19a8e5 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 faaa3b9d..705419b9 100644
--- a/tests/conflicts.at
+++ b/tests/conflicts.at
@@ -1,7 +1,6 @@
 # Exercising Bison on conflicts.                         -*- Autotest -*-
 
-# Copyright (C) 2002, 2003, 2004, 2005, 2007, 2008, 2009 Free Software
-# Foundation, Inc.
+# Copyright (C) 2002-2005, 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/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 1a08f356..71fc3562 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 fa96558c..8912f289 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 dc3897b5..cbd7e596 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/local.mk b/tests/local.mk
index 565cc33a..9f736769 100644
--- a/tests/local.mk
+++ b/tests/local.mk
@@ -1,7 +1,6 @@
 ## Makefile for Bison testsuite.
 
-## Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
-## 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/named-refs.at b/tests/named-refs.at
index 4a256a13..794ea048 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 31298d7c..94c618d8 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 38579164..c530428c 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 1f1f9bad..a3bc06d4 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