#include "symtab.h"
#include "tables.h"
-# define ARRAY_CARDINALITY(Array) (sizeof (Array) / sizeof *(Array))
-
static struct obstack format_obstack;
int i; \
int j = 1; \
\
- obstack_fgrow1 (&format_obstack, "%6d", first); \
+ obstack_printf (&format_obstack, "%6d", first); \
for (i = begin; i < end; ++i) \
{ \
obstack_1grow (&format_obstack, ','); \
} \
else \
++j; \
- obstack_fgrow1 (&format_obstack, "%6d", table_data[i]); \
+ obstack_printf (&format_obstack, "%6d", table_data[i]); \
if (table_data[i] < min) \
min = table_data[i]; \
if (max < table_data[i]) \
max = table_data[i]; \
} \
- obstack_1grow (&format_obstack, 0); \
- muscle_insert (name, obstack_finish (&format_obstack)); \
+ muscle_insert (name, obstack_finish0 (&format_obstack)); \
\
lmin = min; \
lmax = max; \
/* Build `NAME_min' and `NAME_max' in the obstack. */ \
- obstack_fgrow1 (&format_obstack, "%s_min", name); \
- obstack_1grow (&format_obstack, 0); \
- MUSCLE_INSERT_LONG_INT (obstack_finish (&format_obstack), lmin); \
- obstack_fgrow1 (&format_obstack, "%s_max", name); \
- obstack_1grow (&format_obstack, 0); \
- MUSCLE_INSERT_LONG_INT (obstack_finish (&format_obstack), lmax); \
+ obstack_printf (&format_obstack, "%s_min", name); \
+ MUSCLE_INSERT_LONG_INT (obstack_finish0 (&format_obstack), lmin); \
+ obstack_printf (&format_obstack, "%s_max", name); \
+ MUSCLE_INSERT_LONG_INT (obstack_finish0 (&format_obstack), lmax); \
}
GENERATE_MUSCLE_INSERT_TABLE(muscle_insert_unsigned_int_table, unsigned int)
GENERATE_MUSCLE_INSERT_TABLE(muscle_insert_state_number_table, state_number)
-/*--------------------------------------------------------------------.
-| Print to OUT a representation of STRING escaped both for C and M4. |
-`--------------------------------------------------------------------*/
+/*----------------------------------------------------------------.
+| Print to OUT a representation of CP quoted and escaped for M4. |
+`----------------------------------------------------------------*/
static void
-escaped_output (FILE *out, char const *string)
+quoted_output (FILE *out, char const *cp)
{
- char const *p;
fprintf (out, "[[");
- for (p = quotearg_style (c_quoting_style, string); *p; p++)
- switch (*p)
+ for (; *cp; cp++)
+ switch (*cp)
{
case '$': fputs ("$][", out); break;
case '@': fputs ("@@", out); break;
case '[': fputs ("@{", out); break;
case ']': fputs ("@}", out); break;
- default: fputc (*p, out); break;
+ default: fputc (*cp, out); break;
}
fprintf (out, "]]");
}
+/*----------------------------------------------------------------.
+| Print to OUT a representation of STRING quoted and escaped both |
+| for C and M4. |
+`----------------------------------------------------------------*/
+
+static void
+string_output (FILE *out, char const *string)
+{
+ quoted_output (out, quotearg_style (c_quoting_style, string));
+}
+
/*------------------------------------------------------------------.
| Prepare the muscles related to the symbols: translate, tname, and |
static void
prepare_symbols (void)
{
- MUSCLE_INSERT_BOOL ("token_table", token_table_flag);
MUSCLE_INSERT_INT ("tokens_number", ntokens);
MUSCLE_INSERT_INT ("nterms_number", nvars);
MUSCLE_INSERT_INT ("symbols_number", nsyms);
if (i)
obstack_1grow (&format_obstack, ' ');
- MUSCLE_OBSTACK_SGROW (&format_obstack, cp);
+ obstack_escape (&format_obstack, cp);
free (cp);
obstack_1grow (&format_obstack, ',');
j += width;
obstack_sgrow (&format_obstack, " ]b4_null[");
/* Finish table and store. */
- obstack_1grow (&format_obstack, 0);
- muscle_insert ("tname", obstack_finish (&format_obstack));
+ muscle_insert ("tname", obstack_finish0 (&format_obstack));
}
/* Output YYTOKNUM. */
static int
symbol_type_name_cmp (const symbol **lhs, const symbol **rhs)
{
- int res = UNIQSTR_CMP((*lhs)->type_name, (*rhs)->type_name);
- if (res)
- return res;
- return (*lhs)->number - (*rhs)->number;
+ int res = uniqstr_cmp ((*lhs)->type_name, (*rhs)->type_name);
+ if (!res)
+ res = (*lhs)->number - (*rhs)->number;
+ return res;
}
fputs ("m4_define([b4_type_names],\n[", out);
for (i = 0; i < nsyms; /* nothing */)
{
- // The index of the first symbol of the current type-name.
+ /* The index of the first symbol of the current type-name. */
int i0 = i;
fputs (i ? ",\n[" : "[", out);
for (; i < nsyms && syms[i]->type_name == syms[i0]->type_name; ++i)
fprintf (out, "b4_%scase(%d, [b4_syncline(%d, ",
rules[r].is_predicate ? "predicate_" : "",
r + 1, rules[r].action_location.start.line);
- escaped_output (out, rules[r].action_location.start.file);
+ string_output (out, rules[r].action_location.start.file);
fprintf (out, ")\n[ %s]])\n\n", rules[r].action);
}
fputs ("])\n\n", out);
const char *value;
#define SET_KEY(Entry) \
- obstack_fgrow2 (&format_obstack, "symbol(%d, %s)", \
+ obstack_printf (&format_obstack, "symbol(%d, %s)", \
i, Entry); \
- obstack_1grow (&format_obstack, 0); \
- key = obstack_finish (&format_obstack);
+ key = obstack_finish0 (&format_obstack);
#define SET_KEY2(Entry, Suffix) \
- obstack_fgrow3 (&format_obstack, "symbol(%d, %s_%s)", \
+ obstack_printf (&format_obstack, "symbol(%d, %s_%s)", \
i, Entry, Suffix); \
- obstack_1grow (&format_obstack, 0); \
- key = obstack_finish (&format_obstack);
+ key = obstack_finish0 (&format_obstack);
- // Whether the symbol has an identifier.
+ /* Whether the symbol has an identifier. */
value = symbol_id_get (sym);
SET_KEY("has_id");
MUSCLE_INSERT_INT (key, !!value);
- // Its identifier.
+ /* Its identifier. */
SET_KEY("id");
MUSCLE_INSERT_STRING (key, value ? value : "");
- // Its tag. Typically for documentation purpose.
+ /* Its tag. Typically for documentation purpose. */
SET_KEY("tag");
MUSCLE_INSERT_STRING (key, sym->tag);
}
-/*--------------------------------------.
-| Output the tokens definition to OUT. |
-`--------------------------------------*/
-
-static void
-token_definitions_output (FILE *out)
-{
- int i;
- char const *sep = "";
-
- fputs ("m4_define([b4_tokens], \n[", out);
- for (i = 0; i < ntokens; ++i)
- {
- symbol *sym = symbols[i];
- int number = sym->user_token_number;
- uniqstr id = symbol_id_get (sym);
-
- /* At this stage, if there are literal string aliases, they are
- part of SYMBOLS, so we should not find their aliased symbols
- here. */
- aver (number != USER_NUMBER_HAS_STRING_ALIAS);
-
- /* Skip error token and tokens without identifier. */
- if (sym != errtoken && id)
- {
- fprintf (out, "%s[[[%s]], %d]",
- sep, id, number);
- sep = ",\n";
- }
- }
- fputs ("])\n\n", out);
-}
-
-
static void
prepare_actions (void)
{
fputs ("m4_init()\n", out);
merger_output (out);
symbol_numbers_output (out);
- token_definitions_output (out);
type_names_output (out);
user_actions_output (out);
- // Must be last.
+ /* Must be last. */
muscles_m4_output (out);
}
\f
MUSCLE_INSERT_BOOL ("nondeterministic_flag", nondeterministic_parser);
MUSCLE_INSERT_BOOL ("synclines_flag", !no_lines_flag);
MUSCLE_INSERT_BOOL ("tag_seen_flag", tag_seen);
+ MUSCLE_INSERT_BOOL ("token_table_flag", token_table_flag);
MUSCLE_INSERT_BOOL ("use_push_for_pull_flag", use_push_for_pull_flag);
MUSCLE_INSERT_BOOL ("yacc_flag", yacc_flag);
projects / bison.git / blobdiff