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

* src/output.c (froms, tos): Are state_number_t.

Browse Source 
(save_column): sp, sp1, and sp2 are state_number_t.
(prepare): Rename `final' as `final_state_number', `nnts' as
`nterms_number', `nrules' as `rules_number', `nstates' as
`states_number', and `ntokens' as `tokens_number'.  Remove `nsym',
unused.
* data/yacc.c, data/glr.c, data/lalr1.cc: Adjust.
* data/lalr1.cc (nsym_): Remove, unused.
This commit is contained in:
Akim Demaille
2002-07-03 12:51:30 +00:00
parent 3a9e26be57
commit 7db2ed2d82
6 changed files with 61 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
src/output.c
View File

@@ -20,17 +20,15 @@
02111-1307, USA. */
/* The parser tables consist of these tables. Marked ones needed only
for the semantic parser. Double marked are output only if switches
are set.
/* The parser tables consist of these tables.
YYTRANSLATE = vector mapping yylex's token numbers into bison's
token numbers.
++ YYTNAME = vector of string-names indexed by bison token number.
YYTNAME = vector of string-names indexed by bison token number.
++ YYTOKNUM = vector of yylex token numbers corresponding to
entries in YYTNAME.
YYTOKNUM = vector of yylex token numbers corresponding to entries
in YYTNAME.
YYRLINE = vector of line-numbers of all rules. For yydebug
printouts.
@@ -44,8 +42,7 @@
YYR2[R] = number of symbols composing right hand side of rule R.
+ YYSTOS[S] = the symbol number of the symbol that leads to state
S.
YYSTOS[S] = the symbol number of the symbol that leads to state S.
YYDEFACT[S] = default rule to reduce with in state s, when YYTABLE
doesn't specify something else to do. Zero means the default is an
@@ -109,8 +106,8 @@ void m4_invoke PARAMS ((const char *definitions));
static int nvectors;
static int nentries;
static short **froms = NULL;
static short **tos = NULL;
static state_number_t **froms = NULL;
static state_number_t **tos = NULL;
static unsigned int **conflict_tos = NULL;
static short *tally = NULL;
static short *width = NULL;
@@ -790,14 +787,14 @@ static void
save_column (symbol_number_t symbol, state_number_t default_state)
{
int i;
short *sp;
short *sp1;
short *sp2;
state_number_t *sp;
state_number_t *sp1;
state_number_t *sp2;
int count;
int symno = symbol - ntokens + state_number_as_int (nstates);
int begin = goto_map[symbol];
int end = goto_map[symbol + 1];
goto_number_t begin = goto_map[symbol];
goto_number_t end = goto_map[symbol + 1];
count = 0;
for (i = begin; i < end; i++)
@@ -827,8 +824,8 @@ default_goto (symbol_number_t symbol)
{
state_number_t s;
int i;
int m = goto_map[symbol];
int n = goto_map[symbol + 1];
goto_number_t m = goto_map[symbol];
goto_number_t n = goto_map[symbol + 1];
state_number_t default_state = (state_number_t) -1;
int max = 0;
@@ -1214,33 +1211,37 @@ output_skeleton (void)
static void
prepare (void)
{
MUSCLE_INSERT_INT ("last", high);
MUSCLE_INSERT_INT ("flag", SHRT_MIN);
MUSCLE_INSERT_INT ("pure", pure_parser);
MUSCLE_INSERT_INT ("nsym", nsyms);
MUSCLE_INSERT_INT ("debug", debug_flag);
MUSCLE_INSERT_INT ("final", final_state->number);
MUSCLE_INSERT_INT ("undef_token_number", undeftoken->number);
MUSCLE_INSERT_INT ("user_token_number_max", max_user_token_number);
/* Flags. */
MUSCLE_INSERT_INT ("locations_flag", locations_flag);
MUSCLE_INSERT_INT ("defines_flag", defines_flag);
MUSCLE_INSERT_INT ("error_verbose", error_verbose);
MUSCLE_INSERT_STRING ("prefix", spec_name_prefix ? spec_name_prefix : "yy");
MUSCLE_INSERT_INT ("pure", pure_parser);
MUSCLE_INSERT_INT ("debug", debug_flag);
/* FIXME: This is wrong: the muscles should decide whether they hold
a copy or not, but the situation is too obscure currently. */
MUSCLE_INSERT_STRING ("prefix", spec_name_prefix ? spec_name_prefix : "yy");
MUSCLE_INSERT_STRING ("output_infix", output_infix ? output_infix : "");
MUSCLE_INSERT_STRING ("output_prefix", short_base_name);
MUSCLE_INSERT_STRING ("output_parser_name", parser_file_name);
MUSCLE_INSERT_STRING ("output_header_name", spec_defines_file);
MUSCLE_INSERT_INT ("nnts", nvars);
MUSCLE_INSERT_INT ("nrules", nrules);
MUSCLE_INSERT_INT ("nstates", nstates);
MUSCLE_INSERT_INT ("ntokens", ntokens);
/* Symbols. */
MUSCLE_INSERT_INT ("tokens_number", ntokens);
MUSCLE_INSERT_INT ("nterms_number", nvars);
MUSCLE_INSERT_INT ("undef_token_number", undeftoken->number);
MUSCLE_INSERT_INT ("user_token_number_max", max_user_token_number);
MUSCLE_INSERT_INT ("locations_flag", locations_flag);
MUSCLE_INSERT_INT ("defines_flag", defines_flag);
/* Rules. */
MUSCLE_INSERT_INT ("rules_number", nrules);
/* Copy definitions in directive. */
/* States. */
MUSCLE_INSERT_INT ("last", high);
MUSCLE_INSERT_INT ("flag", SHRT_MIN);
MUSCLE_INSERT_INT ("final_state_number", final_state->number);
MUSCLE_INSERT_INT ("states_number", nstates);
/* User Code. */
obstack_1grow (&pre_prologue_obstack, 0);
obstack_1grow (&post_prologue_obstack, 0);
muscle_insert ("pre_prologue", obstack_finish (&pre_prologue_obstack));

6
src/state.c
View File

@@ -35,9 +35,9 @@
| Create a new array of N shifts/gotos. |
`---------------------------------------*/
#define TRANSITIONS_ALLOC(Nshifts) \
(transitions_t *) xcalloc ((unsigned) (sizeof (transitions_t) \
+ (Nshifts - 1) * sizeof (state_number_t)), 1)
#define TRANSITIONS_ALLOC(Num) \
(transitions_t *) xcalloc ((sizeof (transitions_t) \
+ (Num - 1) * sizeof (state_number_t)), 1)
static transitions_t *
transitions_new (int num, state_number_t *the_states)