* data/glr.c: Switch to Bison 2.2 special-exception language in

the copyright notice.  Use more-regular format for titles and
copyright notices.
* data/glr.cc: Likewise.
* data/location.cc: Likewise.
* data/yacc.cc: Likewise.
* doc/bison.texinfo (Conditions): Document this.
* NEWS: likewise.  Upgrade version to 2.2.
This commit is contained in:
Paul Eggert
2006-05-09 06:40:13 +00:00
parent f5d5ecdfaf
commit 193d7c7054
7 changed files with 172 additions and 52 deletions

View File

@@ -135,13 +135,21 @@ m4_define([b4_rhs_location],
m4_changecom()
m4_divert(0)dnl
@output @output_parser_name@
b4_copyright([Skeleton parser for Yacc-like parsing with Bison],
[1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006])[
b4_copyright([Skeleton implementation for Bison's Yacc-like parsers in C],
[1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006])
[
/* As a special exception, you may create a larger work that contains
part or all of the Bison parser skeleton and distribute that work
under terms of your choice, so long as that work isn't itself a
parser generator using the skeleton or a modified version thereof
as a parser skeleton. Alternatively, if you modify or redistribute
the parser skeleton itself, you may (at your option) remove this
special exception, which will cause the skeleton and the resulting
Bison output files to be licensed under the GNU General Public
License without this special exception.
/* 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. */
This special exception was added by the Free Software Foundation in
version 2.2 of Bison. */
/* C LALR(1) parser skeleton written by Richard Stallman, by
simplifying the original so-called "semantic" parser. */
@@ -1492,14 +1500,22 @@ yyreturn:
b4_epilogue
m4_if(b4_defines_flag, 0, [],
[@output @output_header_name@
b4_copyright([Skeleton parser for Yacc-like parsing with Bison],
b4_copyright([Skeleton interface for Bison's Yacc-like parsers in C],
[1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006])
[
/* As a special exception, you may create a larger work that contains
part or all of the Bison parser skeleton and distribute that work
under terms of your choice, so long as that work isn't itself a
parser generator using the skeleton or a modified version thereof
as a parser skeleton. Alternatively, if you modify or redistribute
the parser skeleton itself, you may (at your option) remove this
special exception, which will cause the skeleton and the resulting
Bison output files to be licensed under the GNU General Public
License without this special exception.
/* 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. */
This special exception was added by the Free Software Foundation in
version 2.2 of Bison. */
]
b4_token_enums_defines(b4_tokens)
#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED