* src/output.c (output_skeleton): Don't hard wire the inclusion of

c.m4.
* data/c++.m4: Include c.m4.
* data/glr.cc: Do not include stack.hh.

diff --git a/ChangeLog b/ChangeLog
index 0036b8987729909a8d4e39a9da914db95c2f7a22..b0b2c861e41de87ffd7bb5e8edf71d8d0800f6fd 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-01-02  Akim Demaille  <akim@epita.fr>
+
+       * src/output.c (output_skeleton): Don't hard wire the inclusion of
+       c.m4.
+       * data/c++.m4: Include c.m4.
+       * data/glr.cc: Do not include stack.hh.
+

 2006-01-02  Joel E. Denny  <jdenny@ces.clemson.edu>
 
        * data/glr.c: Reformat whitespace with tabs.
 2006-01-02  Joel E. Denny  <jdenny@ces.clemson.edu>
 
        * data/glr.c: Reformat whitespace with tabs.

diff --git a/data/c++.m4 b/data/c++.m4
index cf5e83d6b319bfac5c1e3b975e4c6493975627fc..3f38a8edf8156566b8157c76184bc6761a7048d5 100644 (file)
--- a/data/c++.m4
+++ b/data/c++.m4
@@ -2,7 +2,7 @@ m4_divert(-1)                                               -*- Autoconf -*-
 
 # C++ skeleton for Bison
 
 
 # C++ skeleton for Bison
 

-# Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+# Copyright (C) 2002, 2003, 2004, 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
 
 # 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,6 +19,8 @@ m4_divert(-1)                                               -*- Autoconf -*-
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 # 02110-1301  USA
 
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 # 02110-1301  USA
 

+m4_include(b4_pkgdatadir/[c.m4])
+

 ## ---------------- ##
 ## Default values.  ##
 ## ---------------- ##
 ## ---------------- ##
 ## Default values.  ##
 ## ---------------- ##

diff --git a/data/glr.cc b/data/glr.cc
index e8f761162b80a55e83d8b6620e93dbd4b3571789..0a364dbfc410a06006f558ee9098962ae7707dd7 100644 (file)
--- a/data/glr.cc
+++ b/data/glr.cc
@@ -1,7 +1,7 @@
 m4_divert(-1)                                                       -*- C -*-
 
 # C++ GLR skeleton for Bison
 m4_divert(-1)                                                       -*- C -*-
 
 # C++ GLR skeleton for Bison

-# Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+# Copyright (C) 2002, 2003, 2004, 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
 
 # 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


@@ -190,7 +190,6 @@ namespace yy
 ]/* Line __line__ of glr.cc.  */
 b4_syncline([@oline@], [@ofile@])[
 
 ]/* Line __line__ of glr.cc.  */
 b4_syncline([@oline@], [@ofile@])[
 

-#include "stack.hh"

 #include "location.hh"
 
 /* Enabling traces.  */
 #include "location.hh"
 
 /* Enabling traces.  */

diff --git a/src/output.c b/src/output.c
index c0be5b0be8fb9a63e3be9b8753300ddb6243a6fc..2593ecc98211e6bb0e95d45c31f23927700d4723 100644 (file)
--- a/src/output.c
+++ b/src/output.c
@@ -1,6 +1,6 @@
 /* Output the generated parsing program for Bison.
 
 /* Output the generated parsing program for Bison.
 

-   Copyright (C) 1984, 1986, 1989, 1992, 2000, 2001, 2002, 2003, 2004, 2005
+   Copyright (C) 1984, 1986, 1989, 1992, 2000, 2001, 2002, 2003, 2004, 2005, 2006

    Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
    Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.


@@ -506,7 +506,7 @@ output_skeleton (void)
   FILE *in;
   FILE *out;
   int filter_fd[2];
   FILE *in;
   FILE *out;
   int filter_fd[2];

-  char const *argv[6];
+  char const *argv[5];

   pid_t pid;
 
   /* Compute the names of the package data dir and skeleton file.
   pid_t pid;
 
   /* Compute the names of the package data dir and skeleton file.


@@ -515,7 +515,6 @@ output_skeleton (void)
      cheap sanity check is worthwhile.  */
   char const m4sugar[] = "m4sugar/m4sugar.m4";
   char *full_m4sugar;
      cheap sanity check is worthwhile.  */
   char const m4sugar[] = "m4sugar/m4sugar.m4";
   char *full_m4sugar;

-  char *full_cm4;

   char *full_skeleton;
   char const *p;
   char const *m4 = (p = getenv ("M4")) ? p : M4;
   char *full_skeleton;
   char const *p;
   char const *m4 = (p = getenv ("M4")) ? p : M4;


@@ -531,28 +530,24 @@ output_skeleton (void)
   full_skeleton[pkgdatadirlen] = '/';
   strcpy (full_skeleton + pkgdatadirlen + 1, m4sugar);
   full_m4sugar = xstrdup (full_skeleton);
   full_skeleton[pkgdatadirlen] = '/';
   strcpy (full_skeleton + pkgdatadirlen + 1, m4sugar);
   full_m4sugar = xstrdup (full_skeleton);

-  strcpy (full_skeleton + pkgdatadirlen + 1, "c.m4");
-  full_cm4 = xstrdup (full_skeleton);

   strcpy (full_skeleton + pkgdatadirlen + 1, skeleton);
   xfclose (xfopen (full_m4sugar, "r"));
 
   /* Create an m4 subprocess connected to us via two pipes.  */
 
   if (trace_flag & trace_tools)
   strcpy (full_skeleton + pkgdatadirlen + 1, skeleton);
   xfclose (xfopen (full_m4sugar, "r"));
 
   /* Create an m4 subprocess connected to us via two pipes.  */
 
   if (trace_flag & trace_tools)

-    fprintf (stderr, "running: %s %s - %s %s\n",
-            m4, full_m4sugar, full_cm4, full_skeleton);
+    fprintf (stderr, "running: %s %s - %s\n",
+            m4, full_m4sugar, full_skeleton);

 
   argv[0] = m4;
   argv[1] = full_m4sugar;
   argv[2] = "-";
 
   argv[0] = m4;
   argv[1] = full_m4sugar;
   argv[2] = "-";

-  argv[3] = full_cm4;
-  argv[4] = full_skeleton;
-  argv[5] = NULL;
+  argv[3] = full_skeleton;
+  argv[4] = NULL;

 
   init_subpipe ();
   pid = create_subpipe (argv, filter_fd);
   free (full_m4sugar);
 
   init_subpipe ();
   pid = create_subpipe (argv, filter_fd);
   free (full_m4sugar);

-  free (full_cm4);

   free (full_skeleton);
 
   out = fdopen (filter_fd[0], "w");
   free (full_skeleton);
 
   out = fdopen (filter_fd[0], "w");