From 279cabb657e5116d9fd4badace040f36f579199a Mon Sep 17 00:00:00 2001 From: "Joel E. Denny" Date: Wed, 17 Jan 2007 08:36:07 +0000 Subject: [PATCH] * 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. --- ChangeLog | 12 +++++++++++- NEWS | 2 +- data/c++-skel.m4 | 2 +- data/c++.m4 | 3 ++- data/c-skel.m4 | 2 +- data/c.m4 | 2 +- data/glr.c | 3 ++- data/glr.cc | 3 ++- data/lalr1.cc | 3 ++- data/location.cc | 3 ++- djgpp/config.site | 2 +- src/files.c | 2 +- src/files.h | 2 +- src/main.c | 2 +- src/muscle_tab.c | 2 +- src/muscle_tab.h | 2 +- src/parse-gram.c | 12 +++++++----- src/parse-gram.y | 4 +++- src/reader.h | 2 +- src/scan-skel.h | 2 +- src/scan-skel.l | 2 +- tests/actions.at | 3 ++- tests/calc.at | 2 +- tests/glr-regression.at | 2 +- tests/input.at | 3 ++- tests/local.at | 2 +- tests/output.at | 3 ++- tests/torture.at | 3 ++- 28 files changed, 55 insertions(+), 32 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1a097f9b..d9b0b990 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2007-01-17 Joel E. Denny + + * 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 * 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 c7645067..7d35ebf5 100644 --- 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 7a760bd4..5d6120d1 100644 --- 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 96fba673..0c3bac96 100644 --- 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 f8f598f8..0476eabc 100644 --- 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 d4b44c29..275f71d7 100644 --- 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 09c7ab53..5a40a313 100644 --- 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 297d6c44..d33d23e5 100644 --- 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 5e0be216..2d53bf9c 100644 --- 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 bbb7a91a..773a3a5d 100644 --- 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 552fc4f5..6f97936e 100644 --- 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 009fdfd4..06334f8b 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 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 bfff99e8..c4099984 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 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 50827098..d64f9219 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 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 e044c2ea..5192fc5c 100644 --- 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 eb01241f..ed6bd75e 100644 --- a/src/muscle_tab.h +++ b/src/muscle_tab.h @@ -1,5 +1,5 @@ /* Muscle table manager for Bison, - Copyright (C) 2001, 2002, 2003, 2006 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 1453ee90..91e27bfe 100644 --- 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 18eb1ac3..4d463a91 100644 --- 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 9a7974eb..0e0b4e8b 100644 --- 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 b6427ebd..7e059067 100644 --- 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 ed9d6d0d..d9ca8e28 100644 --- 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 b2728202..43b6f7f6 100644 --- 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 e9411d27..d4775f0f 100644 --- 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 31b2ac56..178d72bc 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 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 462e2aa9..12561892 100644 --- 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 de21de15..7c4858ad 100644 --- 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 5892e765..06f30c79 100644 --- 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 6e5418d4..99a4245e 100644 --- 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 -- 2.45.2