mirror of
https://git.savannah.gnu.org/git/bison.git
synced 2026-03-21 02:03:03 +00:00
(muscle_m4_output): Now inline. Return bool, not int.
(muscle_m4_output_processor): New function, to avoid casts. (muscles_m4_output): Use new functions instead of casting old functions unportably.
This commit is contained in:
@@ -1,4 +1,5 @@
|
|||||||
/* Muscle table manager for Bison,
|
/* Muscle table manager for Bison.
|
||||||
|
|
||||||
Copyright (C) 2001, 2002 Free Software Foundation, Inc.
|
Copyright (C) 2001, 2002 Free Software Foundation, Inc.
|
||||||
|
|
||||||
This file is part of Bison, the GNU Compiler Compiler.
|
This file is part of Bison, the GNU Compiler Compiler.
|
||||||
@@ -106,7 +107,7 @@ muscle_insert (const char *key, char *value)
|
|||||||
if (!entry)
|
if (!entry)
|
||||||
{
|
{
|
||||||
/* First insertion in the hash. */
|
/* First insertion in the hash. */
|
||||||
entry = XMALLOC (muscle_entry, 1);
|
MALLOC (entry, 1);
|
||||||
entry->key = key;
|
entry->key = key;
|
||||||
hash_insert (muscle_table, entry);
|
hash_insert (muscle_table, entry);
|
||||||
}
|
}
|
||||||
@@ -132,7 +133,7 @@ muscle_grow (const char *key, const char *val, const char *separator)
|
|||||||
if (!entry)
|
if (!entry)
|
||||||
{
|
{
|
||||||
/* First insertion in the hash. */
|
/* First insertion in the hash. */
|
||||||
entry = XMALLOC (muscle_entry, 1);
|
MALLOC (entry, 1);
|
||||||
entry->key = key;
|
entry->key = key;
|
||||||
hash_insert (muscle_table, entry);
|
hash_insert (muscle_table, entry);
|
||||||
entry->value = xstrdup (val);
|
entry->value = xstrdup (val);
|
||||||
@@ -191,12 +192,18 @@ muscle_find (const char *key)
|
|||||||
| Output the definition of ENTRY as a m4_define. |
|
| Output the definition of ENTRY as a m4_define. |
|
||||||
`------------------------------------------------*/
|
`------------------------------------------------*/
|
||||||
|
|
||||||
static int
|
static inline bool
|
||||||
muscle_m4_output (muscle_entry *entry, FILE *out)
|
muscle_m4_output (muscle_entry *entry, FILE *out)
|
||||||
{
|
{
|
||||||
fprintf (out, "m4_define([b4_%s],\n", entry->key);
|
fprintf (out, "m4_define([b4_%s],\n", entry->key);
|
||||||
fprintf (out, "[[%s]])\n\n\n", entry->value);
|
fprintf (out, "[[%s]])\n\n\n", entry->value);
|
||||||
return 1;
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
static bool
|
||||||
|
muscle_m4_output_processor (void *entry, void *out)
|
||||||
|
{
|
||||||
|
return muscle_m4_output (entry, out);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -208,7 +215,5 @@ muscle_m4_output (muscle_entry *entry, FILE *out)
|
|||||||
void
|
void
|
||||||
muscles_m4_output (FILE *out)
|
muscles_m4_output (FILE *out)
|
||||||
{
|
{
|
||||||
hash_do_for_each (muscle_table,
|
hash_do_for_each (muscle_table, muscle_m4_output_processor, out);
|
||||||
(Hash_processor) muscle_m4_output,
|
|
||||||
out);
|
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user