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

* src/LR0.c (shifts_new): New.

Browse Source 
(save_shifts, insert_start_shift, augment_automaton): Use it.
This commit is contained in:
Akim Demaille
2001-11-28 14:53:29 +00:00
parent 4b35e1c1dd
commit 4a38e61393
2 changed files with 30 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@@ -1,3 +1,8 @@
2001-11-28 Akim Demaille <akim@epita.fr>
* src/LR0.c (shifts_new): New.
(save_shifts, insert_start_shift, augment_automaton): Use it.
2001-11-28 Akim Demaille <akim@epita.fr> 2001-11-28 Akim Demaille <akim@epita.fr>
* src/closure.c (closure): `b' and `ruleno' denote the same value: * src/closure.c (closure): `b' and `ruleno' denote the same value:

41
src/LR0.c
View File

@@ -311,13 +311,29 @@ new_states (void)
} }
/*---------------------------------.
| Create a new array of N shitfs. |
`---------------------------------*/
static shifts *
shifts_new (int n)
{
shifts *res = SHIFTS_ALLOC (n);
res->nshifts = n;
return res;
}
/*------------------------------------------------------------.
| Save the NSHIFTS of SHIFTSET into the current linked list. |
`------------------------------------------------------------*/
static void static void
save_shifts (void) save_shifts (void)
{ {
shifts *p = SHIFTS_ALLOC (nshifts); shifts *p = shifts_new (nshifts);
p->number = this_state->number; p->number = this_state->number;
p->nshifts = nshifts;
shortcpy (p->shifts, shiftset, nshifts); shortcpy (p->shifts, shiftset, nshifts);
@@ -348,9 +364,8 @@ insert_start_shift (void)
last_state = statep; last_state = statep;
/* Make a shift from this state to (what will be) the final state. */ /* Make a shift from this state to (what will be) the final state. */
sp = SHIFTS_ALLOC (1); sp = shifts_new (1);
sp->number = nstates++; sp->number = nstates++;
sp->nshifts = 1;
sp->shifts[0] = nstates; sp->shifts[0] = nstates;
last_shift->next = sp; last_shift->next = sp;
@@ -405,9 +420,8 @@ augment_automaton (void)
if (sp && sp->number == k) if (sp && sp->number == k)
{ {
sp2 = SHIFTS_ALLOC (sp->nshifts + 1); sp2 = shifts_new (sp->nshifts + 1);
sp2->number = k; sp2->number = k;
sp2->nshifts = sp->nshifts + 1;
sp2->shifts[0] = nstates; sp2->shifts[0] = nstates;
for (i = sp->nshifts; i > 0; i--) for (i = sp->nshifts; i > 0; i--)
sp2->shifts[i] = sp->shifts[i - 1]; sp2->shifts[i] = sp->shifts[i - 1];
@@ -422,9 +436,8 @@ augment_automaton (void)
} }
else else
{ {
sp2 = SHIFTS_ALLOC (1); sp2 = shifts_new (1);
sp2->number = k; sp2->number = k;
sp2->nshifts = 1;
sp2->shifts[0] = nstates; sp2->shifts[0] = nstates;
/* Patch sp2 into the chain of shifts between sp1 and sp. */ /* Patch sp2 into the chain of shifts between sp1 and sp. */
@@ -441,8 +454,7 @@ augment_automaton (void)
going to the next-to-final state (yet to be made). */ going to the next-to-final state (yet to be made). */
sp = first_shift; sp = first_shift;
sp2 = SHIFTS_ALLOC (sp->nshifts + 1); sp2 = shifts_new (sp->nshifts + 1);
sp2->nshifts = sp->nshifts + 1;
/* Stick this shift into the vector at the proper place. */ /* Stick this shift into the vector at the proper place. */
statep = first_state->next; statep = first_state->next;
@@ -474,8 +486,7 @@ augment_automaton (void)
{ {
/* The initial state didn't even have any shifts. /* The initial state didn't even have any shifts.
Give it one shift, to the next-to-final state. */ Give it one shift, to the next-to-final state. */
sp = SHIFTS_ALLOC (1); sp = shifts_new (1);
sp->nshifts = 1;
sp->shifts[0] = nstates; sp->shifts[0] = nstates;
/* Patch sp into the chain of shifts at the beginning. */ /* Patch sp into the chain of shifts at the beginning. */
@@ -492,8 +503,7 @@ augment_automaton (void)
/* There are no shifts for any state. /* There are no shifts for any state.
Make one shift, from the initial state to the next-to-final state. */ Make one shift, from the initial state to the next-to-final state. */
sp = SHIFTS_ALLOC (1); sp = shifts_new (1);
sp->nshifts = 1;
sp->shifts[0] = nstates; sp->shifts[0] = nstates;
/* Initialize the chain of shifts with sp. */ /* Initialize the chain of shifts with sp. */
@@ -514,9 +524,8 @@ augment_automaton (void)
last_state = statep; last_state = statep;
/* Make the shift from the final state to the termination state. */ /* Make the shift from the final state to the termination state. */
sp = SHIFTS_ALLOC (1); sp = shifts_new (1);
sp->number = nstates++; sp->number = nstates++;
sp->nshifts = 1;
sp->shifts[0] = nstates; sp->shifts[0] = nstates;
last_shift->next = sp; last_shift->next = sp;
last_shift = sp; last_shift = sp;