* NEWS, data/c++-skel.m4, data/c++.m4, data/c-skel.m4, data/c.m4,

data/glr.c, data/glr.cc, data/lalr1.cc, data/location.cc,
djgpp/config.site, src/files.c, src/files.h, src/main.c,
src/muscle_tab.c, src/muscle_tab.h, src/parse-gram.y, src/reader.h,
src/scan-skel.h, src/scan-skel.l, tests/actions.at, tests/calc.at,
tests/glr-regression.at, tests/input.at, tests/local.at,
tests/output.at, tests/torture.at: Update copyright to 2007.

diff --git a/ChangeLog b/ChangeLog
index 1a097f9b108a17ea46c2b7537eada28d5e84ff84..d9b0b990a4ef9e30d12da5a945bc9e8673fc7202 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2007-01-17  Joel E. Denny  <jdenny@ces.clemson.edu>
+
+       * NEWS, data/c++-skel.m4, data/c++.m4, data/c-skel.m4, data/c.m4,
+       data/glr.c, data/glr.cc, data/lalr1.cc, data/location.cc,
+       djgpp/config.site, src/files.c, src/files.h, src/main.c,
+       src/muscle_tab.c, src/muscle_tab.h, src/parse-gram.y, src/reader.h,
+       src/scan-skel.h, src/scan-skel.l, tests/actions.at, tests/calc.at,
+       tests/glr-regression.at, tests/input.at, tests/local.at,
+       tests/output.at, tests/torture.at: Update copyright to 2007.
+
 2007-01-16  Akim Demaille  <akim@epita.fr>
 
        * doc/bison.texinfo (Calc++ Parsing Driver): Let "parse" return an
@@ -287,7 +297,7 @@
        * data/glr.c, data/glr.cc, data/lalr1.cc, data/location.cc,
        data/push.c, data/yacc.c: Likewise, and replace m4_divert(0) with
        m4_divert_push(0) and m4_divert_pop(0).
-       * data/output.c (output_skeleton): Don't add an m4_divert_push(0) and
+       * src/output.c (output_skeleton): Don't add an m4_divert_push(0) and
        an m4_wrap([m4_divert_pop(0)]) to the M4.  Diversion -1, which is
        pushed and popped by m4sugar, should be first on the stack.
 

diff --git a/NEWS b/NEWS
index c764506754640fda01a1972ec1b3e1d435bfe60b..7d35ebf552850208f98fd5ada8a50f0e2ca40a9a 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -914,7 +914,7 @@ End:
 -----
 
 Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-2004, 2005, 2006 Free Software Foundation, Inc.
+2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of Bison, the GNU Compiler Compiler.
 

diff --git a/data/c++-skel.m4 b/data/c++-skel.m4
index 7a760bd46070c3b598529007a089e82bfda3dbc8..5d6120d1bf5b9dd9049c021abddc3571590febac 100644 (file)
--- a/data/c++-skel.m4
+++ b/data/c++-skel.m4
@@ -1,7 +1,7 @@
                                                             -*- Autoconf -*-
 
 # C++ skeleton dispatching for Bison.
-# Copyright (C) 2006 Free Software Foundation, Inc.
+# Copyright (C) 2006, 2007 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 96fba67327613523619b31926641a487043235bd..0c3bac96bbb2974b59176549f0053e03967fac30 100644 (file)
--- a/data/c++.m4
+++ b/data/c++.m4
@@ -2,7 +2,8 @@
 
 # C++ skeleton for Bison
 
-# Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007 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 f8f598f8951cde3c50b762c96cf9c019145c74f7..0476eabcfed734e0afbaa0d935e33c80c7d15de5 100644 (file)
--- a/data/c-skel.m4
+++ b/data/c-skel.m4
@@ -1,7 +1,7 @@
                                                             -*- Autoconf -*-
 
 # C skeleton dispatching for Bison.
-# Copyright (C) 2006 Free Software Foundation, Inc.
+# Copyright (C) 2006, 2007 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 d4b44c290226dbdb5cf06a1039618b18e18652e2..275f71d701bb5e2dc659d35c8a71caea3a56b2e4 100644 (file)
--- a/data/c.m4
+++ b/data/c.m4
@@ -1,7 +1,7 @@
                                                             -*- Autoconf -*-
 
 # C M4 Macros for Bison.
-# Copyright (C) 2002, 2004, 2005, 2006 Free Software Foundation, Inc.
+# Copyright (C) 2002, 2004, 2005, 2006, 2007 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 09c7ab53a90dafce640b653a73d34b28cafda5c5..5a40a3133b36c84230d099788659fe7759757ecc 100644 (file)
--- a/data/glr.c
+++ b/data/glr.c
@@ -1,7 +1,8 @@
                                                                     -*- C -*-
 
 # GLR skeleton for Bison
-# Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007 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.cc b/data/glr.cc
index 297d6c44961a3bf3c584ed48c75d404ff7e56e72..d33d23e5fd52cd06cbef08c59be26c4328216929 100644 (file)
--- a/data/glr.cc
+++ b/data/glr.cc
@@ -1,7 +1,8 @@
                                                                     -*- C -*-
 
 # C++ GLR skeleton for Bison
-# Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007 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 5e0be2163ec9bf3a16316ecee7c324fa2da0d9d9..2d53bf9c6403e1c055ce0f22917c2508b4c992bb 100644 (file)
--- a/data/lalr1.cc
+++ b/data/lalr1.cc
@@ -1,6 +1,7 @@
 # C++ skeleton for Bison
 
-# Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
+# Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007 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 bbb7a91a2c87b0db48fb47c9dbead602562b7ae5..773a3a5da49fc8adf0cdd0d398ed3c89db0b0167 100644 (file)
--- a/data/location.cc
+++ b/data/location.cc
@@ -1,6 +1,7 @@
 # C++ skeleton for Bison
 
-# Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007 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 552fc4f59b04b4ad4b68a9cc2e3ab86ff58ab938..6f97936e9ecd0299df5f14da045a758fb5929210 100644 (file)
--- a/djgpp/config.site
+++ b/djgpp/config.site
@@ -3,7 +3,7 @@
 # This is the config.site file for configuring GNU packages
 # which are to be built with DJGPP tools.
 
-# Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+# Copyright (C) 2005, 2006, 2007 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/files.c b/src/files.c
index 009fdfd4ea07cf4f2f4436164235de41b738dbd2..06334f8b118e013092b80b1d3ade10c8ce39912b 100644 (file)
--- 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 Free Software Foundation, Inc.
+   2005, 2006, 2007 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 bfff99e8c2de2ae5cfc2a92dea89911b06b07785..c40999842741a4608f443eb3968ca7c5b14d8eaa 100644 (file)
--- 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 Free Software
+   Copyright (C) 1984, 1989, 2000, 2001, 2002, 2006, 2007 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 50827098e09fb21f5dad045783464df38c8b4b8d..d64f92194d6e14aad00126130bd75c3f42d1d4c3 100644 (file)
--- 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 Free Software Foundation, Inc.
+   2005, 2006, 2007 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 e044c2ea7b5b1e83a8219ac665837c6a5b27cfc6..5192fc5c940b95ddf1fc062cb8cb488586205d11 100644 (file)
--- a/src/muscle_tab.c
+++ b/src/muscle_tab.c
@@ -1,6 +1,6 @@
 /* Muscle table manager for Bison.
 
-   Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 Free Software
+   Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007 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 eb01241fdb6719bc4f231a3075ee5e4e149108e9..ed6bd75e40edf232e594e7ba9b4130c1c86c6c54 100644 (file)
--- a/src/muscle_tab.h
+++ b/src/muscle_tab.h
@@ -1,5 +1,5 @@
 /* Muscle table manager for Bison,
-   Copyright (C) 2001, 2002, 2003, 2006 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2002, 2003, 2006, 2007 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 1453ee90bf6b0154e8aa3d114b091025fdf93ebf..91e27bfe0839f4c5c0f286c40e24d723667ace8b 100644 (file)
--- a/src/parse-gram.c
+++ b/src/parse-gram.c
@@ -685,7 +685,7 @@ static const yytype_uint16 yyrline[] =
      448,   454,   460,   471,   472,   481,   482,   488,   489,   490,
      497,   497,   501,   502,   503,   508,   509,   511,   513,   515,
      517,   527,   528,   534,   538,   547,   567,   569,   578,   583,
-     584,   589,   596,   598
+     584,   589,   598,   600
 };
 #endif
 
@@ -2577,14 +2577,16 @@ yyreduce:
 #line 590 "parse-gram.y"
     {
       (yyval.symbol) = symbol_get (quotearg_style (c_quoting_style, (yyvsp[(1) - (1)].chars)), (yylsp[(1) - (1)]));
-      symbol_class_set ((yyval.symbol), token_sym, (yylsp[(1) - (1)]), false);
+      symbol_class_set ((yyval.symbol),
+                        current_class == unknown_sym
+                        ? token_sym : current_class, (yylsp[(1) - (1)]), false);
     }
     break;
 
   case 103:
 
 /* Line 1537 of yacc.c  */
-#line 599 "parse-gram.y"
+#line 601 "parse-gram.y"
     {
       code_props plain_code;
       code_props_plain_init (&plain_code, (yyvsp[(2) - (2)].chars), (yylsp[(2) - (2)]));
@@ -2598,7 +2600,7 @@ yyreduce:
 
 
 /* Line 1537 of yacc.c  */
-#line 2602 "parse-gram.c"
+#line 2604 "parse-gram.c"
       default: break;
     }
   YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
@@ -2817,7 +2819,7 @@ yyreturn:
 
 
 /* Line 1537 of yacc.c  */
-#line 609 "parse-gram.y"
+#line 611 "parse-gram.y"
 
 
 

diff --git a/src/parse-gram.y b/src/parse-gram.y
index 18eb1ac364a4509ea953722009f339283343c1bd..4d463a9160876c80ec004e66d43980bea89befdf 100644 (file)
--- a/src/parse-gram.y
+++ b/src/parse-gram.y
@@ -589,7 +589,9 @@ string_as_id:
   STRING
     {
       $$ = symbol_get (quotearg_style (c_quoting_style, $1), @1);
-      symbol_class_set ($$, token_sym, @1, false);
+      symbol_class_set ($$,
+                        current_class == unknown_sym
+                        ? token_sym : current_class, @1, false);
     }
 ;
 

diff --git a/src/reader.h b/src/reader.h
index 9a7974eb422436abfbd961f6483309ade67142b5..0e0b4e8be20a9077f0f065a70ac3c05c41b78384 100644 (file)
--- a/src/reader.h
+++ b/src/reader.h
@@ -1,6 +1,6 @@
 /* Input parser for Bison
 
-   Copyright (C) 2000, 2001, 2002, 2003, 2005, 2006 Free Software
+   Copyright (C) 2000, 2001, 2002, 2003, 2005, 2006, 2007 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 b6427ebde0422de7bdcee3fb9ef7f15372b1c800..7e05906724289c81088733a4e923761e63c5ae01 100644 (file)
--- a/src/scan-skel.h
+++ b/src/scan-skel.h
@@ -1,6 +1,6 @@
 /* Scan Bison Skeletons.
 
-   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006, 2007 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 ed9d6d0dffc82addc96a772c52bfc6c9621818d8..d9ca8e28c6427d33cad716b9caaf70849c9d4ef8 100644 (file)
--- a/src/scan-skel.l
+++ b/src/scan-skel.l
@@ -1,6 +1,6 @@
 /* Scan Bison Skeletons.                                       -*- C -*-
 
-   Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 Free Software
+   Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007 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 b27282028c618554b5b4471a57bd948dba55d90e..43b6f7f6e10959517606ab17cf1aa57c3d9f5858 100644 (file)
--- a/tests/actions.at
+++ b/tests/actions.at
@@ -1,5 +1,6 @@
 # Executing Actions.                               -*- Autotest -*-
-# Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007 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 e9411d2783f74ed1dc624c72392ac0fba1f177bd..d4775f0fc94b70782d1f6fad6ae1d350f4ebe1c0 100644 (file)
--- a/tests/calc.at
+++ b/tests/calc.at
@@ -1,6 +1,6 @@
 # Simple calculator.                         -*- Autotest -*-
 
-# Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software
+# Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 Free Software
 # Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify

diff --git a/tests/glr-regression.at b/tests/glr-regression.at
index 31b2ac56ec791d9e60a3e0409e3c14e101ab1a6d..178d72bc2d5fe75b8c059da837c2addaa0107391 100644 (file)
--- 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 Free Software Foundation, Inc.
+# Copyright (C) 2002, 2003, 2005, 2006, 2007 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 462e2aa9a847725163ba884fcafae851fa5658e0..12561892e1431979a9274c50b2d35fa406ca87fe 100644 (file)
--- a/tests/input.at
+++ b/tests/input.at
@@ -1,5 +1,6 @@
 # Checking the Bison scanner.                    -*- Autotest -*-
-# Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007 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 de21de1549d0dcfa1405e4065bc6bb6637f0c52a..7c4858ad0ad8b3b3079ee6e56c4e0ac91e085db3 100644 (file)
--- a/tests/local.at
+++ b/tests/local.at
@@ -1,7 +1,7 @@
 # Process this -*- Autotest -*- file with autom4te.
 
 # Macros for the GNU Bison Test suite.
-# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004, 2005, 2006, 2007 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 5892e765c5aa12b40ebf2c09908e2ac598a1aa38..06f30c7916bafca2bb0ef9e93698e71c6c84c94a 100644 (file)
--- a/tests/output.at
+++ b/tests/output.at
@@ -1,5 +1,6 @@
 # Checking the output filenames.                    -*- Autotest -*-
-# Copyright (C) 2000, 2001, 2002, 2005, 2006 Free Software Foundation, Inc.
+# Copyright (C) 2000, 2001, 2002, 2005, 2006, 2007 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 6e5418d42191ff607244ae65521fd0ec194298bc..99a4245e7a1cf78c616ac5ddd79a682188a523c3 100644 (file)
--- a/tests/torture.at
+++ b/tests/torture.at
@@ -1,5 +1,6 @@
 # Torturing Bison.                                    -*- Autotest -*-
-# Copyright (C) 2001, 2002, 2004, 2005 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 2004, 2005, 2006, 2007 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