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

* src/output.c (GENERATE_OUTPUT_TABLE): Replace with...

Browse Source 
(GENERATE_MUSCLE_INSERT_TABLE): this.
(output_int_table, output_unsigned_int_table, output_short_table)
(output_token_number_table, output_item_number_table): Replace with...
(muscle_insert_int_table, muscle_insert_unsigned_int_table)
(muscle_insert_short_table, muscle_insert_token_number_table)
(muscle_insert_item_number_table): these.
Adjust all callers.
(prepare_tokens): Don't free `translations', since...
* src/reader.h, src/reader.c (grammar_free): do it.
Move to...
* src/gram.h, src/gram.c (grammar_free): here.
* data/bison.simple, data/bison.c++: b4_token_number_max is now
b4_translate_max.
This commit is contained in:
Akim Demaille
2002-05-05 11:56:27 +00:00
parent 5df5f6d538
commit 5372019fab
8 changed files with 83 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
ChangeLog
View File

@@ -1,3 +1,21 @@
2002-05-05 Akim Demaille <akim@epita.fr>
* src/output.c (GENERATE_OUTPUT_TABLE): Replace with...
(GENERATE_MUSCLE_INSERT_TABLE): this.
(output_int_table, output_unsigned_int_table, output_short_table)
(output_token_number_table, output_item_number_table): Replace with...
(muscle_insert_int_table, muscle_insert_unsigned_int_table)
(muscle_insert_short_table, muscle_insert_token_number_table)
(muscle_insert_item_number_table): these.
Adjust all callers.
(prepare_tokens): Don't free `translations', since...
* src/reader.h, src/reader.c (grammar_free): do it.
Move to...
* src/gram.h, src/gram.c (grammar_free): here.
* data/bison.simple, data/bison.c++: b4_token_number_max is now
b4_translate_max.
2002-05-05 Akim Demaille <akim@epita.fr> 2002-05-05 Akim Demaille <akim@epita.fr>
* src/output.c (output_unsigned_int_table): New. * src/output.c (output_unsigned_int_table): New.

4
data/bison.c++
View File

@@ -202,8 +202,8 @@ namespace yy
template < > template < >
struct Traits< b4_name > struct Traits< b4_name >
{ {
typedef b4_uint_type(b4_token_number_max) TokenNumberType; typedef b4_uint_type(b4_translate_max) TokenNumberType;
typedef b4_sint_type(b4_rhs_max) RhsNumberType; typedef b4_sint_type(b4_rhs_max) RhsNumberType;
typedef int StateType; typedef int StateType;
typedef yystype SemanticType; typedef yystype SemanticType;
typedef b4_ltype LocationType; typedef b4_ltype LocationType;

2
data/bison.simple
View File

@@ -334,7 +334,7 @@ b4_token_defines(b4_tokens)
#define YYUNDEFTOK b4_undef_token_number #define YYUNDEFTOK b4_undef_token_number
#define YYMAXUTOK b4_user_token_number_max #define YYMAXUTOK b4_user_token_number_max
typedef b4_uint_type(b4_token_number_max) yy_token_number_type; typedef b4_uint_type(b4_translate_max) yy_token_number_type;
#define YYTRANSLATE(X) \ #define YYTRANSLATE(X) \
((unsigned)(X) <= YYMAXUTOK ? yytranslate[[X]] : YYUNDEFTOK) ((unsigned)(X) <= YYMAXUTOK ? yytranslate[[X]] : YYUNDEFTOK)

11
src/gram.c
View File

@@ -159,3 +159,14 @@ grammar_dump (FILE *out, const char *title)
} }
fprintf (out, "\n\n"); fprintf (out, "\n\n");
} }
void
grammar_free (void)
{
XFREE (ritem);
free (rules + 1);
XFREE (token_translations);
/* Free the symbol table data structure. */
symbols_free ();
}

3
src/gram.h
View File

@@ -181,4 +181,7 @@ size_t ritem_longest_rhs PARAMS ((void));
/* Dump the grammar. */ /* Dump the grammar. */
void grammar_dump PARAMS ((FILE *out, const char *title)); void grammar_dump PARAMS ((FILE *out, const char *title));
/* Free the packed grammar. */
void grammar_free PARAMS ((void));
#endif /* !GRAM_H_ */ #endif /* !GRAM_H_ */

118
src/output.c
View File

@@ -167,17 +167,18 @@ table_grow (size_t desired)
} }
/*------------------------------------------------------------------. /*-------------------------------------------------------------------.
| Create a function NAME which Format the FIRST and then | | Create a function NAME which associates to the muscle NAME the |
| TABLE_DATA[BEGIN..END[ (of TYPE) into OOUT, and return the number | | result of formatting the FIRST and then TABLE_DATA[BEGIN..END[ (of |
| of bits needed for its longuest value. | | TYPE), and to the muscle NAME_max, the max value of the |
`------------------------------------------------------------------*/ | TABLE_DATA. |
`-------------------------------------------------------------------*/
#define GENERATE_OUTPUT_TABLE(Name, Type) \ #define GENERATE_MUSCLE_INSERT_TABLE(Name, Type) \
\ \
static inline long int \ static void \
Name (struct obstack *oout, \ Name (const char *name, \
Type *table_data, \ Type *table_data, \
Type first, \ Type first, \
int begin, \ int begin, \
@@ -187,31 +188,35 @@ Name (struct obstack *oout, \
int i; \ int i; \
int j = 1; \ int j = 1; \
\ \
obstack_fgrow1 (oout, "%6d", first); \ obstack_fgrow1 (&format_obstack, "%6d", first); \
for (i = begin; i < end; ++i) \ for (i = begin; i < end; ++i) \
{ \ { \
obstack_1grow (oout, ','); \ obstack_1grow (&format_obstack, ','); \
if (j >= 10) \ if (j >= 10) \
{ \ { \
obstack_sgrow (oout, "\n "); \ obstack_sgrow (&format_obstack, "\n "); \
j = 1; \ j = 1; \
} \ } \
else \ else \
++j; \ ++j; \
obstack_fgrow1 (oout, "%6d", table_data[i]); \ obstack_fgrow1 (&format_obstack, "%6d", table_data[i]); \
if (table_data[i] > max) \ if (table_data[i] > max) \
max = table_data[i]; \ max = table_data[i]; \
} \ } \
obstack_1grow (oout, 0); \ obstack_1grow (&format_obstack, 0); \
muscle_insert (name, obstack_finish (&format_obstack)); \
\ \
return max; \ /* Build `NAME_max' in the obstack. */ \
obstack_fgrow1 (&format_obstack, "%s_max", name); \
obstack_1grow (&format_obstack, 0); \
MUSCLE_INSERT_LONG_INT (obstack_finish (&format_obstack), max); \
} }
GENERATE_OUTPUT_TABLE(output_int_table, int) GENERATE_MUSCLE_INSERT_TABLE(muscle_insert_int_table, int)
GENERATE_OUTPUT_TABLE(output_unsigned_int_table, unsigned int) GENERATE_MUSCLE_INSERT_TABLE(muscle_insert_unsigned_int_table, unsigned int)
GENERATE_OUTPUT_TABLE(output_short_table, short) GENERATE_MUSCLE_INSERT_TABLE(muscle_insert_short_table, short)
GENERATE_OUTPUT_TABLE(output_token_number_table, token_number_t) GENERATE_MUSCLE_INSERT_TABLE(muscle_insert_token_number_table, token_number_t)
GENERATE_OUTPUT_TABLE(output_item_number_table, item_number_t) GENERATE_MUSCLE_INSERT_TABLE(muscle_insert_item_number_table, item_number_t)
/*-----------------------------------------------------------------. /*-----------------------------------------------------------------.
@@ -222,12 +227,9 @@ GENERATE_OUTPUT_TABLE(output_item_number_table, item_number_t)
static void static void
prepare_tokens (void) prepare_tokens (void)
{ {
long int max = output_token_number_table (&format_obstack, muscle_insert_token_number_table ("translate",
token_translations, token_translations,
0, 1, max_user_token_number + 1); 0, 1, max_user_token_number + 1);
muscle_insert ("translate", obstack_finish (&format_obstack));
MUSCLE_INSERT_LONG_INT ("token_number_max", max);
XFREE (token_translations);
{ {
int i; int i;
@@ -268,9 +270,8 @@ prepare_tokens (void)
short *values = XCALLOC (short, ntokens + 1); short *values = XCALLOC (short, ntokens + 1);
for (i = 0; i < ntokens + 1; ++i) for (i = 0; i < ntokens + 1; ++i)
values[i] = symbols[i]->user_token_number; values[i] = symbols[i]->user_token_number;
output_short_table (&format_obstack, values, muscle_insert_short_table ("toknum", values,
0, 1, ntokens + 1); 0, 1, ntokens + 1);
muscle_insert ("toknum", obstack_finish (&format_obstack));
free (values); free (values);
} }
} }
@@ -312,24 +313,11 @@ prepare_rules (void)
} }
assert (i == nritems); assert (i == nritems);
max = output_item_number_table (&format_obstack, rhs, ritem[0], 1, nritems); muscle_insert_item_number_table ("rhs", rhs, ritem[0], 1, nritems);
muscle_insert ("rhs", obstack_finish (&format_obstack)); muscle_insert_unsigned_int_table ("prhs", prhs, 0, 1, nrules + 1);
MUSCLE_INSERT_LONG_INT ("rhs_max", max); muscle_insert_unsigned_int_table ("rline", rline, 0, 1, nrules + 1);
muscle_insert_token_number_table ("r1", r1, 0, 1, nrules + 1);
max = output_unsigned_int_table (&format_obstack, prhs, 0, 1, nrules + 1); muscle_insert_unsigned_int_table ("r2", r2, 0, 1, nrules + 1);
muscle_insert ("prhs", obstack_finish (&format_obstack));
MUSCLE_INSERT_LONG_INT ("prhs_max", max);
max = output_unsigned_int_table (&format_obstack, rline, 0, 1, nrules + 1);
muscle_insert ("rline", obstack_finish (&format_obstack));
MUSCLE_INSERT_LONG_INT ("rline_max", max);
output_token_number_table (&format_obstack, r1, 0, 1, nrules + 1);
muscle_insert ("r1", obstack_finish (&format_obstack));
max = output_unsigned_int_table (&format_obstack, r2, 0, 1, nrules + 1);
muscle_insert ("r2", obstack_finish (&format_obstack));
MUSCLE_INSERT_LONG_INT ("r2_max", max);
free (rhs); free (rhs);
free (prhs); free (prhs);
@@ -350,9 +338,8 @@ prepare_states (void)
(token_number_t *) alloca (sizeof (token_number_t) * nstates); (token_number_t *) alloca (sizeof (token_number_t) * nstates);
for (i = 0; i < nstates; ++i) for (i = 0; i < nstates; ++i)
values[i] = states[i]->accessing_symbol; values[i] = states[i]->accessing_symbol;
output_token_number_table (&format_obstack, values, muscle_insert_token_number_table ("stos", values,
0, 1, nstates); 0, 1, nstates);
muscle_insert ("stos", obstack_finish (&format_obstack));
} }
@@ -537,10 +524,8 @@ token_actions (void)
save_row (i); save_row (i);
} }
output_short_table (&format_obstack, yydefact, muscle_insert_short_table ("defact", yydefact,
yydefact[0], 1, nstates); yydefact[0], 1, nstates);
muscle_insert ("defact", obstack_finish (&format_obstack));
XFREE (actrow); XFREE (actrow);
XFREE (yydefact); XFREE (yydefact);
} }
@@ -708,10 +693,8 @@ goto_actions (void)
yydefgoto[i - ntokens] = default_state; yydefgoto[i - ntokens] = default_state;
} }
output_short_table (&format_obstack, yydefgoto, muscle_insert_short_table ("defgoto", yydefgoto,
yydefgoto[0], 1, nsyms - ntokens); yydefgoto[0], 1, nsyms - ntokens);
muscle_insert ("defgoto", obstack_finish (&format_obstack));
XFREE (state_count); XFREE (state_count);
XFREE (yydefgoto); XFREE (yydefgoto);
} }
@@ -893,15 +876,12 @@ static void
output_base (void) output_base (void)
{ {
/* Output pact. */ /* Output pact. */
output_short_table (&format_obstack, base, muscle_insert_short_table ("pact", base,
base[0], 1, nstates); base[0], 1, nstates);
muscle_insert ("pact", obstack_finish (&format_obstack));
/* Output pgoto. */ /* Output pgoto. */
output_short_table (&format_obstack, base, muscle_insert_short_table ("pgoto", base,
base[nstates], nstates + 1, nvectors); base[nstates], nstates + 1, nvectors);
muscle_insert ("pgoto", obstack_finish (&format_obstack));
XFREE (base); XFREE (base);
} }
@@ -909,9 +889,8 @@ output_base (void)
static void static void
output_table (void) output_table (void)
{ {
output_short_table (&format_obstack, table, muscle_insert_short_table ("table", table,
table[0], 1, high + 1); table[0], 1, high + 1);
muscle_insert ("table", obstack_finish (&format_obstack));
XFREE (table); XFREE (table);
} }
@@ -919,9 +898,8 @@ output_table (void)
static void static void
output_check (void) output_check (void)
{ {
output_short_table (&format_obstack, check, muscle_insert_short_table ("check", check,
check[0], 1, high + 1); check[0], 1, high + 1);
muscle_insert ("check", obstack_finish (&format_obstack));
XFREE (check); XFREE (check);
} }

9
src/reader.c
View File

@@ -1871,12 +1871,3 @@ reader (void)
/* The grammar as a symbol_list is no longer needed. */ /* The grammar as a symbol_list is no longer needed. */
LIST_FREE (symbol_list, grammar); LIST_FREE (symbol_list, grammar);
} }
void
grammar_free (void)
{
XFREE (ritem);
free (rules + 1);
/* Free the symbol table data structure. */
symbols_free ();
}

3
src/reader.h
View File

@@ -28,9 +28,6 @@
void reader PARAMS ((void)); void reader PARAMS ((void));
/* Free the packed grammar. */
void grammar_free PARAMS ((void));
extern int lineno; extern int lineno;
extern symbol_t *errtoken; extern symbol_t *errtoken;