diff --git a/ChangeLog b/ChangeLog index 8ae1d171..e0723bcc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2006-05-13 Paul Eggert + + * data/c.m4 (b4_copyright): Put the special exception for Bison + skeletons here, so we don't have to put it in each skeleton. All + uses changed. Wrap the copyright notice, in case it is longer + than 80 columns. Replace comma by newline after title. + 2006-05-11 Paul Eggert * doc/bison.texinfo (Calc++ Scanner): The flex behavior is an diff --git a/data/c.m4 b/data/c.m4 index f9066764..8b96b95b 100644 --- a/data/c.m4 +++ b/data/c.m4 @@ -28,8 +28,9 @@ m4_divert(-1) -*- Autoconf -*- m4_define([b4_copyright], [/* A Bison parser, made by GNU Bison b4_version. */ -/* $1, - Copyright (C) $2 Free Software Foundation, Inc. +/* $1 + +m4_text_wrap([Copyright (C) $2 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 @@ -44,7 +45,20 @@ m4_define([b4_copyright], You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. */]) + Boston, MA 02110-1301, USA. */ + +/* 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. + + This special exception was added by the Free Software Foundation in + version 2.2 of Bison. */]) # b4_identification diff --git a/data/glr.c b/data/glr.c index 29ea3bc7..02e0d910 100644 --- a/data/glr.c +++ b/data/glr.c @@ -146,19 +146,6 @@ m4_divert(0)dnl b4_copyright([Skeleton implementation for Bison GLR parsers in C], [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. - - This special exception was added by the Free Software Foundation in - version 2.2 of Bison. */ - /* C GLR parser skeleton written by Paul Hilfinger. */ ]b4_identification @@ -2612,20 +2599,6 @@ m4_if(b4_defines_flag, 0, [], [@output @output_header_name@ b4_copyright([Skeleton interface for Bison GLR parsers in C], [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. - - This special exception was added by the Free Software Foundation in - version 2.2 of Bison. */ -] b4_shared_declarations diff --git a/data/glr.cc b/data/glr.cc index 9322cf5e..d49b3132 100644 --- a/data/glr.cc +++ b/data/glr.cc @@ -214,20 +214,7 @@ m4_popdef([b4_parse_param]) @output @output_header_name@ b4_copyright([Skeleton interface for Bison GLR parsers in C++], - [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. - - This special exception was added by the Free Software Foundation in - version 2.2 of Bison. */ + [2002, 2003, 2004, 2005, 2006])[ /* C++ GLR parser skeleton written by Akim Demaille. */ diff --git a/data/lalr1.cc b/data/lalr1.cc index 8affc736..7b8bf933 100644 --- a/data/lalr1.cc +++ b/data/lalr1.cc @@ -33,19 +33,6 @@ b4_copyright([Skeleton interface for Bison LALR(1) parsers in C++], [2002, 2003, 2004, 2005, 2006]) dnl FIXME: This is wrong, we want computed header guards. [ -/* 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. - - This special exception was added by the Free Software Foundation in - version 2.2 of Bison. */ - /* C++ LALR(1) parser skeleton written by Akim Demaille. */ #ifndef PARSER_HEADER_H @@ -312,20 +299,6 @@ b4_error_verbose_if([, int tok])[); @output @output_parser_name@ b4_copyright([Skeleton implementation for Bison LALR(1) parsers in C++], [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. - - This special exception was added by the Free Software Foundation in - version 2.2 of Bison. */ -] m4_if(b4_prefix, [yy], [], [ // Take the name prefix into account. @@ -1080,20 +1053,7 @@ b4_error_verbose_if([, int tok])[) dnl @output b4_dir_prefix[]stack.hh b4_copyright([Stack handling for Bison parsers in C++], - [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. - - This special exception was added by the Free Software Foundation in - version 2.2 of Bison. */ + [2002, 2003, 2004, 2005, 2006])[ #ifndef BISON_STACK_HH # define BISON_STACK_HH diff --git a/data/location.cc b/data/location.cc index 6581b384..869320e7 100644 --- a/data/location.cc +++ b/data/location.cc @@ -24,20 +24,7 @@ m4_changecom() m4_divert(0)dnl @output b4_dir_prefix[]position.hh b4_copyright([Positions for Bison parsers in C++], - [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. - - This special exception was added by the Free Software Foundation in - version 2.2 of Bison. */ + [2002, 2003, 2004, 2005, 2006])[ /** ** \file position.hh @@ -149,20 +136,7 @@ namespace ]b4_namespace[ #endif // not BISON_POSITION_HH] @output b4_dir_prefix[]location.hh b4_copyright([Locations for Bison parsers in C++], - [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. - - This special exception was added by the Free Software Foundation in - version 2.2 of Bison. */ + [2002, 2003, 2004, 2005, 2006])[ /** ** \file location.hh diff --git a/data/yacc.c b/data/yacc.c index ac8e335e..497a1c43 100644 --- a/data/yacc.c +++ b/data/yacc.c @@ -136,20 +136,7 @@ m4_changecom() m4_divert(0)dnl @output @output_parser_name@ 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. - - This special exception was added by the Free Software Foundation in - version 2.2 of Bison. */ + [1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006])[ /* C LALR(1) parser skeleton written by Richard Stallman, by simplifying the original so-called "semantic" parser. */ @@ -1502,20 +1489,7 @@ m4_if(b4_defines_flag, 0, [], [@output @output_header_name@ 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. - 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