Future/bison
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/bison.git synced 2026-03-18 00:33:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Undo 2005-12-01 tentative license wording change.

Browse Source
This commit is contained in:
Paul Eggert
2005-12-22 04:38:26 +00:00
parent 9d9b8b7006
commit 8bb4c753e2
7 changed files with 17 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
ChangeLog
View File

@@ -1,5 +1,16 @@
2005-12-21 Paul Eggert <eggert@cs.ucla.edu> 2005-12-21 Paul Eggert <eggert@cs.ucla.edu>
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. * NEWS: Reword %destructor vs YYABORT etc.
* data/glr.c: Use American spacing, for consistency. * data/glr.c: Use American spacing, for consistency.
* data/glr.cc: Likewise. * data/glr.cc: Likewise.

6
NEWS
View File

@@ -8,12 +8,6 @@ Changes in version 2.1a:
and YYERROR, for all objects on the stack, other than objects and YYERROR, for all objects on the stack, other than objects
corresponding to the right-hand side of the current rule. 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 * %expect, %expect-rr
Incorrect numbers of expected conflicts are now actual errors, Incorrect numbers of expected conflicts are now actual errors,
instead of warnings. instead of warnings.

5
data/glr.c
View File

@@ -2444,11 +2444,6 @@ m4_if(b4_defines_flag, 0, [],
b4_copyright([Skeleton parser for GLR parsing with Bison], 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. */ /* C GLR parser skeleton written by Paul Hilfinger. */
] ]

6
data/glr.cc
View File

@@ -168,12 +168,6 @@ m4_include(b4_pkgdatadir/[glr.c])
b4_copyright([C++ Skeleton parser for GLALR(1) parsing with Bison], b4_copyright([C++ Skeleton parser for GLALR(1) 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 Akim Demaille. */ /* C++ GLR parser skeleton written by Akim Demaille. */
#ifndef PARSER_HEADER_H #ifndef PARSER_HEADER_H

7
data/lalr1.cc
View File

@@ -32,12 +32,7 @@ m4_if(b4_defines_flag, 0, [],
b4_copyright([C++ Skeleton parser for LALR(1) parsing with Bison], b4_copyright([C++ Skeleton parser for LALR(1) parsing with Bison],
[2002, 2003, 2004, 2005]) [2002, 2003, 2004, 2005])
dnl FIXME: This is wrong, we want computed header guards. 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. */ /* C++ LALR(1) parser skeleton written by Akim Demaille. */
#ifndef PARSER_HEADER_H #ifndef PARSER_HEADER_H

6
data/location.cc
View File

@@ -25,11 +25,7 @@ m4_include(b4_pkgdatadir/[c++.m4])
m4_changecom() m4_changecom()
m4_divert(0)dnl m4_divert(0)dnl
@output b4_dir_prefix[]position.hh @output b4_dir_prefix[]position.hh
b4_copyright([Position class for Bison C++ parsers], [2002, 2003, 2004, 2005])dnl b4_copyright([Position class for Bison C++ parsers], [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++ parsers in version 2.2 of Bison. */
/** /**
** \file position.hh ** \file position.hh

9
data/yacc.c
View File

@@ -137,11 +137,10 @@ m4_divert(0)dnl
b4_copyright([Skeleton parser for Yacc-like parsing with Bison], b4_copyright([Skeleton parser for Yacc-like parsing with Bison],
[1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005])[ [1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005])[
/* As a special exception, when this parser skeleton is copied by /* As a special exception, when this file is copied by Bison into a
Bison into a Bison output file, you may use that output file Bison output file, you may use that output file without restriction.
without restriction. This special exception was added by the Free This special exception was added by the Free Software Foundation
Software Foundation for C LALR(1) parsers in version 1.24 of in version 1.24 of Bison. */
Bison. */
/* C LALR(1) parser skeleton written by Richard Stallman, by /* C LALR(1) parser skeleton written by Richard Stallman, by
simplifying the original so-called "semantic" parser. */ simplifying the original so-called "semantic" parser. */