* NEWS (2.3b): Update release date since there has been a delay in

getting the announcements and tarballs out.

ChangeLog

@@ -1,3 +1,21 @@
+2008-05-27  Joel E. Denny  <[email protected]>
+
+	* NEWS (2.3b): Update release date since there has been a delay in
+	getting the announcements and tarballs out.
+
+2008-05-23  Joel E. Denny  <[email protected]>
+
+	* NEWS: Version 2.3b.
+	* configure.ac (AC_INIT): Likewise.
+	(PACKAGE_COPYRIGHT_YEAR): Update to 2008.
+
+2008-05-23  Joel E. Denny  <[email protected]>
+
+	* HACKING: Don't say don't mention HACKING in the ChangeLog.  We've
+	been doing it for years.
+	(Test suite): Mention maintainer-push-check and maintainer-xml-check.
+	(Release Procedure): Add FIXME about make alpha being unmaintained.
+
 2008-05-13  Joel E. Denny  <[email protected]>
 
 	* data/yacc.c: Reformat m4 a little for readability.
@@ -20508,7 +20526,7 @@
 	-----
 
 	Copyright (C) 1987, 1988, 1991, 1992, 1993, 1994, 1995, 1996,
-	1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
+	1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
 	Free Software Foundation, Inc.
 
 	Copying and distribution of this file, with or without

HACKING

@@ -1,8 +1,7 @@
 -*- outline -*-
 
 This file attempts to describe the rules to use when hacking Bison.
-Don't put this file into the distribution.  Don't mention it in the
-ChangeLog.
+Don't put this file into the distribution.
 
 Everything related to the development of Bison is on Savannah:
 
@@ -57,6 +56,18 @@ release:
   - runs the parsers under Valgrind.
   - runs the test suite with G++ as C compiler...
 
+- run `make maintainer-push-check', which runs `make maintainer-check'
+  while activating the push implementation and its pull interface wrappers
+  in many test cases that were originally written to exercise only the
+  pull implementation.  This makes certain the push implementation can
+  perform every task the pull implementation can.
+
+- run `make maintainer-xml-check', which runs `make maintainer-check'
+  while checking Bison's XML automaton report for every working grammar
+  passed to Bison in the test suite.  The check just diffs the output of
+  Bison's included XSLT style sheets with the output of --report=all and
+  --graph.
+
 - Change tests/atlocal/CFLAGS to add your preferred options.  For
   instance, `-traditional' to check that the parsers are K&R.  Note
   that it does not make sense for glr.c, which should be ANSI,
@@ -92,6 +103,8 @@ the tarballs, the xdeltas, and prepares (in /tmp/) a proto
 announcement.  It is so neat, that that's what I use anyway for
 genuine releases, but adjusting things by hand (e.g., the urls in the
 announcement file, the ChangeLog which is not needed etc.).
+FIXME: `make alpha' is not maintained and is broken.  These
+instructions need to be replaced or removed.
 
 If it fails, you're on your own...
 

NEWS

@@ -1,7 +1,7 @@
 Bison News
 ----------
 
-Changes in version 2.3a+ (????-??-??):
+Changes in version 2.3b (2008-05-27):
 
 * The quotes around NAME that used to be required in the following directive
   are now deprecated:

configure.ac

@@ -19,10 +19,10 @@
 # We have strange test case titles, so we need Autoconf 2.61 or better.
 AC_PREREQ(2.61)
 
-AC_INIT([GNU Bison], [2.3a+], [[email protected]])
-AC_DEFINE([PACKAGE_COPYRIGHT_YEAR], [2007],
+AC_INIT([GNU Bison], [2.3b], [[email protected]])
+AC_DEFINE([PACKAGE_COPYRIGHT_YEAR], [2008],
           [The copyright year for this package])
-AC_SUBST([PACKAGE_COPYRIGHT_YEAR], [2007])
+AC_SUBST([PACKAGE_COPYRIGHT_YEAR], [2008])
 
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_MACRO_DIR([m4])

doc/bison.1

@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.36.
-.TH BISON "1" "March 2008" "bison 2.3a+" "User Commands"
+.TH BISON "1" "May 2008" "bison 2.3b" "User Commands"
 .SH NAME
 bison \- GNU Project parser generator (yacc replacement)
 .SH SYNOPSIS
@@ -175,7 +175,7 @@ Written by Robert Corbett and Richard Stallman.
 .SH "REPORTING BUGS"
 Report bugs to <bug\-[email protected]>.
 .SH COPYRIGHT
-Copyright \(co 2007 Free Software Foundation, Inc.
+Copyright \(co 2008 Free Software Foundation, Inc.
 .br
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.

lib/timevar.c

@@ -1,29 +1,43 @@
 /* Timing variables for measuring compiler performance.
-   Copyright (C) 2000 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2002, 2004, 2005, 2006 Free Software Foundation, Inc.
    Contributed by Alex Samuel <[email protected]>
 
-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 3 of the License, or
+   (at your option) any later version.
 
-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.
+   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.
 
-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 this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-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, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.  */
+#include <config.h>
+
+#if IN_GCC
 
-#include "config.h"
 #include "system.h"
 #include "intl.h"
 #include "rtl.h"
 
+#else
+
+/* This source file is taken from the GCC source code, with slight
+   modifications that are under control of the IN_GCC preprocessor
+   variable.  The !IN_GCC part of this file is specific to Bison.  */
+
+# include "../src/system.h"
+# if HAVE_SYS_TIME_H
+#  include <sys/time.h>
+# endif
+int timevar_report = 0;
+
+#endif
+
+
 #ifdef HAVE_SYS_TIMES_H
 # include <sys/times.h>
 #endif
@@ -46,13 +60,13 @@ struct tms
 #endif
 
 #if defined HAVE_DECL_GETRUSAGE && !HAVE_DECL_GETRUSAGE
-extern int getrusage PARAMS ((int, struct rusage *));
+extern int getrusage (int, struct rusage *);
 #endif
 #if defined HAVE_DECL_TIMES && !HAVE_DECL_TIMES
-extern clock_t times PARAMS ((struct tms *));
+extern clock_t times (struct tms *);
 #endif
 #if defined HAVE_DECL_CLOCK && !HAVE_DECL_CLOCK
-extern clock_t clock PARAMS ((void));
+extern clock_t clock (void);
 #endif
 
 #ifndef RUSAGE_SELF
@@ -101,21 +115,23 @@ extern clock_t clock PARAMS ((void));
    _constants_ variable at run time, anyway?  */
 #ifdef USE_TIMES
 static float ticks_to_msec;
-#define TICKS_TO_MSEC (1 / (float)TICKS_PER_SECOND)
+#define TICKS_TO_MSEC (1.0 / TICKS_PER_SECOND)
 #endif
 
 #ifdef USE_CLOCK
 static float clocks_to_msec;
-#define CLOCKS_TO_MSEC (1 / (float)CLOCKS_PER_SEC)
+#define CLOCKS_TO_MSEC (1.0 / CLOCKS_PER_SEC)
 #endif
 
+#if IN_GCC
 #include "flags.h"
+#endif
 #include "timevar.h"
 
 /* See timevar.h for an explanation of timing variables.  */
 
 /* This macro evaluates to nonzero if timing variables are enabled.  */
-#define TIMEVAR_ENABLE (time_report)
+#define TIMEVAR_ENABLE (timevar_report)
 
 /* A timing variable.  */
 
@@ -168,11 +184,10 @@ static struct timevar_stack_def *unused_stack_instances;
    element.  */
 static struct timevar_time_def start_time;
 
-static void get_time
-  PARAMS ((struct timevar_time_def *));
-static void timevar_accumulate
-  PARAMS ((struct timevar_time_def *, struct timevar_time_def *,
-	   struct timevar_time_def *));
+static void get_time (struct timevar_time_def *);
+static void timevar_accumulate (struct timevar_time_def *,
+				struct timevar_time_def *,
+				struct timevar_time_def *);
 
 /* Fill the current times into TIME.  The definition of this function
    also defines any or all of the HAVE_USER_TIME, HAVE_SYS_TIME, and
@@ -193,12 +208,21 @@ get_time (now)
 #ifdef USE_TIMES
     struct tms tms;
     now->wall = times (&tms)  * ticks_to_msec;
+#if IN_GCC
     now->user = tms.tms_utime * ticks_to_msec;
     now->sys  = tms.tms_stime * ticks_to_msec;
+#else
+    now->user = (tms.tms_utime + tms.tms_cutime) * ticks_to_msec;
+    now->sys  = (tms.tms_stime + tms.tms_cstime) * ticks_to_msec;
+#endif
 #endif
 #ifdef USE_GETRUSAGE
     struct rusage rusage;
+#if IN_GCC
     getrusage (RUSAGE_SELF, &rusage);
+#else
+    getrusage (RUSAGE_CHILDREN, &rusage);
+#endif
     now->user = rusage.ru_utime.tv_sec + rusage.ru_utime.tv_usec * 1e-6;
     now->sys  = rusage.ru_stime.tv_sec + rusage.ru_stime.tv_usec * 1e-6;
 #endif
@@ -208,17 +232,17 @@ get_time (now)
   }
 }
 
-/* Add the difference between STOP_TIME and START_TIME to TIMER.  */
+/* Add the difference between STOP and START to TIMER.  */
 
 static void
-timevar_accumulate (timer, start_time, stop_time)
+timevar_accumulate (timer, start, stop)
      struct timevar_time_def *timer;
-     struct timevar_time_def *start_time;
-     struct timevar_time_def *stop_time;
+     struct timevar_time_def *start;
+     struct timevar_time_def *stop;
 {
-  timer->user += stop_time->user - start_time->user;
-  timer->sys += stop_time->sys - start_time->sys;
-  timer->wall += stop_time->wall - start_time->wall;
+  timer->user += stop->user - start->user;
+  timer->sys += stop->sys - start->sys;
+  timer->wall += stop->wall - start->wall;
 }
 
 /* Initialize timing variables.  */
@@ -420,7 +444,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;
@@ -461,7 +485,7 @@ timevar_print (fp)
 	continue;
 
       /* Don't print timing variables if we're going to get a row of
-         zeroes.  */
+	 zeroes.  */
       if (tv->elapsed.user < tiny
 	  && tv->elapsed.sys < tiny
 	  && tv->elapsed.wall < tiny)

lib/timevar.def

@@ -1,24 +1,22 @@
-/* This file contains the definitions for timing variables used to
+/* This file contains the definitions for timing variables used to -*- C -*-
    measure run-time performance of the compiler.
-   Copyright (C) 2000 Free Software Foundation, Inc.
-   Contributed by Alex Samuel <[email protected]>
+   Copyright (C) 2002, 2007 Free Software Foundation, Inc.
+   Contributed by Akim Demaille <[email protected]>.
 
-   This file is part of GCC.
+   This file is part of Bison, the GNU Compiler Compiler.
 
-   GCC 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
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
-   GCC is distributed in the hope that it will be useful,
+   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 GCC; 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, see <http://www.gnu.org/licenses/>.  */
 
 /* This file contains timing variable definitions, used by timevar.h
    and timevar.c.
@@ -33,59 +31,25 @@
 /* The total execution time.  */
 DEFTIMEVAR (TV_TOTAL                 , "total time")
 
-/* Time spent garbage-collecting.  */
-DEFTIMEVAR (TV_GC                    , "garbage collection")
+/* Time spent in the reader.  */
+DEFTIMEVAR (TV_READER                , "reader")
+DEFTIMEVAR (TV_SCANNING              , "scanner")
+DEFTIMEVAR (TV_PARSING               , "parser")
 
-/* Time spent generating dump files.  */
-DEFTIMEVAR (TV_DUMP                  , "dump files")
+/* Time spent handling the grammar.  */
+DEFTIMEVAR (TV_REDUCE                , "reducing the grammar")
+DEFTIMEVAR (TV_SETS                  , "computing the sets")
+DEFTIMEVAR (TV_LR0                   , "LR(0)")
+DEFTIMEVAR (TV_LALR                  , "LALR(1)")
+DEFTIMEVAR (TV_CONFLICTS             , "conflicts")
 
-/* Time spent by constructing CFG.  */
-DEFTIMEVAR (TV_CFG                   , "cfg construction")
-/* Time spent by cleaning up CFG.  */
-DEFTIMEVAR (TV_CLEANUP_CFG           , "cfg cleanup")
-DEFTIMEVAR (TV_DELETE_TRIVIALLY_DEAD , "trivially dead code")
-/* Time spent by life analysis.  */
-DEFTIMEVAR (TV_LIFE		     , "life analysis")
-DEFTIMEVAR (TV_LIFE_UPDATE	     , "life info update")
-/* Timing in various stages of the compiler.  */
-DEFTIMEVAR (TV_CPP		     , "preprocessing")
-DEFTIMEVAR (TV_LEX		     , "lexical analysis")
-DEFTIMEVAR (TV_PARSE                 , "parser")
-DEFTIMEVAR (TV_EXPAND		     , "expand")
-DEFTIMEVAR (TV_VARCONST              , "varconst")
-DEFTIMEVAR (TV_INTEGRATION           , "integration")
-DEFTIMEVAR (TV_JUMP                  , "jump")
-DEFTIMEVAR (TV_CSE                   , "CSE")
-DEFTIMEVAR (TV_GCSE                  , "global CSE")
-DEFTIMEVAR (TV_LOOP                  , "loop analysis")
-DEFTIMEVAR (TV_TRACER                , "tracer")
-DEFTIMEVAR (TV_CSE2                  , "CSE 2")
-DEFTIMEVAR (TV_BRANCH_PROB           , "branch prediction")
-DEFTIMEVAR (TV_FLOW                  , "flow analysis")
-DEFTIMEVAR (TV_COMBINE               , "combiner")
-DEFTIMEVAR (TV_IFCVT		     , "if-conversion")
-DEFTIMEVAR (TV_REGMOVE               , "regmove")
-DEFTIMEVAR (TV_MODE_SWITCH           , "mode switching")
-DEFTIMEVAR (TV_SCHED                 , "scheduling")
-DEFTIMEVAR (TV_LOCAL_ALLOC           , "local alloc")
-DEFTIMEVAR (TV_GLOBAL_ALLOC          , "global alloc")
-DEFTIMEVAR (TV_RELOAD_CSE_REGS       , "reload CSE regs")
-DEFTIMEVAR (TV_FLOW2                 , "flow 2")
-DEFTIMEVAR (TV_IFCVT2		     , "if-conversion 2")
-DEFTIMEVAR (TV_PEEPHOLE2             , "peephole 2")
-DEFTIMEVAR (TV_RENAME_REGISTERS      , "rename registers")
-DEFTIMEVAR (TV_SCHED2                , "scheduling 2")
-DEFTIMEVAR (TV_MACH_DEP              , "machine dep reorg")
-DEFTIMEVAR (TV_DBR_SCHED             , "delay branch sched")
-DEFTIMEVAR (TV_REORDER_BLOCKS        , "reorder blocks")
-DEFTIMEVAR (TV_SHORTEN_BRANCH        , "shorten branches")
-DEFTIMEVAR (TV_REG_STACK             , "reg stack")
-DEFTIMEVAR (TV_TO_SSA                , "convert to SSA")
-DEFTIMEVAR (TV_SSA_CCP               , "SSA CCP")
-DEFTIMEVAR (TV_SSA_DCE               , "SSA aggressive DCE")
-DEFTIMEVAR (TV_FROM_SSA              , "convert from SSA")
-DEFTIMEVAR (TV_FINAL                 , "final")
-DEFTIMEVAR (TV_SYMOUT                , "symout")
+/* Time spent outputing results.  */
+DEFTIMEVAR (TV_REPORT                , "outputing report")
+DEFTIMEVAR (TV_GRAPH                 , "outputing graph")
+DEFTIMEVAR (TV_XML                   , "outputing xml")
+DEFTIMEVAR (TV_ACTIONS               , "parser action tables")
+DEFTIMEVAR (TV_PARSER                , "outputing parser")
+DEFTIMEVAR (TV_M4                    , "running m4")
 
-/* Everything else in rest_of_compilation not included above.  */
-DEFTIMEVAR (TV_REST_OF_COMPILATION   , "rest of compilation")
+/* Time spent by freeing the memory :).  */
+DEFTIMEVAR (TV_FREE                  , "freeing")

lib/timevar.h

@@ -1,23 +1,19 @@
 /* Timing variables for measuring compiler performance.
-   Copyright (C) 2000 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2002, 2004 Free Software Foundation, Inc.
    Contributed by Alex Samuel <[email protected]>
 
-   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 3 of the License, or
+   (at your option) any later version.
 
-   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.
+   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 GCC; 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, see <http://www.gnu.org/licenses/>.  */
 
 #ifndef GCC_TIMEVAR_H
 #define GCC_TIMEVAR_H
@@ -76,16 +72,18 @@ typedef enum
 timevar_id_t;
 #undef DEFTIMEVAR
 
-extern void init_timevar PARAMS ((void));
-extern void timevar_push PARAMS ((timevar_id_t));
-extern void timevar_pop PARAMS ((timevar_id_t));
-extern void timevar_start PARAMS ((timevar_id_t));
-extern void timevar_stop PARAMS ((timevar_id_t));
-extern void timevar_get PARAMS ((timevar_id_t, struct timevar_time_def *));
-extern void timevar_print PARAMS ((FILE *));
+extern void init_timevar (void);
+extern void timevar_push (timevar_id_t);
+extern void timevar_pop (timevar_id_t);
+extern void timevar_start (timevar_id_t);
+extern void timevar_stop (timevar_id_t);
+extern void timevar_get (timevar_id_t, struct timevar_time_def *);
+extern void timevar_print (FILE *);
 
 /* Provided for backward compatibility.  */
-extern long get_run_time PARAMS ((void));
-extern void print_time PARAMS ((const char *, long));
+extern long get_run_time (void);
+extern void print_time (const char *, long);
+
+extern int timevar_report;
 
 #endif /* ! GCC_TIMEVAR_H */

src/parse-gram.c

@@ -1,5 +1,5 @@
 
-/* A Bison parser, made by GNU Bison 2.3a+.  */
+/* A Bison parser, made by GNU Bison 2.3b.  */
 
 /* Skeleton implementation for Bison's Yacc-like parsers in C
    
@@ -46,7 +46,7 @@
 #define YYBISON 1
 
 /* Bison version.  */
-#define YYBISON_VERSION "2.3a+"
+#define YYBISON_VERSION "2.3b"
 
 /* Skeleton name.  */
 #define YYSKELETON_NAME "yacc.c"

src/parse-gram.h

@@ -1,5 +1,5 @@
 
-/* A Bison parser, made by GNU Bison 2.3a+.  */
+/* A Bison parser, made by GNU Bison 2.3b.  */
 
 /* Skeleton interface for Bison's Yacc-like parsers in C