* src/gram.h (TIEM_NUMBER_MAX): New.

(item_number_of_rule_number, rule_number_of_item_number): Rename
as...
(rule_number_as_item_number, item_number_as_rule_number): these.
Adjust dependencies.
* src/output.c (vector_number_t, VECTOR_NUMBER_MAX)
(VECTOR_NUMBER_MIN, state_number_to_vector_number)
(symbol_number_to_vector_number): New.
(order): Of vector_number_t* type.
(base_t, BASE_MAX, BASE_MIN): New.
(froms, tos, width, pos, check): Of base_t type.
(action_number_t, ACTION_MIN, ACTION_MAX): New.
(actrow): Of action_number_t type.
(conflrow): Of unsigned int type.
(table_ninf, base_ninf): New.
(GENERATE_MUSCLE_INSERT_TABLE): Also output the `*_min' value.
(muscle_insert_int_table, muscle_insert_base_table)
(muscle_insert_rule_number_table): New.
(prepare_tokens): Output `toknum' as int_table.
(action_row): Returns a rule_number_t.
Use ACTION_MIN, not SHRT_MIN.
(token_actions): yydefact is rule_number_t*.
(table_ninf_remap): New.
(pack_table): Use it for `base' and `table'.
* data/yacc.c, data/glr.c, data/lalr1.cc (YYFLAG): Remove,
replaced with...
(YYPACT_NINF, YYTABLE_NINF): these.
(yypact, yytable): Compute their types instead of hard-coded
`short'.
* tests/regression.at (Web2c Actions): Adjust.
This commit is contained in:
Akim Demaille
2002-07-25 17:30:44 +00:00
parent 5dde258a9e
commit 12b0043a6d
10 changed files with 327 additions and 139 deletions

View File

@@ -608,16 +608,16 @@ static const short yydefgoto[] =
{
-1, 2, 3, 4, 8
};
static const short yypact[] =
static const signed char yypact[] =
{
-2, -1, 4,-32768, 0, 2,-32768, -2,-32768, -2,
-32768,-32768
-2, -1, 4, -8, 0, 2, -8, -2, -8, -2,
-8, -8
};
static const short yypgoto[] =
{
-32768, -7,-32768,-32768,-32768
-8, -7, -8, -8, -8
};
static const short yytable[] =
static const signed char yytable[] =
{
10, 1, 11, 5, 6, 0, 7, 9
};