[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
FYI: Don't hard wire c.m4
From: |
Akim Demaille |
Subject: |
FYI: Don't hard wire c.m4 |
Date: |
Mon, 02 Jan 2006 17:06:56 +0100 |
User-agent: |
Gnus/5.110004 (No Gnus v0.4) Emacs/21.4 (gnu/linux) |
Index: ChangeLog
from Akim Demaille <address@hidden>
* 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.
Index: data/c++.m4
===================================================================
RCS file: /cvsroot/bison/bison/data/c++.m4,v
retrieving revision 1.3
diff -u -u -r1.3 c++.m4
--- data/c++.m4 16 Nov 2005 14:20:48 -0000 1.3
+++ data/c++.m4 2 Jan 2006 16:05:34 -0000
@@ -2,7 +2,7 @@
# 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
@@ -19,6 +19,8 @@
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
# 02110-1301 USA
+m4_include(b4_pkgdatadir/[c.m4])
+
## ---------------- ##
## Default values. ##
## ---------------- ##
Index: data/glr.cc
===================================================================
RCS file: /cvsroot/bison/bison/data/glr.cc,v
retrieving revision 1.7
diff -u -u -r1.7 glr.cc
--- data/glr.cc 29 Dec 2005 11:06:33 -0000 1.7
+++ data/glr.cc 2 Jan 2006 16:05:34 -0000
@@ -1,7 +1,7 @@
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
@@ -190,7 +190,6 @@
]/* Line __line__ of glr.cc. */
b4_syncline(address@hidden@], address@hidden@])[
-#include "stack.hh"
#include "location.hh"
/* Enabling traces. */
Index: src/output.c
===================================================================
RCS file: /cvsroot/bison/bison/src/output.c,v
retrieving revision 1.242
diff -u -u -r1.242 output.c
--- src/output.c 9 Dec 2005 23:51:26 -0000 1.242
+++ src/output.c 2 Jan 2006 16:05:34 -0000
@@ -1,6 +1,6 @@
/* 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.
@@ -506,7 +506,7 @@
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.
@@ -515,7 +515,6 @@
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;
@@ -531,28 +530,24 @@
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)
- 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[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);
- free (full_cm4);
free (full_skeleton);
out = fdopen (filter_fd[0], "w");
- FYI: Don't hard wire c.m4,
Akim Demaille <=