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

obstack_escape: escape M4 characters

Browse Source 
* src/muscle-tab.h (MUSCLE_OBSTACK_SGROW): This is not related to
muscles, so move to, and rename as...
* src/system.h (obstack_escape): this.
Adjust dependencies.
This commit is contained in:
Akim Demaille
2012-07-26 11:19:18 +02:00
parent dba9149595
commit 13b712d7d4
4 changed files with 30 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/muscle-tab.c
View File

@@ -178,8 +178,8 @@ muscle_syncline_grow (char const *key, location loc)
{ {
char *extension = NULL; char *extension = NULL;
obstack_fgrow1 (&muscle_obstack, "]b4_syncline(%d, [[", loc.start.line); obstack_fgrow1 (&muscle_obstack, "]b4_syncline(%d, [[", loc.start.line);
MUSCLE_OBSTACK_SGROW (&muscle_obstack, obstack_escape (&muscle_obstack,
quotearg_style (c_quoting_style, loc.start.file)); quotearg_style (c_quoting_style, loc.start.file));
obstack_sgrow (&muscle_obstack, "]])["); obstack_sgrow (&muscle_obstack, "]])[");
obstack_1grow (&muscle_obstack, 0); obstack_1grow (&muscle_obstack, 0);
extension = obstack_finish (&muscle_obstack); extension = obstack_finish (&muscle_obstack);
@@ -206,9 +206,9 @@ void muscle_pair_list_grow (const char *muscle,
{ {
char *pair; char *pair;
obstack_sgrow (&muscle_obstack, "[[["); obstack_sgrow (&muscle_obstack, "[[[");
MUSCLE_OBSTACK_SGROW (&muscle_obstack, a1); obstack_escape (&muscle_obstack, a1);
obstack_sgrow (&muscle_obstack, "]], [["); obstack_sgrow (&muscle_obstack, "]], [[");
MUSCLE_OBSTACK_SGROW (&muscle_obstack, a2); obstack_escape (&muscle_obstack, a2);
obstack_sgrow (&muscle_obstack, "]]]"); obstack_sgrow (&muscle_obstack, "]]]");
obstack_1grow (&muscle_obstack, 0); obstack_1grow (&muscle_obstack, 0);
pair = obstack_finish (&muscle_obstack); pair = obstack_finish (&muscle_obstack);
@@ -263,7 +263,7 @@ void
muscle_boundary_grow (char const *key, boundary bound) muscle_boundary_grow (char const *key, boundary bound)
{ {
char *extension; char *extension;
MUSCLE_OBSTACK_SGROW (&muscle_obstack, bound.file); obstack_escape (&muscle_obstack, bound.file);
obstack_1grow (&muscle_obstack, ':'); obstack_1grow (&muscle_obstack, ':');
obstack_fgrow1 (&muscle_obstack, "%d", bound.line); obstack_fgrow1 (&muscle_obstack, "%d", bound.line);
obstack_1grow (&muscle_obstack, '.'); obstack_1grow (&muscle_obstack, '.');

21
src/muscle-tab.h
View File

@@ -64,30 +64,15 @@ extern struct obstack muscle_obstack;
#define MUSCLE_INSERT_STRING(Key, Value) \ #define MUSCLE_INSERT_STRING(Key, Value) \
do { \ do { \
MUSCLE_OBSTACK_SGROW (&muscle_obstack, Value); \ obstack_escape (&muscle_obstack, Value); \
obstack_1grow (&muscle_obstack, 0); \ obstack_1grow (&muscle_obstack, 0); \
muscle_insert (Key, obstack_finish (&muscle_obstack)); \ muscle_insert (Key, obstack_finish (&muscle_obstack)); \
} while (0) } while (0)
#define MUSCLE_OBSTACK_SGROW(Obstack, Value) \
do { \
char const *p; \
for (p = Value; *p; p++) \
switch (*p) \
{ \
case '$': obstack_sgrow (Obstack, "$]["); break; \
case '@': obstack_sgrow (Obstack, "@@" ); break; \
case '[': obstack_sgrow (Obstack, "@{" ); break; \
case ']': obstack_sgrow (Obstack, "@}" ); break; \
default: obstack_1grow (Obstack, *p); break; \
} \
} while (0)
#define MUSCLE_INSERT_C_STRING(Key, Value) \ #define MUSCLE_INSERT_C_STRING(Key, Value) \
do { \ do { \
MUSCLE_OBSTACK_SGROW (&muscle_obstack, \ obstack_escape (&muscle_obstack, \
quotearg_style (c_quoting_style, \ quotearg_style (c_quoting_style, Value)); \
Value)); \
obstack_1grow (&muscle_obstack, 0); \ obstack_1grow (&muscle_obstack, 0); \
muscle_insert (Key, obstack_finish (&muscle_obstack)); \ muscle_insert (Key, obstack_finish (&muscle_obstack)); \
} while (0) } while (0)

2
src/output.c
View File

@@ -175,7 +175,7 @@ prepare_symbols (void)
if (i) if (i)
obstack_1grow (&format_obstack, ' '); obstack_1grow (&format_obstack, ' ');
MUSCLE_OBSTACK_SGROW (&format_obstack, cp); obstack_escape (&format_obstack, cp);
free (cp); free (cp);
obstack_1grow (&format_obstack, ','); obstack_1grow (&format_obstack, ',');
j += width; j += width;

21
src/system.h
View File

@@ -192,6 +192,27 @@ typedef size_t uintptr_t;
} while (0) } while (0)
/* Output Str escaped for our postprocessing (i.e., escape M4 special
characters).
For instance "[foo]" -> "@{foo@}", "$$" -> "$][$][". */
# define obstack_escape(Obs, Str) \
do { \
char const *p; \
for (p = Str; *p; p++) \
switch (*p) \
{ \
case '$': obstack_sgrow (Obs, "$]["); break; \
case '@': obstack_sgrow (Obs, "@@" ); break; \
case '[': obstack_sgrow (Obs, "@{" ); break; \
case ']': obstack_sgrow (Obs, "@}" ); break; \
default: obstack_1grow (Obs, *p ); break; \
} \
} while (0)
/*-----------------------------------------. /*-----------------------------------------.
| Extensions to use for the output files. | | Extensions to use for the output files. |