From: Paul Eggert Date: Thu, 22 Dec 2005 04:38:26 +0000 (+0000) Subject: Undo 2005-12-01 tentative license wording change. X-Git-Tag: v2.3b~540 X-Git-Url: https://git.saurik.com/bison.git/commitdiff_plain/8bb4c753e2d626ee90460e6d9f9cbaa2cd1f560d?ds=sidebyside Undo 2005-12-01 tentative license wording change. --- diff --git a/ChangeLog b/ChangeLog index 9cd31938..3be972e5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,16 @@ 2005-12-21 Paul Eggert + Undo 2005-12-01 tentative license wording change. The wording is + still being reviewed by the lawyers, and we don't want to wait for + them before publishing a test release. For now, revert to the + previous wording. + * NEWS: Undo 2005-12-01 change. + * data/glr.c: Revert to previous license wording. + * data/glr.cc: Likewise. + * data/lalr1.cc: Likewise. + * data/location.cc: Likewise. + * data/yacc.c: Likewise. + * NEWS: Reword %destructor vs YYABORT etc. * data/glr.c: Use American spacing, for consistency. * data/glr.cc: Likewise. diff --git a/NEWS b/NEWS index ae7c5c94..22d182fa 100644 --- a/NEWS +++ b/NEWS @@ -8,12 +8,6 @@ Changes in version 2.1a: and YYERROR, for all objects on the stack, other than objects corresponding to the right-hand side of the current rule. -* GLR, C++ LALR(1) parsers. - These parser skeletons are now distributed with the same special - license exception that the C LALR(1) parser skeleton has had since - Bison 1.24. Hence the FSF imposes no copyright restriction on the - output of Bison when it is generating such parsers. - * %expect, %expect-rr Incorrect numbers of expected conflicts are now actual errors, instead of warnings. diff --git a/data/glr.c b/data/glr.c index e1671325..6b90187c 100644 --- a/data/glr.c +++ b/data/glr.c @@ -2444,11 +2444,6 @@ m4_if(b4_defines_flag, 0, [], b4_copyright([Skeleton parser for GLR 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 Paul Hilfinger. */ ] diff --git a/data/glr.cc b/data/glr.cc index 23148c9a..69232f97 100644 --- a/data/glr.cc +++ b/data/glr.cc @@ -168,12 +168,6 @@ m4_include(b4_pkgdatadir/[glr.c]) 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 diff --git a/data/lalr1.cc b/data/lalr1.cc index ef451070..dba89da6 100644 --- a/data/lalr1.cc +++ b/data/lalr1.cc @@ -32,12 +32,7 @@ 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. -[/* 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 diff --git a/data/location.cc b/data/location.cc index a6b1b35e..a134bfa8 100644 --- a/data/location.cc +++ b/data/location.cc @@ -25,11 +25,7 @@ m4_include(b4_pkgdatadir/[c++.m4]) m4_changecom() m4_divert(0)dnl @output b4_dir_prefix[]position.hh -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. */ +b4_copyright([Position class for Bison C++ parsers], [2002, 2003, 2004, 2005])[ /** ** \file position.hh diff --git a/data/yacc.c b/data/yacc.c index c23b5dc1..71d2e532 100644 --- a/data/yacc.c +++ b/data/yacc.c @@ -137,11 +137,10 @@ m4_divert(0)dnl 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 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. */ +/* 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. */ /* C LALR(1) parser skeleton written by Richard Stallman, by simplifying the original so-called "semantic" parser. */