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

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

Browse Source 
c.m4.
* data/c++.m4: Include c.m4.
* data/glr.cc: Do not include stack.hh.
This commit is contained in:
Akim Demaille
2006-01-02 16:06:11 +00:00
parent 9ecafbbfe7
commit 3953ed882a
4 changed files with 17 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

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

4
data/c++.m4
View File

@@ -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 # 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,6 +19,8 @@ m4_divert(-1) -*- Autoconf -*-
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
# 02110-1301 USA # 02110-1301 USA
m4_include(b4_pkgdatadir/[c.m4])
## ---------------- ## ## ---------------- ##
## Default values. ## ## Default values. ##
## ---------------- ## ## ---------------- ##

3
data/glr.cc
View File

@@ -1,7 +1,7 @@
m4_divert(-1) -*- C -*- m4_divert(-1) -*- C -*-
# C++ GLR skeleton for Bison # 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 # 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
@@ -190,7 +190,6 @@ namespace yy
]/* Line __line__ of glr.cc. */ ]/* Line __line__ of glr.cc. */
b4_syncline([@oline@], [@ofile@])[ b4_syncline([@oline@], [@ofile@])[
#include "stack.hh"
#include "location.hh" #include "location.hh"
/* Enabling traces. */ /* Enabling traces. */

17
src/output.c
View File

@@ -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. Free Software Foundation, Inc.
This file is part of Bison, the GNU Compiler Compiler. This file is part of Bison, the GNU Compiler Compiler.
@@ -506,7 +506,7 @@ output_skeleton (void)
FILE *in; FILE *in;
FILE *out; FILE *out;
int filter_fd[2]; int filter_fd[2];
char const *argv[6]; char const *argv[5];
pid_t pid; pid_t pid;
/* Compute the names of the package data dir and skeleton file. /* Compute the names of the package data dir and skeleton file.
@@ -515,7 +515,6 @@ output_skeleton (void)
cheap sanity check is worthwhile. */ cheap sanity check is worthwhile. */
char const m4sugar[] = "m4sugar/m4sugar.m4"; char const m4sugar[] = "m4sugar/m4sugar.m4";
char *full_m4sugar; char *full_m4sugar;
char *full_cm4;
char *full_skeleton; char *full_skeleton;
char const *p; char const *p;
char const *m4 = (p = getenv ("M4")) ? p : M4; char const *m4 = (p = getenv ("M4")) ? p : M4;
@@ -531,28 +530,24 @@ output_skeleton (void)
full_skeleton[pkgdatadirlen] = '/'; full_skeleton[pkgdatadirlen] = '/';
strcpy (full_skeleton + pkgdatadirlen + 1, m4sugar); strcpy (full_skeleton + pkgdatadirlen + 1, m4sugar);
full_m4sugar = xstrdup (full_skeleton); full_m4sugar = xstrdup (full_skeleton);
strcpy (full_skeleton + pkgdatadirlen + 1, "c.m4");
full_cm4 = xstrdup (full_skeleton);
strcpy (full_skeleton + pkgdatadirlen + 1, skeleton); strcpy (full_skeleton + pkgdatadirlen + 1, skeleton);
xfclose (xfopen (full_m4sugar, "r")); xfclose (xfopen (full_m4sugar, "r"));
/* Create an m4 subprocess connected to us via two pipes. */ /* Create an m4 subprocess connected to us via two pipes. */
if (trace_flag & trace_tools) if (trace_flag & trace_tools)
fprintf (stderr, "running: %s %s - %s %s\n", fprintf (stderr, "running: %s %s - %s\n",
m4, full_m4sugar, full_cm4, full_skeleton); m4, full_m4sugar, full_skeleton);
argv[0] = m4; argv[0] = m4;
argv[1] = full_m4sugar; argv[1] = full_m4sugar;
argv[2] = "-"; argv[2] = "-";
argv[3] = full_cm4; argv[3] = full_skeleton;
argv[4] = full_skeleton; argv[4] = NULL;
argv[5] = NULL;
init_subpipe (); init_subpipe ();
pid = create_subpipe (argv, filter_fd); pid = create_subpipe (argv, filter_fd);
free (full_m4sugar); free (full_m4sugar);
free (full_cm4);
free (full_skeleton); free (full_skeleton);
out = fdopen (filter_fd[0], "w"); out = fdopen (filter_fd[0], "w");