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

* Makefile.cfg (local-checks-to-skip): Add changelog-check,

Browse Source 
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.
This commit is contained in:
Paul Eggert
2006-01-22 07:38:49 +00:00
parent 68cae94e0b
commit 02650b7f0e
34 changed files with 736 additions and 584 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
ChangeLog
View File

@@ -1,3 +1,61 @@
2006-01-21 Paul Eggert <eggert@cs.ucla.edu>
* 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.
2006-01-20 Paul Eggert <eggert@cs.ucla.edu> 2006-01-20 Paul Eggert <eggert@cs.ucla.edu>
Be a bit more systematic about using 'abort'. Be a bit more systematic about using 'abort'.

8
Makefile.cfg
View File

@@ -1,5 +1,5 @@
# Customize Makefile.maint for Bison. -*- makefile -*- # 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 # 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 # it under the terms of the GNU General Public License as published by
@@ -44,7 +44,5 @@ cvs_files = \
$(build_aux_dir)/mkinstalldirs $(build_aux_dir)/mkinstalldirs
# Tests not to run. # Tests not to run.
# local-checks-to-skip ?= \ local-checks-to-skip = \
# author_mark_check \ changelog-check
# strftime-check syntax-check makefile_path_separator_check \
# makefile-check

40
Makefile.maint
View File

@@ -113,7 +113,7 @@ syntax-check-rules = \
sc_sun_os_names \ sc_sun_os_names \
sc_system_h_headers \ sc_system_h_headers \
sc_tight_scope \ sc_tight_scope \
sc_trailing_space \ sc_trailing_blank \
sc_unmarked_diagnostics \ sc_unmarked_diagnostics \
sc_useless_cpp_parens sc_useless_cpp_parens
@@ -174,10 +174,32 @@ sc_file_system:
'rewrite to use "file system"' 1>&2; \ 'rewrite to use "file system"' 1>&2; \
exit 1; } || : 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: sc_obsolete_symbols:
@grep -nE '\<(\<(HAVE_FCNTL_H|O_NDELAY)\>' \ @grep -nE '\<(HAVE''_FCNTL_H|O''_NDELAY)\>' \
$$($(CVS_LIST_EXCEPT)) && \ $$($(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; } || : 1>&2; exit 1; } || :
# FIXME: warn about definitions of EXIT_FAILURE, EXIT_SUCCESS, STREQ # 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 # Files in src/ should not include directly any of
# the headers already included via system.h. # the headers already included via system.h.
sc_system_h_headers: .re-list 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; \ trap 'rc=$$?; rm -f .re-list; exit $$rc' 0 1 2 3 15; \
grep -nE -f .re-list \ grep -nE -f .re-list \
$$($(CVS_LIST) src | \ $$($(CVS_LIST) src | \
@@ -258,9 +280,9 @@ sc_sun_os_names:
sc_tight_scope: sc_tight_scope:
$(MAKE) -C src $@ $(MAKE) -C src $@
sc_trailing_space: sc_trailing_blank:
@grep -n '[ ]$$' $$($(CVS_LIST_EXCEPT)) && \ @grep -n '[ ]$$' $$($(CVS_LIST_EXCEPT)) && \
{ echo '$(ME): found trailing space(s)' \ { echo '$(ME): found trailing blank(s)' \
1>&2; exit 1; } || : 1>&2; exit 1; } || :
# Look for diagnostics that aren't marked for translation. # Look for diagnostics that aren't marked for translation.
@@ -275,7 +297,7 @@ sc_unmarked_diagnostics:
# Avoid useless parentheses like those in this example: # Avoid useless parentheses like those in this example:
# #if defined (SYMBOL) || defined (SYM2) # #if defined (SYMBOL) || defined (SYM2)
sc_useless_cpp_parens: 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' \ { echo '$(ME): found useless parentheses in cpp directive' \
1>&2; exit 1; } || : 1>&2; exit 1; } || :
@@ -312,7 +334,7 @@ news-date-check: NEWS
fi fi
changelog-check: changelog-check:
if grep 'Version $(VERSION_REGEXP)\.$$' ChangeLog \ if head ChangeLog | grep 'Version $(VERSION_REGEXP)\.$$' \
>/dev/null; then \ >/dev/null; then \
:; \ :; \
else \ else \
@@ -321,7 +343,7 @@ changelog-check:
fi fi
m4-check: 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; \ && { echo 'Makefile.maint: quote the first arg to AC_DEFUN' 1>&2; \
exit 1; } || : exit 1; } || :

6
data/c.m4
View File

@@ -259,8 +259,8 @@ m4_define([b4_token_enums_defines],
# Consider a C++ compiler to be modern if it defines __cplusplus. # Consider a C++ compiler to be modern if it defines __cplusplus.
# #
m4_define([b4_c_modern], m4_define([b4_c_modern],
[[(defined (__STDC__) || defined (__C99__FUNC__) \ [[(defined __STDC__ || defined __C99__FUNC__ \
|| defined (__cplusplus) || defined (_MSC_VER))]]) || defined __cplusplus || defined _MSC_VER)]])
# b4_c_function_def(NAME, RETURN-VALUE, [DECL1, NAME1], ...) # b4_c_function_def(NAME, RETURN-VALUE, [DECL1, NAME1], ...)
# ---------------------------------------------------------- # ----------------------------------------------------------
@@ -331,7 +331,7 @@ m4_define([b4_c_knr_formal_decl],
# ----------------------------------------------------------- # -----------------------------------------------------------
# Declare the function NAME. # Declare the function NAME.
m4_define([b4_c_function_decl], m4_define([b4_c_function_decl],
[#if defined (__STDC__) || defined (__cplusplus) [#if defined __STDC__ || defined __cplusplus
b4_c_ansi_function_decl($@) b4_c_ansi_function_decl($@)
#else #else
$2 $1 (); $2 $1 ();

20
data/glr.c
View File

@@ -171,7 +171,7 @@ m4_define([b4_shared_declarations],
/* Copy the first part of user declarations. */ /* Copy the first part of user declarations. */
]b4_pre_prologue[ ]b4_pre_prologue[
#if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED) #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
]m4_ifdef([b4_stype], ]m4_ifdef([b4_stype],
[typedef union m4_bregexp(b4_stype, [^{], [YYSTYPE ]) [typedef union m4_bregexp(b4_stype, [^{], [YYSTYPE ])
b4_stype b4_stype
@@ -183,7 +183,7 @@ b4_syncline([@oline@], [@ofile@])
# define YYSTYPE_IS_TRIVIAL 1 # define YYSTYPE_IS_TRIVIAL 1
#endif #endif
#if ! defined (YYLTYPE) && ! defined (YYLTYPE_IS_DECLARED) #if ! defined YYLTYPE && ! defined YYLTYPE_IS_DECLARED
typedef struct YYLTYPE typedef struct YYLTYPE
{ {
]b4_location_if([ ]b4_location_if([
@@ -253,7 +253,7 @@ b4_syncline([@oline@], [@ofile@])
#endif #endif
/* Suppress unused-variable warnings by "using" E. */ /* Suppress unused-variable warnings by "using" E. */
#if !defined (lint) || defined (__GNUC__) #if ! defined lint || defined __GNUC__
# define YYUSE(e) ((void) (e)) # define YYUSE(e) ((void) (e))
#else #else
# define YYUSE(e) /* empty */ # define YYUSE(e) /* empty */
@@ -302,7 +302,7 @@ b4_syncline([@oline@], [@ofile@])
#ifndef __attribute__ #ifndef __attribute__
/* This feature is available in gcc versions 2.5 and later. */ /* 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__) || (__GNUC__ == 2 && __GNUC_MINOR__ < 5) || __STRICT_ANSI__)
# define __attribute__(Spec) /* empty */ # define __attribute__(Spec) /* empty */
# endif # endif
@@ -563,9 +563,9 @@ typedef enum { yyok, yyaccept, yyabort, yyerr } YYRESULTTAG;
#if YYDEBUG #if YYDEBUG
#if ! defined (YYFPRINTF) # ifndef YYFPRINTF
# define YYFPRINTF fprintf # define YYFPRINTF fprintf
#endif # endif
# define YYDPRINTF(Args) \ # define YYDPRINTF(Args) \
do { \ do { \
@@ -621,9 +621,9 @@ int yydebug;
#define YYHEADROOM 2 #define YYHEADROOM 2
#ifndef YYSTACKEXPANDABLE #ifndef YYSTACKEXPANDABLE
# if (! defined (__cplusplus) \ # if (! defined __cplusplus \
|| (]b4_location_if([[defined (YYLTYPE_IS_TRIVIAL) && YYLTYPE_IS_TRIVIAL \ || (]b4_location_if([[defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL \
&& ]])[defined (YYSTYPE_IS_TRIVIAL) && YYSTYPE_IS_TRIVIAL)) && ]])[defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL))
# define YYSTACKEXPANDABLE 1 # define YYSTACKEXPANDABLE 1
# else # else
# define YYSTACKEXPANDABLE 0 # define YYSTACKEXPANDABLE 0
@@ -648,7 +648,7 @@ int yydebug;
#if YYERROR_VERBOSE #if YYERROR_VERBOSE
# ifndef yystpcpy # ifndef yystpcpy
# if defined (__GLIBC__) && defined (_STRING_H) && defined (_GNU_SOURCE) # if defined __GLIBC__ && defined _STRING_H && defined _GNU_SOURCE
# define yystpcpy stpcpy # define yystpcpy stpcpy
# else # else
/* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in /* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in

2
data/glr.cc
View File

@@ -294,7 +294,7 @@ namespace yy
{ {
public: public:
/// Symbol semantic values. /// Symbol semantic values.
#if ! defined (YYSTYPE) #ifndef YYSTYPE
]m4_ifdef([b4_stype], ]m4_ifdef([b4_stype],
[ union semantic_type [ union semantic_type
b4_stype b4_stype

2
data/lalr1.cc
View File

@@ -102,7 +102,7 @@ namespace yy
{ {
public: public:
/// Symbol semantic values. /// Symbol semantic values.
#if ! defined (YYSTYPE) #ifndef YYSTYPE
]m4_ifdef([b4_stype], ]m4_ifdef([b4_stype],
[ union semantic_type [ union semantic_type
b4_stype b4_stype

50
data/yacc.c
View File

@@ -187,9 +187,9 @@ b4_location_if([#define yylloc b4_prefix[]lloc])])[
# define YYTOKEN_TABLE ]b4_token_table[ # define YYTOKEN_TABLE ]b4_token_table[
#endif #endif
#if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED) #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
]m4_ifdef([b4_stype], ]m4_ifdef([b4_stype],
[typedef union m4_bregexp(b4_stype, [^{], [YYSTYPE ]) [typedef union[]m4_bregexp(b4_stype, [^{], [ YYSTYPE])
b4_stype b4_stype
/* Line __line__ of yacc.c. */ /* Line __line__ of yacc.c. */
b4_syncline([@oline@], [@ofile@]) b4_syncline([@oline@], [@ofile@])
@@ -200,7 +200,7 @@ b4_syncline([@oline@], [@ofile@])
# define YYSTYPE_IS_TRIVIAL 1 # define YYSTYPE_IS_TRIVIAL 1
#endif #endif
]b4_location_if([#if ! defined (YYLTYPE) && ! defined (YYLTYPE_IS_DECLARED) ]b4_location_if([#if ! defined YYLTYPE && ! defined YYLTYPE_IS_DECLARED
typedef struct YYLTYPE typedef struct YYLTYPE
{ {
int first_line; int first_line;
@@ -221,11 +221,11 @@ typedef struct YYLTYPE
b4_syncline([@oline@], [@ofile@])[ b4_syncline([@oline@], [@ofile@])[
#ifndef YYSIZE_T #ifndef YYSIZE_T
# if defined (__SIZE_TYPE__) # ifdef __SIZE_TYPE__
# define YYSIZE_T __SIZE_TYPE__ # define YYSIZE_T __SIZE_TYPE__
# elif defined (size_t) # elif defined size_t
# define YYSIZE_T 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 */ # include <stddef.h> /* INFRINGES ON USER NAME SPACE */
# define YYSIZE_T size_t # define YYSIZE_T size_t
# else # else
@@ -248,7 +248,7 @@ b4_syncline([@oline@], [@ofile@])[
#endif #endif
/* Suppress unused-variable warnings by "using" E. */ /* Suppress unused-variable warnings by "using" E. */
#if !defined (lint) || defined (__GNUC__) #if ! defined lint || defined __GNUC__
# define YYUSE(e) ((void) (e)) # define YYUSE(e) ((void) (e))
#else #else
# define YYUSE(e) /* empty */ # define YYUSE(e) /* empty */
@@ -264,7 +264,7 @@ b4_syncline([@oline@], [@ofile@])[
} }
#endif #endif
#if ! defined (yyoverflow) || YYERROR_VERBOSE #if ! defined yyoverflow || YYERROR_VERBOSE
/* The parser invokes alloca or malloc; define the necessary symbols. */ /* The parser invokes alloca or malloc; define the necessary symbols. */
@@ -272,16 +272,16 @@ b4_syncline([@oline@], [@ofile@])[
# if YYSTACK_USE_ALLOCA # if YYSTACK_USE_ALLOCA
# ifdef __GNUC__ # ifdef __GNUC__
# define YYSTACK_ALLOC __builtin_alloca # 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 */ # include <alloca.h> /* INFRINGES ON USER NAME SPACE */
# elif defined (_AIX) # elif defined _AIX
# define YYSTACK_ALLOC __alloca # define YYSTACK_ALLOC __alloca
# elif defined (_MSC_VER) # elif defined _MSC_VER
# include <malloc.h> /* INFRINGES ON USER NAME SPACE */ # include <malloc.h> /* INFRINGES ON USER NAME SPACE */
# define alloca _alloca # define alloca _alloca
# else # else
# define YYSTACK_ALLOC alloca # 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 */ # include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
# ifndef _STDLIB_H # ifndef _STDLIB_H
# define _STDLIB_H 1 # define _STDLIB_H 1
@@ -312,13 +312,13 @@ extern "C" {
# endif # endif
# ifndef YYMALLOC # ifndef YYMALLOC
# define YYMALLOC malloc # 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 */ void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */
# endif # endif
# endif # endif
# ifndef YYFREE # ifndef YYFREE
# define YYFREE free # 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 */ void free (void *); /* INFRINGES ON USER NAME SPACE */
# endif # endif
# endif # endif
@@ -326,13 +326,13 @@ void free (void *); /* INFRINGES ON USER NAME SPACE */
} }
# endif # endif
# endif # endif
#endif /* ! defined (yyoverflow) || YYERROR_VERBOSE */ #endif /* ! defined yyoverflow || YYERROR_VERBOSE */
#if (! defined (yyoverflow) \ #if (! defined yyoverflow \
&& (! defined (__cplusplus) \ && (! defined __cplusplus \
|| (]b4_location_if([[defined (YYLTYPE_IS_TRIVIAL) && YYLTYPE_IS_TRIVIAL \ || (]b4_location_if([[defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL \
&& ]])[defined (YYSTYPE_IS_TRIVIAL) && YYSTYPE_IS_TRIVIAL))) && ]])[defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL)))
/* A type that is properly aligned for any stack member. */ /* A type that is properly aligned for any stack member. */
union yyalloc union yyalloc
@@ -359,7 +359,7 @@ union yyalloc
/* Copy COUNT objects from FROM to TO. The source and destination do /* Copy COUNT objects from FROM to TO. The source and destination do
not overlap. */ not overlap. */
# ifndef YYCOPY # ifndef YYCOPY
# if defined (__GNUC__) && 1 < __GNUC__ # if defined __GNUC__ && 1 < __GNUC__
# define YYCOPY(To, From, Count) \ # define YYCOPY(To, From, Count) \
__builtin_memcpy (To, From, (Count) * sizeof (*(From))) __builtin_memcpy (To, From, (Count) * sizeof (*(From)))
# else # else
@@ -730,7 +730,7 @@ int yydebug;
#if YYERROR_VERBOSE #if YYERROR_VERBOSE
# ifndef yystrlen # ifndef yystrlen
# if defined (__GLIBC__) && defined (_STRING_H) # if defined __GLIBC__ && defined _STRING_H
# define yystrlen strlen # define yystrlen strlen
# else # else
/* Return the length of YYSTR. */ /* Return the length of YYSTR. */
@@ -746,7 +746,7 @@ int yydebug;
# endif # endif
# ifndef yystpcpy # ifndef yystpcpy
# if defined (__GLIBC__) && defined (_STRING_H) && defined (_GNU_SOURCE) # if defined __GLIBC__ && defined _STRING_H && defined _GNU_SOURCE
# define yystpcpy stpcpy # define yystpcpy stpcpy
# else # else
/* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in /* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in
@@ -1475,9 +1475,9 @@ b4_copyright([Skeleton parser for Yacc-like parsing with Bison],
b4_token_enums_defines(b4_tokens) b4_token_enums_defines(b4_tokens)
#if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED) #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
m4_ifdef([b4_stype], m4_ifdef([b4_stype],
[typedef union m4_bregexp(b4_stype, [^{], [YYSTYPE ]) [typedef union[]m4_bregexp(b4_stype, [^{], [ YYSTYPE])
b4_stype b4_stype
/* Line __line__ of yacc.c. */ /* Line __line__ of yacc.c. */
b4_syncline([@oline@], [@ofile@]) b4_syncline([@oline@], [@ofile@])
@@ -1492,7 +1492,7 @@ b4_pure_if([],
[extern YYSTYPE b4_prefix[]lval;]) [extern YYSTYPE b4_prefix[]lval;])
b4_location_if( b4_location_if(
[#if ! defined (YYLTYPE) && ! defined (YYLTYPE_IS_DECLARED) [#if ! defined YYLTYPE && ! defined YYLTYPE_IS_DECLARED
typedef struct YYLTYPE typedef struct YYLTYPE
{ {
int first_line; int first_line;

16
djgpp/Makefile.maint
View File

@@ -1,6 +1,22 @@
# DJGPP Maintainer's Makefile -*-Makefile-*- # DJGPP Maintainer's Makefile -*-Makefile-*-
# Requires GNU sed # 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 = .. top_srcdir = ..
srcdir = . srcdir = .

16
djgpp/README.in
View File

@@ -1,5 +1,21 @@
This is a port of GNU Bison @VERSION@ to MSDOS/DJGPP. 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. 1.: DJGPP specific changes.
======================= =======================

20
djgpp/config.bat
View File

@@ -1,8 +1,26 @@
@echo off @echo off
Rem Configure Bison for DJGPP.
Rem WARNING WARNING WARNING: This file needs to have DOS CRLF end-of-line 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. 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 The SmallEnv tests protect against fixed and too small size
Rem of the environment in stock DOS shell. Rem of the environment in stock DOS shell.

5
djgpp/config.sed
View File

@@ -13,9 +13,8 @@
# GNU General Public License for more details. # GNU General Public License for more details.
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software # along with this program; if not, write to the Free Software Foundation,
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
# 02110-1301 USA
# Additional editing of Makefiles # Additional editing of Makefiles
/(echo[ ]*':t/ a\ /(echo[ ]*':t/ a\

17
djgpp/config.site
View File

@@ -3,6 +3,23 @@
# This is the config.site file for configuring GNU packages # This is the config.site file for configuring GNU packages
# which are to be built with DJGPP tools. # 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 # Include the djgpp subdirectory in PATH, so that getconf is found
PATH="$srcdir/djgpp;$PATH" PATH="$srcdir/djgpp;$PATH"

20
djgpp/config_h.sed
View File

@@ -1,5 +1,22 @@
# sed script for DJGPP specific editing of config.hin # 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\ $ a\
\ \
\ \
@@ -10,6 +27,3 @@ $ a\
#define OUTPUT_EXT ((pathconf(NULL, _PC_NAME_MAX) > 12) ? ".output" : ".out")\ #define OUTPUT_EXT ((pathconf(NULL, _PC_NAME_MAX) > 12) ? ".output" : ".out")\
\ \
#define DEFAULT_TMPDIR "/dev/env/DJDIR/tmp" #define DEFAULT_TMPDIR "/dev/env/DJDIR/tmp"

17
djgpp/djunpack.bat
View File

@@ -7,6 +7,23 @@ Rem This batch file unpacks the Bison distribution while simultaneously
Rem renaming some of the files whose names are invalid on DOS or conflict 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 with other file names after truncation to DOS 8+3 namespace.
Rem 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 Invoke like this:
Rem Rem
Rem djunpack bison-XYZ.tar Rem djunpack bison-XYZ.tar

4
djgpp/subpipe.c
View File

@@ -1,6 +1,6 @@
/* Subprocesses with pipes. /* 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 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 it under the terms of the GNU General Public License as published by
@@ -19,7 +19,7 @@
/* Written by Juan Manuel Guerrero <juan.guerrero@gmx.de>. */ /* Written by Juan Manuel Guerrero <juan.guerrero@gmx.de>. */
#if HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
# include <config.h> # include <config.h>
#endif #endif

23
djgpp/subpipe.h
View File

@@ -1,22 +1,19 @@
/* Subprocesses with pipes. /* Subprocesses with pipes.
Copyright (C) 2005 Free Software Foundation, Inc. Copyright (C) 2005 Free Software Foundation, Inc.
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.
Bison is free software; you can redistribute it and/or modify it This program is distributed in the hope that it will be useful,
under the terms of the GNU General Public License as published by but WITHOUT ANY WARRANTY; without even the implied warranty of
the Free Software Foundation; either version 2, or (at your option) MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
any later version. GNU General Public License for more details.
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 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 along with this program; if not, write to the Free Software Foundation,
Software Foundation, 59 Temple Place - Suite 330, Boston, MA Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
02111-1307, USA. */
/* Written by Juan Manuel Guerrero <juan.guerrero@gmx.de>. */ /* Written by Juan Manuel Guerrero <juan.guerrero@gmx.de>. */

7
lib/abitset.c
View File

@@ -13,12 +13,11 @@
GNU General Public License for more details. GNU General Public License for more details.
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software Foundation,
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
*/
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include "config.h" # include <config.h>
#endif #endif
#include "abitset.h" #include "abitset.h"

6
lib/bitset.c
View File

@@ -13,11 +13,11 @@
GNU General Public License for more details. GNU General Public License for more details.
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software Foundation,
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include "config.h" # include <config.h>
#endif #endif
#include <stdlib.h> #include <stdlib.h>

10
lib/bitset_stats.c
View File

@@ -13,20 +13,18 @@
GNU General Public License for more details. GNU General Public License for more details.
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software Foundation,
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
*/
/* This file is a wrapper bitset implementation for the other bitset /* This file is a wrapper bitset implementation for the other bitset
implementations. It provides bitset compatibility checking and implementations. It provides bitset compatibility checking and
statistics gathering without having to instrument the bitset statistics gathering without having to instrument the bitset
implementations. When statistics gathering is enabled, the bitset implementations. When statistics gathering is enabled, the bitset
operations get vectored through here and we then call the appropriate operations get vectored through here and we then call the appropriate
routines. routines. */
*/
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include "config.h" # include <config.h>
#endif #endif
#include "bbitset.h" #include "bbitset.h"

29
lib/bitsetv-print.c
View File

@@ -1,25 +1,22 @@
/* Bitset vectors. /* 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. 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.
Bison is free software; you can redistribute it and/or modify it under This program is distributed in the hope that it will be useful,
the terms of the GNU General Public License as published by the Free but WITHOUT ANY WARRANTY; without even the implied warranty of
Software Foundation; either version 2, or (at your option) any later MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
version. GNU General Public License for more details.
Bison is distributed in the hope that it will be useful, but WITHOUT ANY You should have received a copy of the GNU General Public License
WARRANTY; without even the implied warranty of MERCHANTABILITY or along with this program; if not, write to the Free Software Foundation,
FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
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. */
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include "config.h" # include <config.h>
#endif #endif
#include <stdlib.h> #include <stdlib.h>

29
lib/bitsetv.c
View File

@@ -1,25 +1,22 @@
/* Bitset vectors. /* 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. 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.
GCC is free software; you can redistribute it and/or modify it under This program is distributed in the hope that it will be useful,
the terms of the GNU General Public License as published by the Free but WITHOUT ANY WARRANTY; without even the implied warranty of
Software Foundation; either version 2, or (at your option) any later MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
version. GNU General Public License for more details.
GCC is distributed in the hope that it will be useful, but WITHOUT ANY You should have received a copy of the GNU General Public License
WARRANTY; without even the implied warranty of MERCHANTABILITY or along with this program; if not, write to the Free Software Foundation,
FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
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. */
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include "config.h" # include <config.h>
#endif #endif
#include <stdlib.h> #include <stdlib.h>

9
lib/ebitset.c
View File

@@ -13,12 +13,11 @@
GNU General Public License for more details. GNU General Public License for more details.
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software Foundation,
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
*/
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include "config.h" # include <config.h>
#endif #endif
#include "ebitset.h" #include "ebitset.h"
@@ -210,7 +209,7 @@ ebitset_elt_alloc (void)
#define OBSTACK_CHUNK_FREE free #define OBSTACK_CHUNK_FREE free
#endif #endif
#if !defined(__GNUC__) || (__GNUC__ < 2) #if ! defined __GNUC__ || __GNUC__ < 2
#define __alignof__(type) 0 #define __alignof__(type) 0
#endif #endif

6
lib/get-errno.c
View File

@@ -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 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 it under the terms of the GNU General Public License as published by
@@ -18,7 +18,7 @@
/* Written by Paul Eggert. */ /* Written by Paul Eggert. */
#if HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
# include <config.h> # include <config.h>
#endif #endif

9
lib/lbitset.c
View File

@@ -13,12 +13,11 @@
GNU General Public License for more details. GNU General Public License for more details.
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software Foundation,
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
*/
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include "config.h" # include <config.h>
#endif #endif
#include "lbitset.h" #include "lbitset.h"
@@ -121,7 +120,7 @@ lbitset_elt_alloc (void)
#define OBSTACK_CHUNK_FREE free #define OBSTACK_CHUNK_FREE free
#endif #endif
#if !defined(__GNUC__) || (__GNUC__ < 2) #if ! defined __GNUC__ || __GNUC__ < 2
#define __alignof__(type) 0 #define __alignof__(type) 0
#endif #endif

4
lib/subpipe.c
View File

@@ -19,7 +19,7 @@
/* Written by Paul Eggert <eggert@twinsun.com> /* Written by Paul Eggert <eggert@twinsun.com>
and Florian Krohm <florian@edamail.fishkill.ibm.com>. */ and Florian Krohm <florian@edamail.fishkill.ibm.com>. */
#if HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
# include <config.h> # include <config.h>
#endif #endif
@@ -73,7 +73,7 @@
#ifndef __attribute__ #ifndef __attribute__
/* This feature is available in gcc versions 2.5 and later. */ /* 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__ (__GNUC__ == 2 && __GNUC_MINOR__ < 5) || __STRICT_ANSI__
# define __attribute__(Spec) /* empty */ # define __attribute__(Spec) /* empty */
# endif # endif

23
lib/subpipe.h
View File

@@ -1,22 +1,19 @@
/* Subprocesses with pipes. /* Subprocesses with pipes.
Copyright (C) 2002, 2004 Free Software Foundation, Inc. Copyright (C) 2002, 2004 Free Software Foundation, Inc.
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.
Bison is free software; you can redistribute it and/or modify it This program is distributed in the hope that it will be useful,
under the terms of the GNU General Public License as published by but WITHOUT ANY WARRANTY; without even the implied warranty of
the Free Software Foundation; either version 2, or (at your option) MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
any later version. GNU General Public License for more details.
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 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 along with this program; if not, write to the Free Software Foundation,
Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
02110-1301, USA. */
/* Written by Paul Eggert <eggert@twinsun.com> /* Written by Paul Eggert <eggert@twinsun.com>
and Florian Krohm <florian@edamail.fishkill.ibm.com>. */ and Florian Krohm <florian@edamail.fishkill.ibm.com>. */

33
lib/timevar.c
View File

@@ -1,25 +1,24 @@
/* Timing variables for measuring compiler performance. /* 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 <samuel@codesourcery.com> Contributed by Alex Samuel <samuel@codesourcery.com>
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.
Bison is free software; you can redistribute it and/or modify it under This program is distributed in the hope that it will be useful,
the terms of the GNU General Public License as published by the Free but WITHOUT ANY WARRANTY; without even the implied warranty of
Software Foundation; either version 2, or (at your option) any later MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
version. GNU General Public License for more details.
Bison is distributed in the hope that it will be useful, but WITHOUT ANY You should have received a copy of the GNU General Public License
WARRANTY; without even the implied warranty of MERCHANTABILITY or along with this program; if not, write to the Free Software Foundation,
FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
for more details.
You should have received a copy of the GNU General Public License #ifdef HAVE_CONFIG_H
along with Bison; see the file COPYING. If not, write to the Free # include <config.h>
Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA #endif
02110-1301, USA. */
#include "config.h"
#if IN_GCC #if IN_GCC
@@ -448,7 +447,7 @@ timevar_print (fp)
FILE *fp; FILE *fp;
{ {
/* Only print stuff if we have some sort of time information. */ /* 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; unsigned int /* timevar_id_t */ id;
struct timevar_time_def *total = &timevars[TV_TOTAL].elapsed; struct timevar_time_def *total = &timevars[TV_TOTAL].elapsed;
struct timevar_time_def now; struct timevar_time_def now;

23
lib/timevar.h
View File

@@ -2,22 +2,19 @@
Copyright (C) 2000, 2002, 2004 Free Software Foundation, Inc. Copyright (C) 2000, 2002, 2004 Free Software Foundation, Inc.
Contributed by Alex Samuel <samuel@codesourcery.com> Contributed by Alex Samuel <samuel@codesourcery.com>
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.
Bison is free software; you can redistribute it and/or modify it This program is distributed in the hope that it will be useful,
under the terms of the GNU General Public License as published by but WITHOUT ANY WARRANTY; without even the implied warranty of
the Free Software Foundation; either version 2, or (at your option) MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
any later version. GNU General Public License for more details.
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 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 along with this program; if not, write to the Free Software Foundation,
Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
02110-1301, USA. */
#ifndef GCC_TIMEVAR_H #ifndef GCC_TIMEVAR_H
#define GCC_TIMEVAR_H #define GCC_TIMEVAR_H

9
lib/vbitset.c
View File

@@ -1,5 +1,5 @@
/* Variable array bitsets. /* 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 (m.hayes@elec.canterbury.ac.nz). Contributed by Michael Hayes (m.hayes@elec.canterbury.ac.nz).
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
@@ -13,12 +13,11 @@
GNU General Public License for more details. GNU General Public License for more details.
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software Foundation,
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
*/
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include "config.h" # include <config.h>
#endif #endif
#include "vbitset.h" #include "vbitset.h"

1
src/scan-gram.l
View File

@@ -40,7 +40,6 @@
#include "gram.h" #include "gram.h"
#include "quotearg.h" #include "quotearg.h"
#include "reader.h" #include "reader.h"
#include "verify.h"
#include "uniqstr.h" #include "uniqstr.h"
#define YY_USER_INIT \ #define YY_USER_INIT \

4
src/system.h
View File

@@ -92,8 +92,8 @@ char *base_name (char const *name);
#ifndef __attribute__ #ifndef __attribute__
/* This feature is available in gcc versions 2.5 and later. */ /* 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__ || (__GNUC__ == 2 && __GNUC_MINOR__ < 5) || __STRICT_ANSI__)
# define __attribute__(Spec) /* empty */ # define __attribute__(Spec) /* empty */
# endif # endif
#endif #endif

2
tests/local.at
View File

@@ -144,7 +144,7 @@ m4_popdef([AT_LALR1_CC_IF])
# meant to be compiled. # meant to be compiled.
m4_define([AT_DATA_GRAMMAR_PROLOGUE], m4_define([AT_DATA_GRAMMAR_PROLOGUE],
[[%{ [[%{
#if HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
# include <config.h> # include <config.h>
/* We don't need perfect functions for these tests. */ /* We don't need perfect functions for these tests. */
# undef malloc # undef malloc