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

Propagate more token_number_t.

Browse Source 
* src/gram.h (token_number_as_item_number)
(item_number_as_token_number): New.
* src/output.c (GENERATE_OUTPUT_TABLE): New.
Use it to create output_item_number_table and
output_token_number_table.
* src/LR0.c, src/derives.c, src/gram.c, src/gram.h, src/lalr.c,
* src/lex.c, src/nullable.c, src/output.c, src/print.c,
* src/print_graph.c, src/reader.c, src/reduce.c, src/state.h,
* src/symtab.c, src/symtab.h: Use token_number_t instead of shorts.
This commit is contained in:
Akim Demaille
2002-04-22 08:21:55 +00:00
parent 4f940944da
commit 5fbb0954b8
16 changed files with 137 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/LR0.c
View File

@@ -26,6 +26,7 @@
#include "bitset.h"
#include "quotearg.h"
#include "symtab.h"
#include "gram.h"
#include "getargs.h"
#include "reader.h"
#include "gram.h"
@@ -51,7 +52,7 @@ static state_t *this_state = NULL;
static state_t *last_state = NULL;
static int nshifts;
static short *shift_symbol = NULL;
static token_number_t *shift_symbol = NULL;
static short *redset = NULL;
static short *shiftset = NULL;
@@ -116,7 +117,7 @@ allocate_storage (void)
shiftset = XCALLOC (short, nsyms);
redset = XCALLOC (short, nrules + 1);
state_hash = XCALLOC (state_t *, STATE_HASH_SIZE);
shift_symbol = XCALLOC (short, nsyms);
shift_symbol = XCALLOC (token_number_t, nsyms);
}
@@ -161,20 +162,19 @@ new_itemsets (void)
nshifts = 0;
for (i = 0; i < nritemset; ++i)
{
int symbol = ritem[itemset[i]];
if (symbol >= 0)
{
if (!kernel_size[symbol])
{
shift_symbol[nshifts] = symbol;
nshifts++;
}
if (ritem[itemset[i]] >= 0)
{
token_number_t symbol
= item_number_as_token_number (ritem[itemset[i]]);
if (!kernel_size[symbol])
{
shift_symbol[nshifts] = symbol;
nshifts++;
}
kernel_base[symbol][kernel_size[symbol]] = itemset[i] + 1;
kernel_size[symbol]++;
}
}
kernel_base[symbol][kernel_size[symbol]] = itemset[i] + 1;
kernel_size[symbol]++;
}
}
@@ -185,7 +185,7 @@ new_itemsets (void)
`-----------------------------------------------------------------*/
static state_t *
new_state (int symbol)
new_state (token_number_t symbol)
{
state_t *p;
@@ -229,7 +229,7 @@ new_state (int symbol)
`--------------------------------------------------------------*/
static int
get_state (int symbol)
get_state (token_number_t symbol)
{
int key;
int i;
@@ -298,7 +298,7 @@ append_states (void)
{
int i;
int j;
int symbol;
token_number_t symbol;
if (trace_flag)
fprintf (stderr, "Entering append_states, state = %d\n",