[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
"make syntax-check" fixes for Bison
|
From: |
Paul Eggert |
|
Subject: |
"make syntax-check" fixes for Bison |
|
Date: |
Sat, 21 Jan 2006 23:42:29 -0800 |
|
User-agent: |
Gnus/5.1007 (Gnus v5.10.7) Emacs/21.4 (gnu/linux) |
I imported some trivial compile-time checks from coreutils and made
minor changes to Bison to pass the new checks, and installed the
following. (I have removed the carriage-returns from the DOS part of
the patch published below, in the interest of sanity.)
2006-01-21 Paul Eggert <address@hidden>
* Makefile.cfg (local-checks-to-skip): Add changelog-check,
since we don't want to insist on a version number at the start
of the changelog every time.
* Makefile.maint: Sync from coreutils a bit better.
(sc_trailing_blank): Renamed from sc_trailing_space.
All uses changed.
(sc_no_if_have_config_h, sc_require_config_h):
(sc_prohibit_assert_without_use): New rules.
(sc_obsolete_symbols): Don't catch Makefile.maint itself.
(sc_dd_max_sym_length): Fix leading spaces in rule.
(sc_system_h_headers): Prefix with @.
(sc_useless_cpp_parens, m4-check): Output line numbers.
(changelog-check): Allow version only in head.
* data/c.m4: Use "defined FOO" instead of "defined (FOO)", to
satisfy new Makefile.maint rule.
* data/glr.c: Likewise.
* data/glr.cc: Likewise.
* data/lalr1.cc: Likewise.
* data/yacc.c: Likewise.
* lib/ebitsetv.c: Likewise.
* lib/lbitset.c: Likewise.
* lib/subpipe.c: Likewise.
* lib/timevar.c: Likewise.
* src/system.h: Likewise.
* data/yacc.c (YYSTYPE): Don't generate trailing spaces in output.
* djgpp/Makefile.maint: Add copyright notice.
* djgpp/README.in: Likewise.
* djgpp/config.bat: Likewise.
* djgpp/config.site: Likewise.
* djgpp/config_h.sed: Likewise.
* djgpp/djunpack.bat: Likewise.
* djgpp/config.sed: Fix copyright notice to match standard format.
* djgpp/subpipe.h: Likewise.
* lib/bitsetv-print.c: Likewise.
* lib/bitsetv.c: Likewise.
* lib/subpipe.h: Likewise.
* lib/timevar.c: Likewise.
* lib/timevar.h: Likewise.
* djgpp/subpipe.c: Use standard recipe for config.h.
* lib/abitset.c: Likewise.
* lib/bitset.c: Likewise.
* lib/bitset_stats.c: Likewise.
* lib/bitsetv-print.c: Likewise.
* lib/bitsetv.c: Likewise.
* lib/ebitsetv.c: Likewise.
* lib/get-errno.c: Likewise.
* lib/lbitset.c: Likewise.
* lib/subpipe.c: Likewise.
* lib/timevar.c: Likewise.
* lib/vbitset.c: Likewise.
* tests/local.at: Likewise.
* src/scan-gram.l: Don't include verify.h, since system.h does
that for us.
* .x-sc_require_config_h: New file.
* .x-sc_unmarked_diagnostics: New file.
Index: Makefile.cfg
===================================================================
RCS file: /cvsroot/bison/bison/Makefile.cfg,v
retrieving revision 1.4
diff -b -p -u -r1.4 Makefile.cfg
--- Makefile.cfg 22 Oct 2005 06:44:35 -0000 1.4
+++ Makefile.cfg 22 Jan 2006 07:36:43 -0000
@@ -1,5 +1,5 @@
# Customize Makefile.maint for Bison. -*- makefile -*-
-# Copyright (C) 2003, 2005 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2005, 2006 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 +44,5 @@ cvs_files = \
$(build_aux_dir)/mkinstalldirs
# Tests not to run.
-# local-checks-to-skip ?= \
-# author_mark_check \
-# strftime-check syntax-check makefile_path_separator_check \
-# makefile-check
+local-checks-to-skip = \
+ changelog-check
Index: Makefile.maint
===================================================================
RCS file: /cvsroot/bison/bison/Makefile.maint,v
retrieving revision 1.20
diff -b -p -u -r1.20 Makefile.maint
--- Makefile.maint 19 Jan 2006 06:00:28 -0000 1.20
+++ Makefile.maint 22 Jan 2006 07:36:43 -0000
@@ -113,7 +113,7 @@ syntax-check-rules = \
sc_sun_os_names \
sc_system_h_headers \
sc_tight_scope \
- sc_trailing_space \
+ sc_trailing_blank \
sc_unmarked_diagnostics \
sc_useless_cpp_parens
@@ -174,10 +174,32 @@ sc_file_system:
'rewrite to use "file system"' 1>&2; \
exit 1; } || :
+sc_no_if_have_config_h:
+ @grep -n '^# *if HAVE_CONFIG_H' $$($(CVS_LIST_EXCEPT)) && \
+ { echo '$(ME): found use of #if HAVE_CONFIG_H; use #ifdef' \
+ 1>&2; exit 1; } || :
+
+# Nearly all .c files must include <config.h>.
+sc_require_config_h:
+ @grep -L '^# *include <config\.h>' \
+ $$($(CVS_LIST_EXCEPT) | grep '\.c$$') \
+ | grep . && \
+ { echo '$(ME): the above files do not include <config.h>' \
+ 1>&2; exit 1; } || :
+
+# Prohibit the inclusion of assert.h without an actual use of assert.
+sc_prohibit_assert_without_use:
+ @files=$$(grep -l '# *include <assert\.h>' \
+ $$($(CVS_LIST_EXCEPT) | grep '\.c$$')) && \
+ grep -L '\<assert (' $$files \
+ | grep . && \
+ { echo "$(ME): the above files include <assert.h> but don't use it" \
+ 1>&2; exit 1; } || :
+
sc_obsolete_symbols:
- @grep -nE '\<(\<(HAVE_FCNTL_H|O_NDELAY)\>' \
+ @grep -nE '\<(HAVE''_FCNTL_H|O''_NDELAY)\>' \
$$($(CVS_LIST_EXCEPT)) && \
- { echo '$(ME): do not use HAVE_FCNTL_H or O_NDELAY' \
+ { echo '$(ME): do not use HAVE''_FCNTL_H or O''_NDELAY' \
1>&2; exit 1; } || :
# FIXME: warn about definitions of EXIT_FAILURE, EXIT_SUCCESS, STREQ
@@ -239,7 +261,7 @@ sc_root_tests:
# Files in src/ should not include directly any of
# the headers already included via system.h.
sc_system_h_headers: .re-list
- if test -f $(srcdir)/src/system.h; then \
+ @if test -f $(srcdir)/src/system.h; then \
trap 'rc=$$?; rm -f .re-list; exit $$rc' 0 1 2 3 15; \
grep -nE -f .re-list \
$$($(CVS_LIST) src | \
@@ -258,9 +280,9 @@ sc_sun_os_names:
sc_tight_scope:
$(MAKE) -C src $@
-sc_trailing_space:
+sc_trailing_blank:
@grep -n '[ ]$$' $$($(CVS_LIST_EXCEPT)) && \
- { echo '$(ME): found trailing space(s)' \
+ { echo '$(ME): found trailing blank(s)' \
1>&2; exit 1; } || :
# Look for diagnostics that aren't marked for translation.
@@ -275,7 +297,7 @@ sc_unmarked_diagnostics:
# Avoid useless parentheses like those in this example:
# #if defined (SYMBOL) || defined (SYM2)
sc_useless_cpp_parens:
- @grep '^# *if .*defined *(' $$($(CVS_LIST_EXCEPT)) && \
+ @grep -n '^# *if .*defined *(' $$($(CVS_LIST_EXCEPT)) && \
{ echo '$(ME): found useless parentheses in cpp directive' \
1>&2; exit 1; } || :
@@ -312,7 +334,7 @@ news-date-check: NEWS
fi
changelog-check:
- if grep 'Version $(VERSION_REGEXP)\.$$' ChangeLog \
+ if head ChangeLog | grep 'Version $(VERSION_REGEXP)\.$$' \
>/dev/null; then \
:; \
else \
@@ -321,7 +343,7 @@ changelog-check:
fi
m4-check:
- @grep 'AC_DEFUN([^[]' m4/*.m4 \
+ @grep -n 'AC_DEFUN([^[]' m4/*.m4 \
&& { echo 'Makefile.maint: quote the first arg to AC_DEFUN' 1>&2; \
exit 1; } || :
Index: data/c.m4
===================================================================
RCS file: /cvsroot/bison/bison/data/c.m4,v
retrieving revision 1.52
diff -b -p -u -r1.52 c.m4
--- data/c.m4 20 Jan 2006 00:08:30 -0000 1.52
+++ data/c.m4 22 Jan 2006 07:36:43 -0000
@@ -259,8 +259,8 @@ m4_define([b4_token_enums_defines],
# Consider a C++ compiler to be modern if it defines __cplusplus.
#
m4_define([b4_c_modern],
- [[(defined (__STDC__) || defined (__C99__FUNC__) \
- || defined (__cplusplus) || defined (_MSC_VER))]])
+ [[(defined __STDC__ || defined __C99__FUNC__ \
+ || defined __cplusplus || defined _MSC_VER)]])
# b4_c_function_def(NAME, RETURN-VALUE, [DECL1, NAME1], ...)
# ----------------------------------------------------------
@@ -331,7 +331,7 @@ m4_define([b4_c_knr_formal_decl],
# -----------------------------------------------------------
# Declare the function NAME.
m4_define([b4_c_function_decl],
-[#if defined (__STDC__) || defined (__cplusplus)
+[#if defined __STDC__ || defined __cplusplus
b4_c_ansi_function_decl($@)
#else
$2 $1 ();
Index: data/glr.c
===================================================================
RCS file: /cvsroot/bison/bison/data/glr.c,v
retrieving revision 1.160
diff -b -p -u -r1.160 glr.c
--- data/glr.c 20 Jan 2006 00:08:30 -0000 1.160
+++ data/glr.c 22 Jan 2006 07:36:43 -0000
@@ -171,7 +171,7 @@ m4_define([b4_shared_declarations],
/* Copy the first part of user declarations. */
]b4_pre_prologue[
-#if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED)
+#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
]m4_ifdef([b4_stype],
[typedef union m4_bregexp(b4_stype, [^{], [YYSTYPE ])
b4_stype
@@ -183,7 +183,7 @@ b4_syncline(address@hidden@], address@hidden@])
# define YYSTYPE_IS_TRIVIAL 1
#endif
-#if ! defined (YYLTYPE) && ! defined (YYLTYPE_IS_DECLARED)
+#if ! defined YYLTYPE && ! defined YYLTYPE_IS_DECLARED
typedef struct YYLTYPE
{
]b4_location_if([
@@ -253,7 +253,7 @@ b4_syncline(address@hidden@], address@hidden@])
#endif
/* Suppress unused-variable warnings by "using" E. */
-#if !defined (lint) || defined (__GNUC__)
+#if ! defined lint || defined __GNUC__
# define YYUSE(e) ((void) (e))
#else
# define YYUSE(e) /* empty */
@@ -302,7 +302,7 @@ b4_syncline(address@hidden@], address@hidden@])
#ifndef __attribute__
/* This feature is available in gcc versions 2.5 and later. */
-# if (!defined (__GNUC__) || __GNUC__ < 2 \
+# if (! defined __GNUC__ || __GNUC__ < 2 \
|| (__GNUC__ == 2 && __GNUC_MINOR__ < 5) || __STRICT_ANSI__)
# define __attribute__(Spec) /* empty */
# endif
@@ -563,9 +563,9 @@ typedef enum { yyok, yyaccept, yyabort,
#if YYDEBUG
-#if ! defined (YYFPRINTF)
+# ifndef YYFPRINTF
# define YYFPRINTF fprintf
-#endif
+# endif
# define YYDPRINTF(Args) \
do { \
@@ -621,9 +621,9 @@ int yydebug;
#define YYHEADROOM 2
#ifndef YYSTACKEXPANDABLE
-# if (! defined (__cplusplus) \
- || (]b4_location_if([[defined (YYLTYPE_IS_TRIVIAL) && YYLTYPE_IS_TRIVIAL
\
- && ]])[defined (YYSTYPE_IS_TRIVIAL) && YYSTYPE_IS_TRIVIAL))
+# if (! defined __cplusplus \
+ || (]b4_location_if([[defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL \
+ && ]])[defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL))
# define YYSTACKEXPANDABLE 1
# else
# define YYSTACKEXPANDABLE 0
@@ -648,7 +648,7 @@ int yydebug;
#if YYERROR_VERBOSE
# ifndef yystpcpy
-# if defined (__GLIBC__) && defined (_STRING_H) && defined (_GNU_SOURCE)
+# if defined __GLIBC__ && defined _STRING_H && defined _GNU_SOURCE
# define yystpcpy stpcpy
# else
/* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in
Index: data/glr.cc
===================================================================
RCS file: /cvsroot/bison/bison/data/glr.cc,v
retrieving revision 1.11
diff -b -p -u -r1.11 glr.cc
--- data/glr.cc 3 Jan 2006 20:25:54 -0000 1.11
+++ data/glr.cc 22 Jan 2006 07:36:43 -0000
@@ -294,7 +294,7 @@ namespace yy
{
public:
/// Symbol semantic values.
-#if ! defined (YYSTYPE)
+#ifndef YYSTYPE
]m4_ifdef([b4_stype],
[ union semantic_type
b4_stype
Index: data/lalr1.cc
===================================================================
RCS file: /cvsroot/bison/bison/data/lalr1.cc,v
retrieving revision 1.120
diff -b -p -u -r1.120 lalr1.cc
--- data/lalr1.cc 20 Jan 2006 00:08:30 -0000 1.120
+++ data/lalr1.cc 22 Jan 2006 07:36:43 -0000
@@ -102,7 +102,7 @@ namespace yy
{
public:
/// Symbol semantic values.
-#if ! defined (YYSTYPE)
+#ifndef YYSTYPE
]m4_ifdef([b4_stype],
[ union semantic_type
b4_stype
Index: data/yacc.c
===================================================================
RCS file: /cvsroot/bison/bison/data/yacc.c,v
retrieving revision 1.130
diff -b -p -u -r1.130 yacc.c
--- data/yacc.c 20 Jan 2006 00:08:30 -0000 1.130
+++ data/yacc.c 22 Jan 2006 07:36:43 -0000
@@ -187,9 +187,9 @@ b4_location_if([#define yylloc b4_prefix
# define YYTOKEN_TABLE ]b4_token_table[
#endif
-#if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED)
+#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
]m4_ifdef([b4_stype],
-[typedef union m4_bregexp(b4_stype, [^{], [YYSTYPE ])
+[typedef union[]m4_bregexp(b4_stype, [^{], [ YYSTYPE])
b4_stype
/* Line __line__ of yacc.c. */
b4_syncline(address@hidden@], address@hidden@])
@@ -200,7 +200,7 @@ b4_syncline(address@hidden@], address@hidden@])
# define YYSTYPE_IS_TRIVIAL 1
#endif
-]b4_location_if([#if ! defined (YYLTYPE) && ! defined (YYLTYPE_IS_DECLARED)
+]b4_location_if([#if ! defined YYLTYPE && ! defined YYLTYPE_IS_DECLARED
typedef struct YYLTYPE
{
int first_line;
@@ -221,11 +221,11 @@ typedef struct YYLTYPE
b4_syncline(address@hidden@], address@hidden@])[
#ifndef YYSIZE_T
-# if defined (__SIZE_TYPE__)
+# ifdef __SIZE_TYPE__
# define YYSIZE_T __SIZE_TYPE__
-# elif defined (size_t)
+# elif defined size_t
# define YYSIZE_T size_t
-# elif ! defined (YYSIZE_T) && ]b4_c_modern[
+# elif ! defined YYSIZE_T && ]b4_c_modern[
# include <stddef.h> /* INFRINGES ON USER NAME SPACE */
# define YYSIZE_T size_t
# else
@@ -248,7 +248,7 @@ b4_syncline(address@hidden@], address@hidden@])[
#endif
/* Suppress unused-variable warnings by "using" E. */
-#if !defined (lint) || defined (__GNUC__)
+#if ! defined lint || defined __GNUC__
# define YYUSE(e) ((void) (e))
#else
# define YYUSE(e) /* empty */
@@ -264,7 +264,7 @@ b4_syncline(address@hidden@], address@hidden@])[
}
#endif
-#if ! defined (yyoverflow) || YYERROR_VERBOSE
+#if ! defined yyoverflow || YYERROR_VERBOSE
/* The parser invokes alloca or malloc; define the necessary symbols. */
@@ -272,16 +272,16 @@ b4_syncline(address@hidden@], address@hidden@])[
# if YYSTACK_USE_ALLOCA
# ifdef __GNUC__
# define YYSTACK_ALLOC __builtin_alloca
-# elif defined (__BUILTIN_VA_ARG_INCR)
+# elif defined __BUILTIN_VA_ARG_INCR
# include <alloca.h> /* INFRINGES ON USER NAME SPACE */
-# elif defined (_AIX)
+# elif defined _AIX
# define YYSTACK_ALLOC __alloca
-# elif defined (_MSC_VER)
+# elif defined _MSC_VER
# include <malloc.h> /* INFRINGES ON USER NAME SPACE */
# define alloca _alloca
# else
# define YYSTACK_ALLOC alloca
-# if ! defined (_ALLOCA_H) && ! defined (_STDLIB_H) && ]b4_c_modern[
+# if ! defined _ALLOCA_H && ! defined _STDLIB_H && ]b4_c_modern[
# include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
# ifndef _STDLIB_H
# define _STDLIB_H 1
@@ -312,13 +312,13 @@ extern "C" {
# endif
# ifndef YYMALLOC
# define YYMALLOC malloc
-# if ! defined (malloc) && ! defined (_STDLIB_H) && ]b4_c_modern[
+# if ! defined malloc && ! defined _STDLIB_H && ]b4_c_modern[
void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */
# endif
# endif
# ifndef YYFREE
# define YYFREE free
-# if ! defined (free) && ! defined (_STDLIB_H) && ]b4_c_modern[
+# if ! defined free && ! defined _STDLIB_H && ]b4_c_modern[
void free (void *); /* INFRINGES ON USER NAME SPACE */
# endif
# endif
@@ -326,13 +326,13 @@ void free (void *); /* INFRINGES ON USER
}
# endif
# endif
-#endif /* ! defined (yyoverflow) || YYERROR_VERBOSE */
+#endif /* ! defined yyoverflow || YYERROR_VERBOSE */
-#if (! defined (yyoverflow) \
- && (! defined (__cplusplus) \
- || (]b4_location_if([[defined (YYLTYPE_IS_TRIVIAL) &&
YYLTYPE_IS_TRIVIAL \
- && ]])[defined (YYSTYPE_IS_TRIVIAL) && YYSTYPE_IS_TRIVIAL)))
+#if (! defined yyoverflow \
+ && (! defined __cplusplus \
+ || (]b4_location_if([[defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL
\
+ && ]])[defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL)))
/* A type that is properly aligned for any stack member. */
union yyalloc
@@ -359,7 +359,7 @@ union yyalloc
/* Copy COUNT objects from FROM to TO. The source and destination do
not overlap. */
# ifndef YYCOPY
-# if defined (__GNUC__) && 1 < __GNUC__
+# if defined __GNUC__ && 1 < __GNUC__
# define YYCOPY(To, From, Count) \
__builtin_memcpy (To, From, (Count) * sizeof (*(From)))
# else
@@ -730,7 +730,7 @@ int yydebug;
#if YYERROR_VERBOSE
# ifndef yystrlen
-# if defined (__GLIBC__) && defined (_STRING_H)
+# if defined __GLIBC__ && defined _STRING_H
# define yystrlen strlen
# else
/* Return the length of YYSTR. */
@@ -746,7 +746,7 @@ int yydebug;
# endif
# ifndef yystpcpy
-# if defined (__GLIBC__) && defined (_STRING_H) && defined (_GNU_SOURCE)
+# if defined __GLIBC__ && defined _STRING_H && defined _GNU_SOURCE
# define yystpcpy stpcpy
# else
/* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in
@@ -1475,9 +1475,9 @@ b4_copyright([Skeleton parser for Yacc-l
b4_token_enums_defines(b4_tokens)
-#if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED)
+#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
m4_ifdef([b4_stype],
-[typedef union m4_bregexp(b4_stype, [^{], [YYSTYPE ])
+[typedef union[]m4_bregexp(b4_stype, [^{], [ YYSTYPE])
b4_stype
/* Line __line__ of yacc.c. */
b4_syncline(address@hidden@], address@hidden@])
@@ -1492,7 +1492,7 @@ b4_pure_if([],
[extern YYSTYPE b4_prefix[]lval;])
b4_location_if(
-[#if ! defined (YYLTYPE) && ! defined (YYLTYPE_IS_DECLARED)
+[#if ! defined YYLTYPE && ! defined YYLTYPE_IS_DECLARED
typedef struct YYLTYPE
{
int first_line;
Index: djgpp/Makefile.maint
===================================================================
RCS file: /cvsroot/bison/bison/djgpp/Makefile.maint,v
retrieving revision 1.3
diff -b -p -u -r1.3 Makefile.maint
--- djgpp/Makefile.maint 20 Dec 2005 23:59:50 -0000 1.3
+++ djgpp/Makefile.maint 22 Jan 2006 07:36:43 -0000
@@ -1,6 +1,22 @@
# DJGPP Maintainer's Makefile
-*-Makefile-*-
# Requires GNU sed
+## Copyright (C) 2005, 2006 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
+## the Free Software Foundation; either version 2, or (at your option)
+## any later version.
+
+## This program is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+## GNU General Public License for more details.
+
+## 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.
+
top_srcdir = ..
srcdir = .
Index: djgpp/README.in
===================================================================
RCS file: /cvsroot/bison/bison/djgpp/README.in,v
retrieving revision 1.2
diff -b -p -u -r1.2 README.in
--- djgpp/README.in 21 Dec 2005 00:01:40 -0000 1.2
+++ djgpp/README.in 22 Jan 2006 07:36:43 -0000
@@ -1,5 +1,21 @@
This is a port of GNU Bison @VERSION@ to MSDOS/DJGPP.
+Copyright (C) 2005 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
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+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.
+
1.: DJGPP specific changes.
=======================
Index: djgpp/config.bat
===================================================================
RCS file: /cvsroot/bison/bison/djgpp/config.bat,v
retrieving revision 1.3
diff -b -p -u -r1.3 config.bat
--- djgpp/config.bat 21 Dec 2005 00:01:17 -0000 1.3
+++ djgpp/config.bat 22 Jan 2006 07:36:43 -0000
@@ -1,8 +1,26 @@
@echo off
+Rem Configure Bison for DJGPP.
+
Rem WARNING WARNING WARNING: This file needs to have DOS CRLF end-of-line
Rem format, or else stock DOS/Windows shells will refuse to run it.
-echo Configuring GNU Bison for DJGPP v2.x...
+Rem Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+
+Rem This program is free software; you can redistribute it and/or modify
+Rem it under the terms of the GNU General Public License as published by
+Rem the Free Software Foundation; either version 2, or (at your option)
+Rem any later version.
+
+Rem This program is distributed in the hope that it will be useful,
+Rem but WITHOUT ANY WARRANTY; without even the implied warranty of
+Rem MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+Rem GNU General Public License for more details.
+
+Rem You should have received a copy of the GNU General Public License
+Rem along with this program; if not, write to the Free Software Foundation,
+Rem Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+echo Configuring Bison for DJGPP v2.x...
Rem The SmallEnv tests protect against fixed and too small size
Rem of the environment in stock DOS shell.
Index: djgpp/config.sed
===================================================================
RCS file: /cvsroot/bison/bison/djgpp/config.sed,v
retrieving revision 1.3
diff -b -p -u -r1.3 config.sed
--- djgpp/config.sed 19 Jan 2006 05:53:41 -0000 1.3
+++ djgpp/config.sed 22 Jan 2006 07:36:43 -0000
@@ -13,9 +13,8 @@
# GNU General Public License for more details.
# 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
+# along with this program; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
# Additional editing of Makefiles
/(echo[ ]*':t/ a\
Index: djgpp/config.site
===================================================================
RCS file: /cvsroot/bison/bison/djgpp/config.site,v
retrieving revision 1.1
diff -b -p -u -r1.1 config.site
--- djgpp/config.site 2 Oct 2005 16:12:27 -0000 1.1
+++ djgpp/config.site 22 Jan 2006 07:36:43 -0000
@@ -3,6 +3,23 @@
# This is the config.site file for configuring GNU packages
# which are to be built with DJGPP tools.
+# Copyright (C) 2005 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
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+
+# 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.
+
+
# Include the djgpp subdirectory in PATH, so that getconf is found
PATH="$srcdir/djgpp;$PATH"
Index: djgpp/config_h.sed
===================================================================
RCS file: /cvsroot/bison/bison/djgpp/config_h.sed,v
retrieving revision 1.1
diff -b -p -u -r1.1 config_h.sed
--- djgpp/config_h.sed 2 Oct 2005 16:12:54 -0000 1.1
+++ djgpp/config_h.sed 22 Jan 2006 07:36:43 -0000
@@ -1,5 +1,22 @@
# sed script for DJGPP specific editing of config.hin
+# Copyright (C) 2005, 2006 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
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+
+# 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.
+
+
$ a\
\
\
@@ -10,6 +27,3 @@ $ a\
#define OUTPUT_EXT ((pathconf(NULL, _PC_NAME_MAX) > 12) ? ".output" : ".out")\
\
#define DEFAULT_TMPDIR "/dev/env/DJDIR/tmp"
-
-
-
Index: djgpp/djunpack.bat
===================================================================
RCS file: /cvsroot/bison/bison/djgpp/djunpack.bat,v
retrieving revision 1.1
diff -b -p -u -r1.1 djunpack.bat
--- djgpp/djunpack.bat 20 Dec 2005 23:55:02 -0000 1.1
+++ djgpp/djunpack.bat 22 Jan 2006 07:36:43 -0000
@@ -7,6 +7,23 @@ Rem This batch file unpacks the Bison di
Rem renaming some of the files whose names are invalid on DOS or conflict
Rem with other file names after truncation to DOS 8+3 namespace.
Rem
+Rem Copyright (C) 2005 Free Software Foundation, Inc.
+Rem
+Rem This program is free software; you can redistribute it and/or modify
+Rem it under the terms of the GNU General Public License as published by
+Rem the Free Software Foundation; either version 2, or (at your option)
+Rem any later version.
+Rem
+Rem This program is distributed in the hope that it will be useful,
+Rem but WITHOUT ANY WARRANTY; without even the implied warranty of
+Rem MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+Rem GNU General Public License for more details.
+Rem
+Rem You should have received a copy of the GNU General Public License
+Rem along with this program; if not, write to the Free Software Foundation,
+Rem Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+Rem
+Rem
Rem Invoke like this:
Rem
Rem djunpack bison-XYZ.tar
Index: djgpp/subpipe.c
===================================================================
RCS file: /cvsroot/bison/bison/djgpp/subpipe.c,v
retrieving revision 1.1
diff -b -p -u -r1.1 subpipe.c
--- djgpp/subpipe.c 2 Oct 2005 16:14:13 -0000 1.1
+++ djgpp/subpipe.c 22 Jan 2006 07:36:43 -0000
@@ -1,6 +1,6 @@
/* Subprocesses with pipes.
- Copyright (C) 2005 Free Software Foundation, Inc.
+ Copyright (C) 2005, 2006 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
@@ -19,7 +19,7 @@
/* Written by Juan Manuel Guerrero <address@hidden>. */
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
Index: djgpp/subpipe.h
===================================================================
RCS file: /cvsroot/bison/bison/djgpp/subpipe.h,v
retrieving revision 1.1
diff -b -p -u -r1.1 subpipe.h
--- djgpp/subpipe.h 2 Oct 2005 16:15:22 -0000 1.1
+++ djgpp/subpipe.h 22 Jan 2006 07:36:43 -0000
@@ -1,22 +1,19 @@
/* Subprocesses with pipes.
Copyright (C) 2005 Free Software Foundation, Inc.
- This file is part of Bison, the GNU Compiler Compiler.
-
- Bison is free software; you can redistribute it and/or modify it
- under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2, or (at your option)
- any later version.
-
- Bison is distributed in the hope that it will be useful, but WITHOUT
- ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public
- License for more details.
+ 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
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with Bison; see the file COPYING. If not, write to the Free
- Software Foundation, 59 Temple Place - Suite 330, Boston, MA
- 02111-1307, USA. */
+ along with this program; if not, write to the Free Software Foundation,
+ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
/* Written by Juan Manuel Guerrero <address@hidden>. */
Index: lib/abitset.c
===================================================================
RCS file: /cvsroot/bison/bison/lib/abitset.c,v
retrieving revision 1.11
diff -b -p -u -r1.11 abitset.c
--- lib/abitset.c 21 Jan 2006 04:35:09 -0000 1.11
+++ lib/abitset.c 22 Jan 2006 07:36:43 -0000
@@ -13,12 +13,11 @@
GNU General Public License for more details.
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.
-*/
+ along with this program; if not, write to the Free Software Foundation,
+ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
#ifdef HAVE_CONFIG_H
-#include "config.h"
+# include <config.h>
#endif
#include "abitset.h"
Index: lib/bitset.c
===================================================================
RCS file: /cvsroot/bison/bison/lib/bitset.c,v
retrieving revision 1.17
diff -b -p -u -r1.17 bitset.c
--- lib/bitset.c 21 Jan 2006 04:35:09 -0000 1.17
+++ lib/bitset.c 22 Jan 2006 07:36:43 -0000
@@ -13,11 +13,11 @@
GNU General Public License for more details.
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. */
+ along with this program; if not, write to the Free Software Foundation,
+ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
#ifdef HAVE_CONFIG_H
-#include "config.h"
+# include <config.h>
#endif
#include <stdlib.h>
Index: lib/bitset_stats.c
===================================================================
RCS file: /cvsroot/bison/bison/lib/bitset_stats.c,v
retrieving revision 1.18
diff -b -p -u -r1.18 bitset_stats.c
--- lib/bitset_stats.c 21 Jan 2006 04:35:09 -0000 1.18
+++ lib/bitset_stats.c 22 Jan 2006 07:36:43 -0000
@@ -13,20 +13,18 @@
GNU General Public License for more details.
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.
-*/
+ along with this program; if not, write to the Free Software Foundation,
+ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
/* This file is a wrapper bitset implementation for the other bitset
implementations. It provides bitset compatibility checking and
statistics gathering without having to instrument the bitset
implementations. When statistics gathering is enabled, the bitset
operations get vectored through here and we then call the appropriate
- routines.
-*/
+ routines. */
#ifdef HAVE_CONFIG_H
-#include "config.h"
+# include <config.h>
#endif
#include "bbitset.h"
Index: lib/bitsetv-print.c
===================================================================
RCS file: /cvsroot/bison/bison/lib/bitsetv-print.c,v
retrieving revision 1.4
diff -b -p -u -r1.4 bitsetv-print.c
--- lib/bitsetv-print.c 14 May 2005 06:49:47 -0000 1.4
+++ lib/bitsetv-print.c 22 Jan 2006 07:36:43 -0000
@@ -1,25 +1,22 @@
/* Bitset vectors.
- Copyright (C) 2001, 2002, 2004 Free Software Foundation, Inc.
+ Copyright (C) 2001, 2002, 2004, 2006 Free Software Foundation, Inc.
-This file is part of Bison.
-
-Bison is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free
-Software Foundation; either version 2, or (at your option) any later
-version.
-
-Bison is distributed in the hope that it will be useful, but WITHOUT ANY
-WARRANTY; without even the implied warranty of MERCHANTABILITY or
-FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-for more details.
-
-You should have received a copy of the GNU General Public License
-along with Bison; see the file COPYING. If not, write to the Free
-Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301, USA. */
+ 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
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ 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. */
#ifdef HAVE_CONFIG_H
-#include "config.h"
+# include <config.h>
#endif
#include <stdlib.h>
Index: lib/bitsetv.c
===================================================================
RCS file: /cvsroot/bison/bison/lib/bitsetv.c,v
retrieving revision 1.14
diff -b -p -u -r1.14 bitsetv.c
--- lib/bitsetv.c 5 Oct 2005 06:39:07 -0000 1.14
+++ lib/bitsetv.c 22 Jan 2006 07:36:43 -0000
@@ -1,25 +1,22 @@
/* Bitset vectors.
- Copyright (C) 2001, 2002, 2004, 2005 Free Software Foundation, Inc.
+ Copyright (C) 2001, 2002, 2004, 2005, 2006 Free Software Foundation, Inc.
-This file is part of GCC.
-
-GCC is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free
-Software Foundation; either version 2, or (at your option) any later
-version.
-
-GCC is distributed in the hope that it will be useful, but WITHOUT ANY
-WARRANTY; without even the implied warranty of MERCHANTABILITY or
-FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-for more details.
-
-You should have received a copy of the GNU General Public License
-along with GCC; see the file COPYING. If not, write to the Free
-Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301, USA. */
+ 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
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ 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. */
#ifdef HAVE_CONFIG_H
-#include "config.h"
+# include <config.h>
#endif
#include <stdlib.h>
Index: lib/ebitset.c
===================================================================
RCS file: /cvsroot/bison/bison/lib/ebitset.c,v
retrieving revision 1.17
diff -b -p -u -r1.17 ebitset.c
--- lib/ebitset.c 21 Jan 2006 04:35:09 -0000 1.17
+++ lib/ebitset.c 22 Jan 2006 07:36:43 -0000
@@ -13,12 +13,11 @@
GNU General Public License for more details.
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.
-*/
+ along with this program; if not, write to the Free Software Foundation,
+ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
#ifdef HAVE_CONFIG_H
-#include "config.h"
+# include <config.h>
#endif
#include "ebitset.h"
@@ -210,7 +209,7 @@ ebitset_elt_alloc (void)
#define OBSTACK_CHUNK_FREE free
#endif
-#if !defined(__GNUC__) || (__GNUC__ < 2)
+#if ! defined __GNUC__ || __GNUC__ < 2
#define __alignof__(type) 0
#endif
Index: lib/get-errno.c
===================================================================
RCS file: /cvsroot/bison/bison/lib/get-errno.c,v
retrieving revision 1.2
diff -b -p -u -r1.2 get-errno.c
--- lib/get-errno.c 14 May 2005 06:49:47 -0000 1.2
+++ lib/get-errno.c 22 Jan 2006 07:36:43 -0000
@@ -1,6 +1,6 @@
-/* get-errno.h - get and set errno.
+/* get-errno.c - get and set errno.
- Copyright (C) 2002 Free Software Foundation, Inc.
+ Copyright (C) 2002, 2006 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
@@ -18,7 +18,7 @@
/* Written by Paul Eggert. */
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
Index: lib/lbitset.c
===================================================================
RCS file: /cvsroot/bison/bison/lib/lbitset.c,v
retrieving revision 1.19
diff -b -p -u -r1.19 lbitset.c
--- lib/lbitset.c 21 Jan 2006 04:35:09 -0000 1.19
+++ lib/lbitset.c 22 Jan 2006 07:36:44 -0000
@@ -13,12 +13,11 @@
GNU General Public License for more details.
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.
-*/
+ along with this program; if not, write to the Free Software Foundation,
+ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
#ifdef HAVE_CONFIG_H
-#include "config.h"
+# include <config.h>
#endif
#include "lbitset.h"
@@ -121,7 +120,7 @@ lbitset_elt_alloc (void)
#define OBSTACK_CHUNK_FREE free
#endif
-#if !defined(__GNUC__) || (__GNUC__ < 2)
+#if ! defined __GNUC__ || __GNUC__ < 2
#define __alignof__(type) 0
#endif
Index: lib/subpipe.c
===================================================================
RCS file: /cvsroot/bison/bison/lib/subpipe.c,v
retrieving revision 1.9
diff -b -p -u -r1.9 subpipe.c
--- lib/subpipe.c 20 Jan 2006 00:08:30 -0000 1.9
+++ lib/subpipe.c 22 Jan 2006 07:36:44 -0000
@@ -19,7 +19,7 @@
/* Written by Paul Eggert <address@hidden>
and Florian Krohm <address@hidden>. */
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
@@ -73,7 +73,7 @@
#ifndef __attribute__
/* This feature is available in gcc versions 2.5 and later. */
-# if !defined (__GNUC__) || __GNUC__ < 2 || \
+# if ! defined __GNUC__ || __GNUC__ < 2 || \
(__GNUC__ == 2 && __GNUC_MINOR__ < 5) || __STRICT_ANSI__
# define __attribute__(Spec) /* empty */
# endif
Index: lib/subpipe.h
===================================================================
RCS file: /cvsroot/bison/bison/lib/subpipe.h,v
retrieving revision 1.4
diff -b -p -u -r1.4 subpipe.h
--- lib/subpipe.h 2 Oct 2005 16:59:31 -0000 1.4
+++ lib/subpipe.h 22 Jan 2006 07:36:44 -0000
@@ -1,22 +1,19 @@
/* Subprocesses with pipes.
Copyright (C) 2002, 2004 Free Software Foundation, Inc.
- This file is part of Bison, the GNU Compiler Compiler.
-
- Bison is free software; you can redistribute it and/or modify it
- under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2, or (at your option)
- any later version.
-
- Bison is distributed in the hope that it will be useful, but WITHOUT
- ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public
- License for more details.
+ 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
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with Bison; see the file COPYING. If not, write to the Free
- Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
- 02110-1301, USA. */
+ along with this program; if not, write to the Free Software Foundation,
+ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
/* Written by Paul Eggert <address@hidden>
and Florian Krohm <address@hidden>. */
Index: lib/timevar.c
===================================================================
RCS file: /cvsroot/bison/bison/lib/timevar.c,v
retrieving revision 1.9
diff -b -p -u -r1.9 timevar.c
--- lib/timevar.c 9 Dec 2005 23:51:25 -0000 1.9
+++ lib/timevar.c 22 Jan 2006 07:36:44 -0000
@@ -1,25 +1,24 @@
/* Timing variables for measuring compiler performance.
- Copyright (C) 2000, 2002, 2004, 2005 Free Software Foundation, Inc.
+ Copyright (C) 2000, 2002, 2004, 2005, 2006 Free Software Foundation, Inc.
Contributed by Alex Samuel <address@hidden>
-This file is part of Bison, the GNU Compiler Compiler.
+ 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
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ 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. */
-Bison is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free
-Software Foundation; either version 2, or (at your option) any later
-version.
-
-Bison is distributed in the hope that it will be useful, but WITHOUT ANY
-WARRANTY; without even the implied warranty of MERCHANTABILITY or
-FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-for more details.
-
-You should have received a copy of the GNU General Public License
-along with Bison; see the file COPYING. If not, write to the Free
-Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301, USA. */
-
-#include "config.h"
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
#if IN_GCC
@@ -448,7 +447,7 @@ timevar_print (fp)
FILE *fp;
{
/* Only print stuff if we have some sort of time information. */
-#if defined (HAVE_USER_TIME) || defined (HAVE_SYS_TIME) || defined
(HAVE_WALL_TIME)
+#if defined HAVE_USER_TIME || defined HAVE_SYS_TIME || defined HAVE_WALL_TIME
unsigned int /* timevar_id_t */ id;
struct timevar_time_def *total = &timevars[TV_TOTAL].elapsed;
struct timevar_time_def now;
Index: lib/timevar.h
===================================================================
RCS file: /cvsroot/bison/bison/lib/timevar.h,v
retrieving revision 1.5
diff -b -p -u -r1.5 timevar.h
--- lib/timevar.h 14 May 2005 06:49:47 -0000 1.5
+++ lib/timevar.h 22 Jan 2006 07:36:44 -0000
@@ -2,22 +2,19 @@
Copyright (C) 2000, 2002, 2004 Free Software Foundation, Inc.
Contributed by Alex Samuel <address@hidden>
- This file is part of Bison, the GNU Compiler Compiler.
-
- Bison is free software; you can redistribute it and/or modify it
- under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2, or (at your option)
- any later version.
-
- Bison is distributed in the hope that it will be useful, but WITHOUT
- ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public
- License for more details.
+ 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
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with Bison; see the file COPYING. If not, write to the Free
- Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
- 02110-1301, USA. */
+ along with this program; if not, write to the Free Software Foundation,
+ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
#ifndef GCC_TIMEVAR_H
#define GCC_TIMEVAR_H
Index: lib/vbitset.c
===================================================================
RCS file: /cvsroot/bison/bison/lib/vbitset.c,v
retrieving revision 1.6
diff -b -p -u -r1.6 vbitset.c
--- lib/vbitset.c 25 May 2005 19:48:00 -0000 1.6
+++ lib/vbitset.c 22 Jan 2006 07:36:44 -0000
@@ -1,5 +1,5 @@
/* Variable array bitsets.
- Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+ Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
Contributed by Michael Hayes (address@hidden).
This program is free software; you can redistribute it and/or modify
@@ -13,12 +13,11 @@
GNU General Public License for more details.
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.
-*/
+ along with this program; if not, write to the Free Software Foundation,
+ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
#ifdef HAVE_CONFIG_H
-#include "config.h"
+# include <config.h>
#endif
#include "vbitset.h"
Index: src/scan-gram.l
===================================================================
RCS file: /cvsroot/bison/bison/src/scan-gram.l,v
retrieving revision 1.82
diff -b -p -u -r1.82 scan-gram.l
--- src/scan-gram.l 3 Jan 2006 21:31:57 -0000 1.82
+++ src/scan-gram.l 22 Jan 2006 07:36:44 -0000
@@ -40,7 +40,6 @@
#include "gram.h"
#include "quotearg.h"
#include "reader.h"
-#include "verify.h"
#include "uniqstr.h"
#define YY_USER_INIT \
Index: src/system.h
===================================================================
RCS file: /cvsroot/bison/bison/src/system.h,v
retrieving revision 1.75
diff -b -p -u -r1.75 system.h
--- src/system.h 21 Jan 2006 04:35:09 -0000 1.75
+++ src/system.h 22 Jan 2006 07:36:44 -0000
@@ -92,8 +92,8 @@ char *base_name (char const *name);
#ifndef __attribute__
/* This feature is available in gcc versions 2.5 and later. */
-# if !defined (__GNUC__) || __GNUC__ < 2 || \
-(__GNUC__ == 2 && __GNUC_MINOR__ < 5) || __STRICT_ANSI__
+# if (! defined __GNUC__ || __GNUC__ < 2 \
+ || (__GNUC__ == 2 && __GNUC_MINOR__ < 5) || __STRICT_ANSI__)
# define __attribute__(Spec) /* empty */
# endif
#endif
Index: tests/local.at
===================================================================
RCS file: /cvsroot/bison/bison/tests/local.at,v
retrieving revision 1.13
diff -b -p -u -r1.13 local.at
--- tests/local.at 3 Jan 2006 09:06:22 -0000 1.13
+++ tests/local.at 22 Jan 2006 07:36:44 -0000
@@ -144,7 +144,7 @@ m4_popdef([AT_LALR1_CC_IF])
# meant to be compiled.
m4_define([AT_DATA_GRAMMAR_PROLOGUE],
[[%{
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
# include <config.h>
/* We don't need perfect functions for these tests. */
# undef malloc
Index: tests/output.at
===================================================================
RCS file: /cvsroot/bison/bison/tests/output.at,v
retrieving revision 1.9
diff -b -p -u -r1.9 output.at
--- /dev/null 2005-09-24 22:00:15.000000000 -0700
+++ .x-sc_require_config_h 2006-01-21 23:33:48.000000000 -0800
@@ -0,0 +1,3 @@
+data/glr.c
+data/yacc.c
+lib/yyerror.c
--- /dev/null 2005-09-24 22:00:15.000000000 -0700
+++ .x-sc_unmarked_diagnostics 2006-01-21 21:56:56.000000000 -0800
@@ -0,0 +1 @@
+doc/bison.texinfo
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- "make syntax-check" fixes for Bison,
Paul Eggert <=