* 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[

View File

@@ -253,7 +253,6 @@ namespace yy
static const int last_;
static const int flag_;
static const int nnts_;
static const int nsym_;
static const int empty_;
static const int final_;
static const int terror_;
@@ -759,13 +758,12 @@ yy::b4_name::translate_ (int token)
const int yy::b4_name::eof_ = 0;
const int yy::b4_name::last_ = b4_last;
const int yy::b4_name::flag_ = b4_flag;
const int yy::b4_name::nnts_ = b4_nnts;
const int yy::b4_name::nsym_ = b4_nsym;
const int yy::b4_name::nnts_ = b4_nterms_number;
const int yy::b4_name::empty_ = -2;
const int yy::b4_name::final_ = b4_final;
const int yy::b4_name::final_ = b4_final_state_number;
const int yy::b4_name::terror_ = 1;
const int yy::b4_name::errcode_ = 256;
const int yy::b4_name::ntokens_ = b4_ntokens;
const int yy::b4_name::ntokens_ = b4_tokens_number;
const int yy::b4_name::initdepth_ = b4_initdepth;
const unsigned yy::b4_name::user_token_number_max_ = b4_user_token_number_max;

View File

@@ -302,18 +302,18 @@ b4_location_if(
#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
/* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */
#define YYUNDEFTOK b4_undef_token_number