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

(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

View File

@@ -218,18 +218,18 @@ static YYLTYPE yyloc_default;
#endif
/* YYFINAL -- State number of the termination state. */
#define YYFINAL ]b4_final[
#define YYFINAL ]b4_final_state_number[
#define YYFLAG ]b4_flag[
#define YYLAST ]b4_last[
/* YYNTOKENS -- Number of terminals. */
#define YYNTOKENS ]b4_ntokens[
#define YYNTOKENS ]b4_tokens_number[
/* YYNNTS -- Number of nonterminals. */
#define YYNNTS ]b4_nnts[
#define YYNNTS ]b4_nterms_number[
/* YYNRULES -- Number of rules. */
#define YYNRULES ]b4_nrules[
#define YYNRULES ]b4_rules_number[
/* YYNRULES -- Number of states. */
#define YYNSTATES ]b4_nstates[
#define YYNSTATES ]b4_states_number[
/* YYMAXRHS -- Maximum number of symbols on right-hand side of rule. */
#define YYMAXRHS ]b4_r2_max[