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

2006-10-08 Paolo Bonzini <bonzini@gnu.org>

Browse Source 
* data/c.m4 (b4_copyright, b4_epilogue, b4_location_initial_column,
	b4_location_initial_line, p4_parse_param, b4_ints_in, b4_flag_if,
	b4_define_flag_if and uses, b4_basename, b4_syncline, b4_user_code,
	b4_define_user_cde and uses): Remove.
	(b4_comment, b4_prefix, b4_sync_start): New.
	* data/bison.m4: New file, with most of the content removed from c.m4.
	* src/muscle_tab.h: Use "do {...} while(0)" throughout.
	* src/output.c (output_skeleton): Pass bison.m4.
	(prepare): Pass glr_flag and nondeterministic_flag.  Pass prefix
	only if specified.
This commit is contained in:
Paolo Bonzini
2006-10-08 11:07:02 +00:00
parent cf8067530b
commit 90b9908d8c
5 changed files with 242 additions and 168 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/muscle_tab.h
View File

@@ -33,34 +33,34 @@ void muscle_free (void);
extern struct obstack muscle_obstack;
#define MUSCLE_INSERT_BOOL(Key, Value) \
{ \
do { \
int v = Value; \
MUSCLE_INSERT_INT (Key, v); \
}
} while(0)
#define MUSCLE_INSERT_INT(Key, Value) \
{ \
do { \
obstack_fgrow1 (&muscle_obstack, "%d", Value); \
obstack_1grow (&muscle_obstack, 0); \
muscle_insert (Key, obstack_finish (&muscle_obstack)); \
}
} while(0)
#define MUSCLE_INSERT_LONG_INT(Key, Value) \
{ \
do { \
obstack_fgrow1 (&muscle_obstack, "%ld", Value); \
obstack_1grow (&muscle_obstack, 0); \
muscle_insert (Key, obstack_finish (&muscle_obstack)); \
}
} while(0)
#define MUSCLE_INSERT_STRING(Key, Value) \
{ \
do { \
obstack_sgrow (&muscle_obstack, Value); \
obstack_1grow (&muscle_obstack, 0); \
muscle_insert (Key, obstack_finish (&muscle_obstack)); \
}
} while(0)
#define MUSCLE_OBSTACK_SGROW(Obstack, Value) \
{ \
do { \
char const *p; \
for (p = Value; *p; p++) \
switch (*p) \
@@ -71,16 +71,16 @@ extern struct obstack muscle_obstack;
case ']': obstack_sgrow (Obstack, "@}" ); break; \
default: obstack_1grow (Obstack, *p); break; \
} \
}
} while(0)
#define MUSCLE_INSERT_C_STRING(Key, Value) \
{ \
do { \
MUSCLE_OBSTACK_SGROW (&muscle_obstack, \
quotearg_style (c_quoting_style, \
Value)); \
obstack_1grow (&muscle_obstack, 0); \
muscle_insert (Key, obstack_finish (&muscle_obstack)); \
}
} while(0)
/* Append VALUE to the current value of KEY. If KEY did not already
exist, create it. Use MUSCLE_OBSTACK. De-allocate the previously

24
src/output.c
View File

@@ -499,7 +499,7 @@ output_skeleton (void)
FILE *in;
FILE *out;
int filter_fd[2];
char const *argv[6];
char const *argv[7];
pid_t pid;
/* Compute the names of the package data dir and skeleton file.
@@ -507,7 +507,9 @@ output_skeleton (void)
installation. A faulty installation can cause deadlock, so a
cheap sanity check is worthwhile. */
char const m4sugar[] = "m4sugar/m4sugar.m4";
char const m4bison[] = "bison.m4";
char *full_m4sugar;
char *full_m4bison;
char *full_skeleton;
char const *p;
char const *m4 = (p = getenv ("M4")) ? p : M4;
@@ -523,24 +525,28 @@ output_skeleton (void)
full_skeleton[pkgdatadirlen] = '/';
strcpy (full_skeleton + pkgdatadirlen + 1, m4sugar);
full_m4sugar = xstrdup (full_skeleton);
strcpy (full_skeleton + pkgdatadirlen + 1, m4bison);
full_m4bison = 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\n",
m4, full_m4sugar, full_skeleton);
fprintf (stderr, "running: %s %s - %s %s\n",
m4, full_m4sugar, full_m4bison, full_skeleton);
argv[0] = m4;
argv[1] = full_m4sugar;
argv[2] = "-";
argv[3] = full_skeleton;
argv[4] = trace_flag & trace_m4 ? "-dV" : NULL;
argv[5] = NULL;
argv[3] = full_m4bison;
argv[4] = full_skeleton;
argv[5] = trace_flag & trace_m4 ? "-dV" : NULL;
argv[6] = NULL;
init_subpipe ();
pid = create_subpipe (argv, filter_fd);
free (full_m4bison);
free (full_m4sugar);
free (full_skeleton);
@@ -584,7 +590,9 @@ prepare (void)
MUSCLE_INSERT_BOOL ("debug_flag", debug_flag);
MUSCLE_INSERT_BOOL ("defines_flag", defines_flag);
MUSCLE_INSERT_BOOL ("error_verbose_flag", error_verbose);
MUSCLE_INSERT_BOOL ("glr_flag", glr_parser);
MUSCLE_INSERT_BOOL ("locations_flag", locations_flag);
MUSCLE_INSERT_BOOL ("nondeterministic_flag", nondeterministic_parser);
MUSCLE_INSERT_BOOL ("pure_flag", pure_parser);
MUSCLE_INSERT_BOOL ("push_flag", push_parser);
MUSCLE_INSERT_BOOL ("synclines_flag", !no_lines_flag);
@@ -592,7 +600,9 @@ prepare (void)
MUSCLE_INSERT_BOOL ("yacc_flag", yacc_flag);
/* File names. */
MUSCLE_INSERT_STRING ("prefix", spec_name_prefix ? spec_name_prefix : "yy");
if (spec_name_prefix)
MUSCLE_INSERT_STRING ("prefix", spec_name_prefix);
#define DEFINE(Name) MUSCLE_INSERT_STRING (#Name, Name ? Name : "")
DEFINE (dir_prefix);
DEFINE (parser_file_name);