* data/yacc.c: Say "parser skeleton" rather than "file", since

it's no longer just a file.
* data/glr.c: Grant a special exception for C GLR parsers, that
reads like the already-existing exception for C LALR(1) parsers.
* data/glr.cc: Likewise.
* data/lalr1.cc: Likewise.
* data/location.cc: Likewise.
* data/yacc.c: Reword the "written by" statement to clarify that
it was the parser skeleton, not the entire output file.
* data/glr.c: Written by Paul Hilfinger.
* data/glr.cc: Written by Akim Demaille.
* data/lalr1.cc: Likewise.

diff --git a/ChangeLog b/ChangeLog
index 26bef9775be9e680f1167766088ede05783a1691..03817bc1638f3a0c6808b45a38770efc650c9ed9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2005-12-01  Paul Eggert  <eggert@cs.ucla.edu>
+
+       * data/yacc.c: Say "parser skeleton" rather than "file", since
+       it's no longer just a file.
+       * data/glr.c: Grant a special exception for C GLR parsers, that
+       reads like the already-existing exception for C LALR(1) parsers.
+       * data/glr.cc: Likewise.
+       * data/lalr1.cc: Likewise.
+       * data/location.cc: Likewise.
+       * data/yacc.c: Reword the "written by" statement to clarify that
+       it was the parser skeleton, not the entire output file.
+       * data/glr.c: Written by Paul Hilfinger.
+       * data/glr.cc: Written by Akim Demaille.
+       * data/lalr1.cc: Likewise.
+

 2005-11-18  Paul Eggert  <eggert@cs.ucla.edu>
 
        * data/yacc.c (yy_reduce_print, YY_REDUCE_PRINT):
 2005-11-18  Paul Eggert  <eggert@cs.ucla.edu>
 
        * data/yacc.c (yy_reduce_print, YY_REDUCE_PRINT):

diff --git a/data/glr.c b/data/glr.c
index 4a286ad30f280b070ba887e553535ec8140f4058..de3b9bba83ff6a9ff96e17fac6845bbb05ec7dd4 100644 (file)
--- a/data/glr.c
+++ b/data/glr.c
@@ -2390,7 +2390,15 @@ b4_epilogue
 m4_if(b4_defines_flag, 0, [],
 [@output @output_header_name@
 b4_copyright([Skeleton parser for GLR parsing with Bison],
 m4_if(b4_defines_flag, 0, [],
 [@output @output_header_name@
 b4_copyright([Skeleton parser for GLR parsing with Bison],

-             [2002, 2003, 2004, 2005])
+             [2002, 2003, 2004, 2005])[
+
+/* As a special exception, when this parser skeleton is copied by
+   Bison into a Bison output file, you may use that output file
+   without restriction.  This special exception was added by the Free
+   Software Foundation for C GLR parsers in version 2.2 of Bison.  */
+
+/* C GLR parser skeleton written by Paul Hilfinger.  */
+]

 
 b4_shared_declarations
 
 
 b4_shared_declarations
 

diff --git a/data/glr.cc b/data/glr.cc
index 3a636f056b35121ec8bda8d9e119ce8beea8ad5a..a9c855221cb210c21993263903337df73bd563c2 100644 (file)
--- a/data/glr.cc
+++ b/data/glr.cc
@@ -167,6 +167,15 @@ m4_include(b4_pkgdatadir/[glr.c])
 @output @output_header_name@
 b4_copyright([C++ Skeleton parser for GLALR(1) parsing with Bison],
              [2002, 2003, 2004, 2005])[
 @output @output_header_name@
 b4_copyright([C++ Skeleton parser for GLALR(1) parsing with Bison],
              [2002, 2003, 2004, 2005])[

+
+/* As a special exception, when this parser skeleton is copied by
+   Bison into a Bison output file, you may use that output file
+   without restriction.  This special exception was added by the Free
+   Software Foundation for C++ GLR parsers in version 2.2 of
+   Bison.  */
+
+/* C++ GLR parser skeleton written by Akim Demaille.  */
+

 #ifndef PARSER_HEADER_H
 # define PARSER_HEADER_H
 
 #ifndef PARSER_HEADER_H
 # define PARSER_HEADER_H
 

diff --git a/data/lalr1.cc b/data/lalr1.cc
index bcc6080f4acb54864bcd70ca76745dace4b2dd9c..38c567ac6f849e03ea023edf6ca038fbf1aaa87f 100644 (file)
--- a/data/lalr1.cc
+++ b/data/lalr1.cc
@@ -32,7 +32,14 @@ m4_if(b4_defines_flag, 0, [],
 b4_copyright([C++ Skeleton parser for LALR(1) parsing with Bison],
              [2002, 2003, 2004, 2005])
 dnl FIXME: This is wrong, we want computed header guards.
 b4_copyright([C++ Skeleton parser for LALR(1) parsing with Bison],
              [2002, 2003, 2004, 2005])
 dnl FIXME: This is wrong, we want computed header guards.

-[
+[/* As a special exception, when this parser skeleton is copied by
+   Bison into a Bison output file, you may use that output file
+   without restriction.  This special exception was added by the Free
+   Software Foundation for C++ LALR(1) parsers in version 2.2 of
+   Bison.  */
+
+/* C++ LALR(1) parser skeleton written by Akim Demaille.  */
+

 #ifndef PARSER_HEADER_H
 # define PARSER_HEADER_H
 
 #ifndef PARSER_HEADER_H
 # define PARSER_HEADER_H
 

diff --git a/data/location.cc b/data/location.cc
index a134bfa8e52465e6b5545e4c6d559c5905c9b57d..a6b1b35eac4b93b4e708e3e0725be13b70d6873b 100644 (file)
--- a/data/location.cc
+++ b/data/location.cc
@@ -25,7 +25,11 @@ m4_include(b4_pkgdatadir/[c++.m4])
 m4_changecom()
 m4_divert(0)dnl
 @output b4_dir_prefix[]position.hh
 m4_changecom()
 m4_divert(0)dnl
 @output b4_dir_prefix[]position.hh

-b4_copyright([Position class for Bison C++ parsers], [2002, 2003, 2004, 2005])[
+b4_copyright([Position class for Bison C++ parsers], [2002, 2003, 2004, 2005])dnl
+[/* As a special exception, when this parser skeleton is copied by
+   Bison into a Bison output file, you may use that output file
+   without restriction.  This special exception was added by the Free
+   Software Foundation for C++ parsers in version 2.2 of Bison.  */

 
 /**
  ** \file position.hh
 
 /**
  ** \file position.hh

diff --git a/data/yacc.c b/data/yacc.c
index dfee74011ca7fb1b1f6f867f261056e9d72fbc22..e2fa768c05f5d608f13f02bcba59143192054361 100644 (file)
--- a/data/yacc.c
+++ b/data/yacc.c
@@ -137,13 +137,14 @@ m4_divert(0)dnl
 b4_copyright([Skeleton parser for Yacc-like parsing with Bison],
              [1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005])[
 
 b4_copyright([Skeleton parser for Yacc-like parsing with Bison],
              [1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005])[
 

-/* As a special exception, when this file is copied by Bison into a
-   Bison output file, you may use that output file without restriction.
-   This special exception was added by the Free Software Foundation
-   in version 1.24 of Bison.  */
-
-/* Written by Richard Stallman by simplifying the original so called
-   ``semantic'' parser.  */
+/* As a special exception, when this parser skeleton is copied by
+   Bison into a Bison output file, you may use that output file
+   without restriction.  This special exception was added by the Free
+   Software Foundation for C LALR(1) parsers in version 1.24 of
+   Bison.  */
+
+/* C LALR(1) parser skeleton written by Richard Stallman, by
+   simplifying the original so-called "semantic" parser.  */

 
 /* All symbols defined below should begin with yy or YY, to avoid
    infringing on user name space.  This should be done even for local
 
 /* All symbols defined below should begin with yy or YY, to avoid
    infringing on user name space.  This should be done even for local