=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/yacc/lalr.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- src/usr.bin/yacc/lalr.c 2001/07/16 06:29:44 1.4 +++ src/usr.bin/yacc/lalr.c 2001/11/19 19:02:18 1.5 @@ -1,4 +1,4 @@ -/* $OpenBSD: lalr.c,v 1.4 2001/07/16 06:29:44 pvalchev Exp $ */ +/* $OpenBSD: lalr.c,v 1.5 2001/11/19 19:02:18 mpech Exp $ */ /* $NetBSD: lalr.c,v 1.4 1996/03/19 03:21:33 jtc Exp $ */ /* @@ -41,7 +41,7 @@ #if 0 static char sccsid[] = "@(#)lalr.c 5.3 (Berkeley) 6/1/90"; #else -static char rcsid[] = "$OpenBSD: lalr.c,v 1.4 2001/07/16 06:29:44 pvalchev Exp $"; +static char rcsid[] = "$OpenBSD: lalr.c,v 1.5 2001/11/19 19:02:18 mpech Exp $"; #endif #endif /* not lint */ @@ -117,7 +117,7 @@ void set_state_table() { - register core *sp; + core *sp; state_table = NEW2(nstates, core *); for (sp = first_state; sp; sp = sp->next) @@ -128,7 +128,7 @@ void set_accessing_symbol() { - register core *sp; + core *sp; accessing_symbol = NEW2(nstates, short); for (sp = first_state; sp; sp = sp->next) @@ -139,7 +139,7 @@ void set_shift_table() { - register shifts *sp; + shifts *sp; shift_table = NEW2(nstates, shifts *); for (sp = first_shift; sp; sp = sp->next) @@ -150,7 +150,7 @@ void set_reduction_table() { - register reductions *rp; + reductions *rp; reduction_table = NEW2(nstates, reductions *); for (rp = first_reduction; rp; rp = rp->next) @@ -161,10 +161,10 @@ void set_maxrhs() { - register short *itemp; - register short *item_end; - register int length; - register int max; + short *itemp; + short *item_end; + int length; + int max; length = 0; max = 0; @@ -189,8 +189,8 @@ void initialize_LA() { - register int i, j, k; - register reductions *rp; + int i, j, k; + reductions *rp; lookaheads = NEW2(nstates + 1, short); @@ -226,13 +226,13 @@ void set_goto_map() { - register shifts *sp; - register int i; - register int symbol; - register int k; - register short *temp_map; - register int state2; - register int state1; + shifts *sp; + int i; + int symbol; + int k; + short *temp_map; + int state2; + int state1; goto_map = NEW2(nvars + 1, short) - ntokens; temp_map = NEW2(nvars + 1, short) - ntokens; @@ -298,10 +298,10 @@ int state; int symbol; { - register int high; - register int low; - register int middle; - register int s; + int high; + int low; + int middle; + int s; low = goto_map[symbol]; high = goto_map[symbol + 1]; @@ -324,18 +324,18 @@ void initialize_F() { - register int i; - register int j; - register int k; - register shifts *sp; - register short *edge; - register unsigned *rowp; - register short *rp; - register short **reads; - register int nedges; - register int stateno; - register int symbol; - register int nwords; + int i; + int j; + int k; + shifts *sp; + short *edge; + unsigned *rowp; + short *rp; + short **reads; + int nedges; + int stateno; + int symbol; + int nwords; nwords = ngotos * tokensetsize; F = NEW2(nwords, unsigned); @@ -401,23 +401,23 @@ void build_relations() { - register int i; - register int j; - register int k; - register short *rulep; - register short *rp; - register shifts *sp; - register int length; - register int nedges; - register int done; - register int state1; - register int stateno; - register int symbol1; - register int symbol2; - register short *shortp; - register short *edge; - register short *states; - register short **new_includes; + int i; + int j; + int k; + short *rulep; + short *rp; + shifts *sp; + int length; + int nedges; + int done; + int state1; + int stateno; + int symbol1; + int symbol2; + short *shortp; + short *edge; + short *states; + short **new_includes; includes = NEW2(ngotos, short *); edge = NEW2(ngotos + 1, short); @@ -494,9 +494,9 @@ add_lookback_edge(stateno, ruleno, gotono) int stateno, ruleno, gotono; { - register int i, k; - register int found; - register shorts *sp; + int i, k; + int found; + shorts *sp; i = lookaheads[stateno]; k = lookaheads[stateno + 1]; @@ -523,12 +523,12 @@ short **R; int n; { - register short **new_R; - register short **temp_R; - register short *nedges; - register short *sp; - register int i; - register int k; + short **new_R; + short **temp_R; + short *nedges; + short *sp; + int i; + int k; nedges = NEW2(n, short); @@ -584,10 +584,10 @@ void compute_lookaheads() { - register int i, n; - register unsigned *fp1, *fp2, *fp3; - register shorts *sp, *next; - register unsigned *rowp; + int i, n; + unsigned *fp1, *fp2, *fp3; + shorts *sp, *next; + unsigned *rowp; rowp = LA; n = lookaheads[nstates]; @@ -619,7 +619,7 @@ digraph(relation) short **relation; { - register int i; + int i; infinity = ngotos + 2; INDEX = NEW2(ngotos + 1, short); @@ -644,13 +644,13 @@ void traverse(i) -register int i; +int i; { - register unsigned *fp1; - register unsigned *fp2; - register unsigned *fp3; - register int j; - register short *rp; + unsigned *fp1; + unsigned *fp2; + unsigned *fp3; + int j; + short *rp; int height; unsigned *base;