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

* src/output.c (table_size, table_grow): New.

Browse Source 
(MAXTABLE): Remove, replace uses with table_size.
(pack_vector): Instead of dying when the table is too big, grow it.
This commit is contained in:
Akim Demaille
2002-04-22 08:22:39 +00:00
parent 9515e8a7f8
commit 133c20e252
3 changed files with 47 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@@ -1,3 +1,9 @@
2002-04-22 Akim Demaille <akim@epita.fr>
* src/output.c (table_size, table_grow): New.
(MAXTABLE): Remove, replace uses with table_size.
(pack_vector): Instead of dying when the table is too big, grow it.
2002-04-22 Akim Demaille <akim@epita.fr>
* data/bison.simple (yyr1): Its type is that of a token number.

2
NEWS
View File

@@ -19,7 +19,7 @@ Changes in version 1.49a:
* Large grammars
Are now supported (large token numbers, large grammar size (= sum of
the LHS and RHS lengths).
the LHS and RHS lengths), large LALR tables).
* The initial rule is explicit.
Bison used to play hacks with the initial rule, which the user does

48
src/output.c
View File

@@ -122,6 +122,11 @@ static short *state_count = NULL;
static short *order = NULL;
static short *base = NULL;
static short *pos = NULL;
/* TABLE_SIZE is the allocated size of both TABLE and CHECK.
We start with the original hard-coded value: SHRT_MAX
(yes, not USHRT_MAX). */
static size_t table_size = SHRT_MAX;
static short *table = NULL;
static short *check = NULL;
static int lowzero;
@@ -133,6 +138,35 @@ static struct obstack format_obstack;
int error_verbose = 0;
/*----------------------------------------------------------------.
| If TABLE (and CHECK) appear to be small to be addressed at |
| DESIRED, grow them. Note that TABLE[DESIRED] is to be used, so |
| the desired size is at least DESIRED + 1. |
`----------------------------------------------------------------*/
static void
table_grow (size_t desired)
{
size_t old_size = table_size;
while (table_size <= desired)
table_size *= 2;
if (trace_flag)
fprintf (stderr, "growing table and check from: %d to %d\n",
old_size, table_size);
table = XREALLOC (table, short, table_size);
check = XREALLOC (check, short, table_size);
for (/* Nothing. */; old_size < table_size; ++old_size)
{
table[old_size] = 0;
check[old_size] = -1;
}
}
/*------------------------------------------------------------------.
| Create a function NAME which Format the FIRST and then |
| TABLE_DATA[BEGIN..END[ (of TYPE) into OOUT, and return the number |
@@ -768,8 +802,6 @@ matching_state (int vector)
return -1;
}
/* FIXME: For the time being, best approximation... */
#define MAXTABLE SHRT_MAX
static int
pack_vector (int vector)
@@ -783,7 +815,7 @@ pack_vector (int vector)
assert (t);
for (j = lowzero - from[0]; j < MAXTABLE; j++)
for (j = lowzero - from[0]; j < (int) table_size; j++)
{
int k;
int ok = 1;
@@ -791,8 +823,8 @@ pack_vector (int vector)
for (k = 0; ok && k < t; k++)
{
loc = j + from[k];
if (loc > MAXTABLE)
fatal (_("maximum table size (%d) exceeded"), MAXTABLE);
if (loc > (int) table_size)
table_grow (loc);
if (table[loc] != 0)
ok = 0;
@@ -835,8 +867,8 @@ pack_table (void)
base = XCALLOC (short, nvectors);
pos = XCALLOC (short, nentries);
table = XCALLOC (short, MAXTABLE);
check = XCALLOC (short, MAXTABLE);
table = XCALLOC (short, table_size);
check = XCALLOC (short, table_size);
lowzero = 0;
high = 0;
@@ -844,7 +876,7 @@ pack_table (void)
for (i = 0; i < nvectors; i++)
base[i] = SHRT_MIN;
for (i = 0; i < MAXTABLE; i++)
for (i = 0; i < (int) table_size; i++)
check[i] = -1;
for (i = 0; i < nentries; i++)