* data/bison.simple, data/bison.c++: Rename as...

* data/yacc.c, data/lalr1.cc: these.
* doc/bison.texinfo (Environment Variables): Remove.

ChangeLog

@@ -1,3 +1,9 @@
+2002-06-27  Akim Demaille  <akim@epita.fr>
+
+	* data/bison.simple, data/bison.c++: Rename as...
+	* data/yacc.c, data/lalr1.cc: these.
+	* doc/bison.texinfo (Environment Variables): Remove.
+
 2002-06-25  Raja R Harinath  <harinath@cs.umn.edu>
 
 	* src/getargs.c (report_argmatch): Initialize strtok().

data/Makefile.am

@@ -15,7 +15,7 @@
 ## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
 ## 02111-1307  USA
 
-dist_pkgdata_DATA = bison.simple bison.c++
+dist_pkgdata_DATA = yacc.c lalr1.cc
 
 m4sugardir = $(pkgdatadir)/m4sugar
 dist_m4sugar_DATA = m4sugar/m4sugar.m4 m4sugar/version.m4

data/lalr1.cc

@@ -1,5 +1,24 @@
 m4_divert(-1)
 
+# C++ skeleton for Bison
+# Copyright (C) 2002 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 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., 59 Temple Place, Suite 330, Boston, MA
+# 02111-1307  USA
+
+
 # b4_sint_type(MAX)
 # -----------------
 # Return the smallest signed int type able to handle the number MAX.

data/yacc.c

@@ -1,5 +1,23 @@
 m4_divert(-1)                                                       -*- C -*-
 
+# Yacc compatible skeleton for Bison
+# Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002 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 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., 59 Temple Place, Suite 330, Boston, MA
+# 02111-1307  USA
+
 # b4_sint_type(MAX)
 # -----------------
 # Return the smallest signed int type able to handle the number MAX.

doc/bison.texinfo

@@ -5532,7 +5532,6 @@ will produce @file{output.c++} and @file{outfile.h++}.
 @menu
 * Bison Options::     All the options described in detail,
 			in alphabetical order by short options.
-* Environment Variables::  Variables which affect Bison execution.
 * Option Cross Key::  Alphabetical list of long options.
 * VMS Invocation::    Bison command syntax on VMS.
 @end menu
@@ -5681,23 +5680,6 @@ difference is that it has an optionnal argument which is the name of
 the output graph filename.
 @end table
 
-@node Environment Variables
-@section Environment Variables
-@cindex environment variables
-@cindex BISON_SIMPLE
-
-Here is a list of environment variables which affect the way Bison
-runs.
-
-@table @samp
-@item BISON_SIMPLE
-Much of the parser generated by Bison is copied verbatim from a file
-called @file{bison.simple}.  If Bison cannot find that file, or if you
-would like to direct Bison to use a different copy, setting the
-environment variable @code{BISON_SIMPLE} to the path of the file will
-cause Bison to use that copy instead.
-@end table
-
 @node Option Cross Key
 @section Option Cross Key
 

src/output.c

@@ -1140,7 +1140,7 @@ prepare (void)
 
   /* Find the right skeleton file.  */
   if (!skeleton)
-    skeleton = "bison.simple";
+    skeleton = "yacc.c";
 
   /* Parse the skeleton file and output the needed parsers.  */
   muscle_insert ("skeleton", skeleton);